X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FObjects.php;h=2104e8042fd98e3c2cc9f7bc57eb9782a7627826;hb=6041f74df64861ae0cab4b6250b97a65f61873a3;hp=3f8aea0d01adc4432a523645c92d82341be2a675;hpb=ae2a8b796c4805f35fcf4d7ca36803995d48d54c;p=friendica.git

diff --git a/src/Module/Objects.php b/src/Module/Objects.php
index 3f8aea0d01..2104e8042f 100644
--- a/src/Module/Objects.php
+++ b/src/Module/Objects.php
@@ -5,11 +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\Util\HTTPSignature;
+use Friendica\Model\Item;
+use Friendica\Protocol\ActivityPub;
 
 /**
  * ActivityPub Objects
@@ -21,7 +20,7 @@ class Objects extends BaseModule
 		$a = self::getApp();
 
 		if (empty($a->argv[1])) {
-			System::httpExit(404);
+			throw new \Friendica\Network\HTTPException\NotFoundException();
 		}
 
 		if (!ActivityPub::isRequest()) {
@@ -31,9 +30,16 @@ class Objects extends BaseModule
 		/// @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\Transmitter::createObjectFromItemID($item['id']);