Merge pull request #9364 from annando/issue-9363

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

diff --git a/src/Module/Objects.php b/src/Module/Objects.php
index e0326548695ca5bf11ecdc575d7a7dfdf2a79d90..bb68adeb3bb8cf7b35563e05ca03f840f835fc78 100644 (file)
--- a/src/Module/Objects.php
+++ b/src/Module/Objects.php
@@ -47,29 +47,32 @@ class Objects extends BaseModule
                        DI::baseUrl()->redirect(str_replace('objects/', 'display/', DI::args()->getQueryString()));
                }
 
-               $item = Item::selectFirst(['id', 'uid', 'origin', 'author-link', 'changed', 'private', 'psid'],
+               $item = Item::selectFirst(['id', 'uid', 'origin', 'author-link', 'changed', 'private', 'psid', 'gravity'],
                        ['guid' => $parameters['guid']], ['order' => ['origin' => true]]);
 
-               $validated = false;
-               $requester = HTTPSignature::getSigner('', $_SERVER);
-               if (!empty($requester) && $item['origin']) {
-                       $requester_id = Contact::getIdForURL($requester, $item['uid']);
-                       if (!empty($requester_id)) {
-                               $permissionSets = DI::permissionSet()->selectByContactId($requester_id, $item['uid']);
-                               if (!empty($permissionSets)) {
-                                       $psid = array_merge($permissionSets->column('id'),
-                                               [DI::permissionSet()->getIdFromACL($item['uid'], '', '', '', '')]);
-                                       $validated = in_array($item['psid'], $psid);
-                               }
-                       }
+               if (!DBA::isResult($item)) {
+                       throw new HTTPException\NotFoundException();
                }
 
-               if (!$validated && !in_array($item['private'], [Item::PUBLIC, Item::UNLISTED])) {
-                       unset($item);
+               $validated = in_array($item['private'], [Item::PUBLIC, Item::UNLISTED]);
+
+               if (!$validated) {
+                       $requester = HTTPSignature::getSigner('', $_SERVER);
+                       if (!empty($requester) && $item['origin']) {
+                               $requester_id = Contact::getIdForURL($requester, $item['uid']);
+                               if (!empty($requester_id)) {
+                                       $permissionSets = DI::permissionSet()->selectByContactId($requester_id, $item['uid']);
+                                       if (!empty($permissionSets)) {
+                                               $psid = array_merge($permissionSets->column('id'),
+                                                       [DI::permissionSet()->getIdFromACL($item['uid'], '', '', '', '')]);
+                                               $validated = in_array($item['psid'], $psid);
+                                       }
+                               }
+                       }
                }
 
                // Valid items are original post or posted from this node (including in the case of a forum)
-               if (!DBA::isResult($item) || !$item['origin'] && (parse_url($item['author-link'], PHP_URL_HOST) != parse_url(DI::baseUrl()->get(), PHP_URL_HOST))) {
+               if (!$validated || !$item['origin'] && (parse_url($item['author-link'], PHP_URL_HOST) != parse_url(DI::baseUrl()->get(), PHP_URL_HOST))) {
                        throw new HTTPException\NotFoundException();
                }
 
@@ -77,7 +80,7 @@ class Objects extends BaseModule
                $last_modified = $item['changed'];
                Network::checkEtagModified($etag, $last_modified);
 
-               if (empty($parameters['activity'])) {
+               if (empty($parameters['activity']) && ($item['gravity'] != GRAVITY_ACTIVITY)) {
                        $activity = ActivityPub\Transmitter::createActivityFromItem($item['id'], true);
                        $activity['type'] = $activity['type'] == 'Update' ? 'Create' : $activity['type'];
 
@@ -88,13 +91,14 @@ class Objects extends BaseModule
 
                        $data = ['@context' => ActivityPub::CONTEXT];
                        $data = array_merge($data, $activity['object']);
-               } elseif (in_array($parameters['activity'], ['Create', 'Announce', 'Update', 
-                       'Like', 'Dislike', 'Accept', 'Reject', 'TentativeAccept', 'Follow', 'Add'])) {
+               } elseif (empty($parameters['activity']) || in_array($parameters['activity'],
+                       ['Create', 'Announce', 'Update', 'Like', 'Dislike', 'Accept', 'Reject',
+                       'TentativeAccept', 'Follow', 'Add'])) {
                        $data = ActivityPub\Transmitter::createActivityFromItem($item['id']);
                        if (empty($data)) {
                                throw new HTTPException\NotFoundException();
                        }
-                       if ($parameters['activity'] != 'Create') {
+                       if (!empty($parameters['activity']) && ($parameters['activity'] != 'Create')) {
                                $data['type'] = $parameters['activity'];
                                $data['id'] = str_replace('/Create', '/' . $parameters['activity'], $data['id']);
                        }