Fix for PR #11204 - Forums are now correctly detected

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index d944c73a01c3b2d19a29a734df1a0102da653283..bd198fb30e6637994094c3f176f01f881cbcbd4a 100644 (file)
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -619,7 +619,16 @@ class Processor
                                continue;
                        }
 
-                       if (!Contact::isForum($receiver) && DI::pConfig()->get($receiver, 'system', 'accept_only_sharer', false) && ($receiver != 0) && ($item['gravity'] == GRAVITY_PARENT)) {
+                       $is_forum = false;
+
+                       if ($receiver != 0) {
+                               $user = User::getById($receiver, ['account-type']);
+                               if (!empty($user['account-type'])) {
+                                       $is_forum = ($user['account-type'] == User::ACCOUNT_TYPE_COMMUNITY);
+                               }
+                       }
+
+                       if (!$is_forum && DI::pConfig()->get($receiver, 'system', 'accept_only_sharer', false) && ($receiver != 0) && ($item['gravity'] == GRAVITY_PARENT)) {
                                $skip = !Contact::isSharingByURL($activity['author'], $receiver);
 
                                if ($skip && (($activity['type'] == 'as:Announce') || ($item['isForum'] ?? false))) {