mirror of
https://github.com/pixelfed/pixelfed.git
synced 2024-11-17 20:11:27 +00:00
Update Inbox, add user domain blocks to Story reaction handlers
This commit is contained in:
parent
491468612f
commit
8a0ceaf801
1 changed files with 13 additions and 0 deletions
|
@ -944,6 +944,10 @@ class Inbox
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(AccountService::blocksDomain($story->profile_id, $profile->domain) == true) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if(!FollowerService::follows($profile->id, $story->profile_id)) {
|
if(!FollowerService::follows($profile->id, $story->profile_id)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -1014,6 +1018,10 @@ class Inbox
|
||||||
|
|
||||||
$actorProfile = Helpers::profileFetch($actor);
|
$actorProfile = Helpers::profileFetch($actor);
|
||||||
|
|
||||||
|
if(AccountService::blocksDomain($targetProfile->id, $actorProfile->domain) == true) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if(!FollowerService::follows($actorProfile->id, $targetProfile->id)) {
|
if(!FollowerService::follows($actorProfile->id, $targetProfile->id)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -1132,6 +1140,11 @@ class Inbox
|
||||||
|
|
||||||
$actorProfile = Helpers::profileFetch($actor);
|
$actorProfile = Helpers::profileFetch($actor);
|
||||||
|
|
||||||
|
|
||||||
|
if(AccountService::blocksDomain($targetProfile->id, $actorProfile->domain) == true) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if(!FollowerService::follows($actorProfile->id, $targetProfile->id)) {
|
if(!FollowerService::follows($actorProfile->id, $targetProfile->id)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue