clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Prevent ActivityPub message transmission to blocked followers
This commit is contained in:
Michael Vogel 2020-11-11 15:28:04 +01:00 committed by GitHub
parent f41139bd05 0de8319c15
commit 61dcd62921
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Protocol/ActivityPub/Transmitter.php
View File

@ -146,7 +146,8 @@ class Transmitter
'deleted' => false, 'deleted' => false,
'hidden' => false, 'hidden' => false,
'archive' => false, 'archive' => false,
'pending' => false 'pending' => false,
'blocked' => false,
]; ];
$condition = DBA::buildCondition($parameters); $condition = DBA::buildCondition($parameters);
@ -680,7 +681,7 @@ class Transmitter
$networks = [Protocol::ACTIVITYPUB, Protocol::OSTATUS]; $networks = [Protocol::ACTIVITYPUB, Protocol::OSTATUS];
} }
$condition = ['uid' => $uid, 'archive' => false, 'pending' => false]; $condition = ['uid' => $uid, 'archive' => false, 'pending' => false, 'blocked' => false];
if (!empty($uid)) { if (!empty($uid)) {
$condition['rel'] = [Contact::FOLLOWER, Contact::FRIEND]; $condition['rel'] = [Contact::FOLLOWER, Contact::FRIEND];