Merge pull request #8006 from MrPetovan/bug/7991-remove-group-add-restrictions

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

diff --git a/src/Module/Objects.php b/src/Module/Objects.php
index f34af3a08044af329836ff00b937bf93b92a8c4e..df576369265f6091048bc8b2e3b8ea87d17aca58 100644 (file)
--- a/src/Module/Objects.php
+++ b/src/Module/Objects.php
@@ -15,12 +15,12 @@ use Friendica\Protocol\ActivityPub;
  */
 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()) {
@@ -38,11 +38,18 @@ class Objects extends BaseModule
                        // @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);
+                               throw new \Friendica\Network\HTTPException\NotFoundException();
                        }
                }
 
-               $data = ActivityPub\Transmitter::createObjectFromItemID($item['id']);
+               $activity = ActivityPub\Transmitter::createActivityFromItem($item['id'], true);
+               // Only display "Create" activity objects here, no reshares or anything else
+               if (!is_array($activity['object']) || ($activity['type'] != 'Create')) {
+                       throw new \Friendica\Network\HTTPException\NotFoundException();
+               }
+
+               $data = ['@context' => ActivityPub::CONTEXT];
+               $data = array_merge($data, $activity['object']);
 
                header('Content-Type: application/activity+json');
                echo json_encode($data);