Browse Source

Update Inbox, add user domain blocks to Direct Message handler

Daniel Supernault 1 year ago
parent
commit
a7f96d8194
1 changed files with 5 additions and 1 deletions
  1. 5 1
      app/Util/ActivityPub/Inbox.php

+ 5 - 1
app/Util/ActivityPub/Inbox.php

@@ -372,7 +372,11 @@ class Inbox
             ->whereUsername(array_last(explode('/', $activity['to'][0])))
             ->whereUsername(array_last(explode('/', $activity['to'][0])))
             ->firstOrFail();
             ->firstOrFail();
 
 
-        if(in_array($actor->id, $profile->blockedIds()->toArray())) {
+        if(!$actor || in_array($actor->id, $profile->blockedIds()->toArray())) {
+            return;
+        }
+
+        if(AccountService::blocksDomain($profile->id, $actor->domain) == true) {
             return;
             return;
         }
         }