From 8a0ceaf801af614457ae65197d18bb0fe69372d2 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 18 Dec 2023 22:57:53 -0700 Subject: [PATCH] Update Inbox, add user domain blocks to Story reaction handlers --- app/Util/ActivityPub/Inbox.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/app/Util/ActivityPub/Inbox.php b/app/Util/ActivityPub/Inbox.php index 09676301f..b8bb780c8 100644 --- a/app/Util/ActivityPub/Inbox.php +++ b/app/Util/ActivityPub/Inbox.php @@ -944,6 +944,10 @@ class Inbox return; } + if(AccountService::blocksDomain($story->profile_id, $profile->domain) == true) { + return; + } + if(!FollowerService::follows($profile->id, $story->profile_id)) { return; } @@ -1014,6 +1018,10 @@ class Inbox $actorProfile = Helpers::profileFetch($actor); + if(AccountService::blocksDomain($targetProfile->id, $actorProfile->domain) == true) { + return; + } + if(!FollowerService::follows($actorProfile->id, $targetProfile->id)) { return; } @@ -1132,6 +1140,11 @@ class Inbox $actorProfile = Helpers::profileFetch($actor); + + if(AccountService::blocksDomain($targetProfile->id, $actorProfile->domain) == true) { + return; + } + if(!FollowerService::follows($actorProfile->id, $targetProfile->id)) { return; }