X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FObjects.php;h=8080289f15866143a2207209d56d3666df448964;hb=2ce15cae1a41451b631b814c418b3b3b976d79d1;hp=b5b5227141c1a84808d92c966c714ce72ed4e342;hpb=af817b2ad5412a28c740efb51a4c220db33a45cc;p=friendica.git

diff --git a/src/Module/Objects.php b/src/Module/Objects.php
index b5b5227141..8080289f15 100644
--- a/src/Module/Objects.php
+++ b/src/Module/Objects.php
@@ -57,7 +57,7 @@ class Objects extends BaseModule
 			['order' => ['origin' => true]]
 		);
 		// Valid items are original post or posted from this node (including in the case of a forum)
-		if (!DBA::isResult($item) || !$item['origin'] && !strstr($item['author-link'], DI::baseUrl()->get())) {
+		if (!DBA::isResult($item) || !$item['origin'] && (parse_url($item['author-link'], PHP_URL_HOST) != parse_url(DI::baseUrl()->get(), PHP_URL_HOST))) {
 			throw new HTTPException\NotFoundException();
 		}
 
@@ -65,17 +65,31 @@ class Objects extends BaseModule
 		$last_modified = $item['changed'];
 		Network::checkEtagModified($etag, $last_modified);
 
-		$activity = ActivityPub\Transmitter::createActivityFromItem($item['id'], true);
-		$activity['type'] = $activity['type'] == 'Update' ? 'Create' : $activity['type'];
+		if (empty($parameters['activity'])) {
+			$activity = ActivityPub\Transmitter::createActivityFromItem($item['id'], true);
+			$activity['type'] = $activity['type'] == 'Update' ? 'Create' : $activity['type'];
 
-		// Only display "Create" activity objects here, no reshares or anything else
-		if (empty($activity['object']) || ($activity['type'] != 'Create')) {
+			// Only display "Create" activity objects here, no reshares or anything else
+			if (empty($activity['object']) || ($activity['type'] != 'Create')) {
+				throw new HTTPException\NotFoundException();
+			}
+
+			$data = ['@context' => ActivityPub::CONTEXT];
+			$data = array_merge($data, $activity['object']);
+		} elseif (in_array($parameters['activity'], ['Create', 'Announce', 'Update', 
+			'Like', 'Dislike', 'Accept', 'Reject', 'TentativeAccept', 'Follow', 'Add'])) {
+			$data = ActivityPub\Transmitter::createActivityFromItem($item['id']);
+			if (empty($data)) {
+				throw new HTTPException\NotFoundException();
+			}
+			if ($parameters['activity'] != 'Create') {
+				$data['type'] = $parameters['activity'];
+				$data['id'] = str_replace('/Create', '/' . $parameters['activity'], $data['id']);
+			}
+		} else {
 			throw new HTTPException\NotFoundException();
 		}
 
-		$data = ['@context' => ActivityPub::CONTEXT];
-		$data = array_merge($data, $activity['object']);
-
 		// Relaxed CORS header for public items
 		header('Access-Control-Allow-Origin: *');
 		System::jsonExit($data, 'application/activity+json');