Merge pull request #7848 from annando/mail-hooks

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

diff --git a/src/Module/Objects.php b/src/Module/Objects.php
index 3f8aea0d01adc4432a523645c92d82341be2a675..5538be18889910c035ec0c83275ef69d6e3b7035 100644 (file)
--- a/src/Module/Objects.php
+++ b/src/Module/Objects.php
@@ -5,23 +5,22 @@
 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
  */
 class Objects extends BaseModule
 {
-       public static function rawContent()
+       public static function rawContent(array $parameters = [])
        {
                $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']);