code style & install-403 fix

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

diff --git a/src/Module/Objects.php b/src/Module/Objects.php
index 8f9c3309b6785534f6b0977c8321c974ba378ef8..558b274919ce33bad609074dec5aac569ceca9e0 100644 (file)
--- a/src/Module/Objects.php
+++ b/src/Module/Objects.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @file src/Module/Object.php
+ * @file src/Module/Objects.php
  */
 namespace Friendica\Module;
 
@@ -9,11 +9,12 @@ use Friendica\Protocol\ActivityPub;
 use Friendica\Core\System;
 use Friendica\Model\Item;
 use Friendica\Database\DBA;
+use Friendica\Util\HTTPSignature;
 
 /**
- * ActivityPub Object
+ * ActivityPub Objects
  */
-class Object extends BaseModule
+class Objects extends BaseModule
 {
        public static function rawContent()
        {
@@ -24,15 +25,23 @@ class Object extends BaseModule
                }
 
                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
+               $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::createObjectFromItemID($item['id']);
+               $data = ActivityPub\Transmitter::createObjectFromItemID($item['id']);
 
                header('Content-Type: application/activity+json');
                echo json_encode($data);