Update Inbox, add user domain blocks to Direct Message handler

1 year ago · a7f96d8194
parent e7c08fbbb2
commit a7f96d8194
1 changed files with 5 additions and 1 deletions
--- a/app/Util/ActivityPub/Inbox.php
+++ b/app/Util/ActivityPub/Inbox.php
@ -372,7 +372,11 @@ class Inbox
            ->whereUsername(array_last(explode('/', $activity['to'][0])))
            ->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;
        }