X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FObjects.php;h=2104e8042fd98e3c2cc9f7bc57eb9782a7627826;hb=c969635bbcfba969033690b801594aae59ace3ef;hp=c52a75196ad16d48877102698c65d673b02b9ca5;hpb=1f7cb530c78aeaccbfb2f3e11f4ca573beadbdc3;p=friendica.git

diff --git a/src/Module/Objects.php b/src/Module/Objects.php
index c52a75196a..2104e8042f 100644
--- a/src/Module/Objects.php
+++ b/src/Module/Objects.php
@@ -5,10 +5,10 @@
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
-use Friendica\Protocol\ActivityPub;
 use Friendica\Core\System;
-use Friendica\Model\Item;
 use Friendica\Database\DBA;
+use Friendica\Model\Item;
+use Friendica\Protocol\ActivityPub;
 
 /**
  * ActivityPub Objects
@@ -20,19 +20,29 @@ class Objects extends BaseModule
 		$a = self::getApp();
 
 		if (empty($a->argv[1])) {
-			System::httpExit(404);
+			throw new \Friendica\Network\HTTPException\NotFoundException();
 		}
 
 		if (!ActivityPub::isRequest()) {
-			goaway(str_replace('objects/', 'display/', $a->query_string));
+			$a->internalRedirect(str_replace('objects/', 'display/', $a->query_string));
 		}
 
-		$item = Item::selectFirst(['id'], ['guid' => $a->argv[1], 'wall' => true, 'private' => false]);
+		/// @todo Add Authentication to enable fetching of non public content
+		// $requester = HTTPSignature::getSigner('', $_SERVER);
+
+		// At first we try the original post with that guid
+		// @TODO: Replace with parameter from router
+		$item = Item::selectFirst(['id'], ['guid' => $a->argv[1], 'origin' => true, 'private' => false]);
 		if (!DBA::isResult($item)) {
-			System::httpExit(404);
+			// If no original post could be found, it could possibly be a forum post, there we remove the "origin" field.
+			// @TODO: Replace with parameter from router
+			$item = Item::selectFirst(['id', 'author-link'], ['guid' => $a->argv[1], 'private' => false]);
+			if (!DBA::isResult($item) || !strstr($item['author-link'], System::baseUrl())) {
+				throw new \Friendica\Network\HTTPException\NotFoundException();
+			}
 		}
 
-		$data = ActivityPub::createObjectFromItemID($item['id']);
+		$data = ActivityPub\Transmitter::createObjectFromItemID($item['id']);
 
 		header('Content-Type: application/activity+json');
 		echo json_encode($data);