Merge pull request ppy#12045 from nanaya/notify-exclude-block

Don't send notification from blocked user

Author: notbakaneko

app/Jobs/Notifications/BroadcastNotificationBase.php

@@ -12,6 +12,7 @@
 use App\Models\UserGroup;
 use App\Models\UserNotification;
 use App\Models\UserNotificationOption;
+use App\Models\UserRelation;
 use App\Traits\NotificationQueue;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -171,7 +172,8 @@ public function getTimestamp()
 
     public function handle()
     {
-        $deliverySettings = static::applyDeliverySettings(static::excludeBotUserIds($this->getReceiverIds()));
+        $receiverIds = $this->excludeBlockedUserIds(static::excludeBotUserIds($this->getReceiverIds()));
+        $deliverySettings = static::applyDeliverySettings($receiverIds);
 
         if (empty($deliverySettings)) {
             return;
@@ -232,4 +234,20 @@ public function makeNotification(): Notification
 
         return $notification;
     }
+
+    private function excludeBlockedUserIds(array $userIds): array
+    {
+        if ($this->source === null) {
+            return $userIds;
+        }
+
+        $excludedReceiverIds = UserRelation
+            ::where('zebra_id', $this->source->getKey())
+            ->where('foe', true)
+            ->whereIn('user_id', $userIds)
+            ->pluck('user_id')
+            ->all();
+
+        return array_diff($userIds, $excludedReceiverIds);
+    }
 }

tests/Controllers/CommentsControllerTest.php

@@ -10,6 +10,7 @@
 use App\Models\Follow;
 use App\Models\Notification;
 use App\Models\User;
+use App\Models\UserNotification;
 use Tests\TestCase;
 
 class CommentsControllerTest extends TestCase
@@ -82,6 +83,31 @@ public function testStore()
         $this->assertSame($previousNotifications + 1, Notification::count());
     }
 
+    public function testStoreBlockedUser(): void
+    {
+        $this->prepareForStore();
+        $otherUser = User::factory()->create();
+
+        $follow = Follow::create([
+            'notifiable' => $this->beatmapset,
+            'subtype' => 'comment',
+            'user' => $otherUser,
+        ]);
+        $otherUser->relations()->create([
+            'foe' => true,
+            'zebra_id' => $this->user->getKey(),
+        ]);
+
+        $this->expectCountChange(fn () => Comment::count(), 1);
+        $this->expectCountChange(fn () => Notification::count(), 0);
+        $this->expectCountChange(fn () => UserNotification::count(), 0);
+
+        $this
+            ->be($this->user)
+            ->post(route('comments.store'), $this->params)
+            ->assertSuccessful();
+    }
+
     public function testStoreDownloadLimitedBeatmapset()
     {
         $this->prepareForStore();