Merge pull request #6523 from annando/ap-forum

Preparation for forum posts over AP

diff --git a/src/Module/Objects.php b/src/Module/Objects.php
index 3f8aea0d01adc4432a523645c92d82341be2a675..558b274919ce33bad609074dec5aac569ceca9e0 100644 (file)
--- a/src/Module/Objects.php
+++ b/src/Module/Objects.php
@@ -31,9 +31,14 @@ 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
                $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.
+                       $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']);