Merge pull request #9522 from MrPetovan/bug/ap-blocked-followers

Prevent ActivityPub message transmission to blocked followers

diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index 750c7f625ded1be969e3d15e335f319912912363..6ac55dc12317946ca22392cc9a9c3941634cb18c 100644 (file)
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -146,7 +146,8 @@ class Transmitter
                        'deleted' => false,
                        'hidden' => false,
                        'archive' => false,
-                       'pending' => false
+                       'pending' => false,
+                       'blocked' => false,
                ];
                $condition = DBA::buildCondition($parameters);
 
@@ -680,7 +681,7 @@ class Transmitter
                        $networks = [Protocol::ACTIVITYPUB, Protocol::OSTATUS];
                }
 
-               $condition = ['uid' => $uid, 'archive' => false, 'pending' => false];
+               $condition = ['uid' => $uid, 'archive' => false, 'pending' => false, 'blocked' => false];
 
                if (!empty($uid)) {
                        $condition['rel'] = [Contact::FOLLOWER, Contact::FRIEND];