UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-22 06:21:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update Inbox, add user domain blocks to Undo handler

Browse source
This commit is contained in:
Daniel Supernault 2023-12-18 22:49:31 -07:00
parent e32e50da7b
commit 491468612f
No known key found for this signature in database
GPG key ID: 23740873EE6F76A1
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/Util/ActivityPub/Inbox.php
View file

@ -836,6 +836,9 @@ class Inbox
if(!$status) { if(!$status) {
return; return;
} }
if(AccountService::blocksDomain($status->profile_id, $profile->domain) == true) {
return;
}
FeedRemoveRemotePipeline::dispatch($status->id, $status->profile_id)->onQueue('feed'); FeedRemoveRemotePipeline::dispatch($status->id, $status->profile_id)->onQueue('feed');
Status::whereProfileId($profile->id) Status::whereProfileId($profile->id)
->whereReblogOfId($status->id) ->whereReblogOfId($status->id)
@ -857,6 +860,9 @@ class Inbox
if(!$following) { if(!$following) {
return; return;
} }
if(AccountService::blocksDomain($following->id, $profile->domain) == true) {
return;
}
Follower::whereProfileId($profile->id) Follower::whereProfileId($profile->id)
->whereFollowingId($following->id) ->whereFollowingId($following->id)
->delete(); ->delete();
@ -882,6 +888,9 @@ class Inbox
if(!$status) { if(!$status) {
return; return;
} }
if(AccountService::blocksDomain($status->profile_id, $profile->domain) == true) {
return;
}
Like::whereProfileId($profile->id) Like::whereProfileId($profile->id)
->whereStatusId($status->id) ->whereStatusId($status->id)
->forceDelete(); ->forceDelete();