Normalize base URL usage in admin templates

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

diff --git a/src/Module/ActivityPub/Objects.php b/src/Module/ActivityPub/Objects.php
index c085d86836e052c22c983158328dd7452e0c08ab..f3a37b7dadc9eaadf387e4d941b4bcab1b9b361b 100644 (file)
--- a/src/Module/ActivityPub/Objects.php
+++ b/src/Module/ActivityPub/Objects.php
@@ -70,9 +70,7 @@ class Objects extends BaseModule
                        }
                }
 
-               $item = Post::selectFirst(['id', 'uid', 'origin', 'author-link', 'changed', 'private', 'psid', 'gravity', 'deleted', 'parent-uri-id'],
-                       ['uri-id' => $itemuri['id']], ['order' => ['origin' => true]]);
-
+               $item = Post::selectFirst([], ['uri-id' => $itemuri['id'], 'origin' => true]);
                if (!DBA::isResult($item)) {
                        throw new HTTPException\NotFoundException();
                }
@@ -81,22 +79,14 @@ class Objects extends BaseModule
 
                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']);
-                                       $psids = array_merge($permissionSets->column('id'), [PermissionSet::PUBLIC]);
-                                       $validated = in_array($item['psid'], $psids);
-                               }
-                       }
-               }
-
-               if ($validated) {
-                       // Valid items are original post or posted from this node (including in the case of a forum)
-                       $validated = ($item['origin'] || (parse_url($item['author-link'], PHP_URL_HOST) == parse_url(DI::baseUrl()->get(), PHP_URL_HOST)));
+                       if (!empty($requester)) {
+                               $receivers = Item::enumeratePermissions($item, false);
+                               $receivers[] = $item['contact-id'];
 
-                       if (!$validated && $item['deleted']) {
-                               $validated = Post::exists(['origin' => true, 'uri-id' => $item['parent-uri-id']]);
+                               $validated = in_array(Contact::getIdForURL($requester, $item['uid']), $receivers);
+                               if (!$validated) {
+                                       $validated = in_array(Contact::getIdForURL($requester), $receivers);
+                               }
                        }
                }