Merge pull request #7044 from MrPetovan/task/router

[friendica.git] / src / Module / Objects.php

diff --git a/src/Module/Objects.php b/src/Module/Objects.php
index 3aa8c9e21704ff66ff170d9c120622764ae17ae7..f34af3a08044af329836ff00b937bf93b92a8c4e 100644 (file)
--- 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
@@ -31,13 +30,16 @@ class Objects extends BaseModule
                /// @todo Add Authentication to enable fetching of non public content
                // $requester = HTTPSignature::getSigner('', $_SERVER);
 
-               $item = Item::selectFirst(['id', 'author-link'], ['guid' => $a->argv[1], 'private' => false]);
+               // 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 (!strstr($item['author-link'], System::baseUrl())) {
-                       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())) {
+                               System::httpExit(404);
+                       }
                }
 
                $data = ActivityPub\Transmitter::createObjectFromItemID($item['id']);