Bläddra i källkod

Update Inbox, add user domain blocks to Story reaction handlers

Daniel Supernault 1 år sedan
förälder
incheckning
8a0ceaf801
1 ändrade filer med 13 tillägg och 0 borttagningar
  1. 13 0
      app/Util/ActivityPub/Inbox.php

+ 13 - 0
app/Util/ActivityPub/Inbox.php

@@ -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;
         }
         }