Merge remote-tracking branch 'upstream/2021.12-rc' into lemmy

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

diff --git a/src/Module/ActivityPub/Objects.php b/src/Module/ActivityPub/Objects.php
index 47d5409d5b325a03c1925a6b3f1de1b7e3b1a0f0..c085d86836e052c22c983158328dd7452e0c08ab 100644 (file)
--- a/src/Module/ActivityPub/Objects.php
+++ b/src/Module/ActivityPub/Objects.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -31,6 +31,7 @@ use Friendica\Model\Item;
 use Friendica\Model\Post;
 use Friendica\Network\HTTPException;
 use Friendica\Protocol\ActivityPub;
+use Friendica\Security\PermissionSet\Repository\PermissionSet;
 use Friendica\Util\HTTPSignature;
 use Friendica\Util\Network;
 use Friendica\Util\Strings;
@@ -40,9 +41,9 @@ use Friendica\Util\Strings;
  */
 class Objects extends BaseModule
 {
-       public static function rawContent(array $parameters = [])
+       protected function rawContent(array $request = [])
        {
-               if (empty($parameters['guid'])) {
+               if (empty($this->parameters['guid'])) {
                        throw new HTTPException\BadRequestException();
                }
 
@@ -50,10 +51,10 @@ class Objects extends BaseModule
                        DI::baseUrl()->redirect(str_replace('objects/', 'display/', DI::args()->getQueryString()));
                }
 
-               $itemuri = DBA::selectFirst('item-uri', ['id'], ['guid' => $parameters['guid']]);
+               $itemuri = DBA::selectFirst('item-uri', ['id'], ['guid' => $this->parameters['guid']]);
 
                if (DBA::isResult($itemuri)) {
-                       Logger::info('Provided GUID found.', ['guid' => $parameters['guid'], 'uri-id' => $itemuri['id']]);
+                       Logger::info('Provided GUID found.', ['guid' => $this->parameters['guid'], 'uri-id' => $itemuri['id']]);
                } else {
                        // The item URI does not always contain the GUID. This means that we have to search the URL instead
                        $url = DI::baseUrl()->get() . '/' . DI::args()->getQueryString();
@@ -84,11 +85,8 @@ class Objects extends BaseModule
                                $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()->selectPublic($item['uid'])]);
-                                               $validated = in_array($item['psid'], $psid);
-                                       }
+                                       $psids = array_merge($permissionSets->column('id'), [PermissionSet::PUBLIC]);
+                                       $validated = in_array($item['psid'], $psids);
                                }
                        }
                }
@@ -106,11 +104,11 @@ class Objects extends BaseModule
                        throw new HTTPException\NotFoundException();
                }
 
-               $etag          = md5($parameters['guid'] . '-' . $item['changed']);
+               $etag          = md5($this->parameters['guid'] . '-' . $item['changed']);
                $last_modified = $item['changed'];
                Network::checkEtagModified($etag, $last_modified);
 
-               if (empty($parameters['activity']) && ($item['gravity'] != GRAVITY_ACTIVITY)) {
+               if (empty($this->parameters['activity']) && ($item['gravity'] != GRAVITY_ACTIVITY)) {
                        $activity = ActivityPub\Transmitter::createActivityFromItem($item['id'], true);
                        if (empty($activity['type'])) {
                                throw new HTTPException\NotFoundException();
@@ -125,16 +123,16 @@ class Objects extends BaseModule
 
                        $data = ['@context' => ActivityPub::CONTEXT];
                        $data = array_merge($data, $activity['object']);
-               } elseif (empty($parameters['activity']) || in_array($parameters['activity'],
+               } elseif (empty($this->parameters['activity']) || in_array($this->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 (!empty($parameters['activity']) && ($parameters['activity'] != 'Create')) {
-                               $data['type'] = $parameters['activity'];
-                               $data['id'] = str_replace('/Create', '/' . $parameters['activity'], $data['id']);
+                       if (!empty($this->parameters['activity']) && ($this->parameters['activity'] != 'Create')) {
+                               $data['type'] = $this->parameters['activity'];
+                               $data['id'] = str_replace('/Create', '/' . $this->parameters['activity'], $data['id']);
                        }
                } else {
                        throw new HTTPException\NotFoundException();