]> git.mxchange.org Git - friendica.git/commitdiff
Test item psid against PermissionSet::PUBLIC constant instead in ActivityPub\Objects
authorHypolite Petovan <hypolite@mrpetovan.com>
Mon, 25 Oct 2021 03:00:40 +0000 (23:00 -0400)
committerHypolite Petovan <hypolite@mrpetovan.com>
Mon, 25 Oct 2021 03:00:40 +0000 (23:00 -0400)
- Address https://github.com/friendica/friendica/issues/10755#issuecomment-950393419

src/Module/ActivityPub/Objects.php

index 5ee1b65d88cd0885833e8c12f084716ad780f552..232c80e5bd389abfe808f805be4af6ce3c7bf09c 100644 (file)
@@ -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;
@@ -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()->selectPublicForUser($item['uid'])]);
-                                               $validated = in_array($item['psid'], $psid);
-                                       }
+                                       $psids = array_merge($permissionSets->column('id'), [PermissionSet::PUBLIC]);
+                                       $validated = in_array($item['psid'], $psids);
                                }
                        }
                }