Merge pull request #11488 from notbakaneko/feature/room-highscore-fil…

…ter-restricted

Filter out restricted user from Playlist scores

app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresController.php

@@ -53,7 +53,10 @@ public function index($roomId, $playlistId)
         $limit = clamp(get_int($params['limit'] ?? null) ?? 50, 1, 50);
         $cursorHelper = PlaylistItemUserHighScore::makeDbCursorHelper($params['sort'] ?? null);
 
-        $highScoresQuery = $playlist->highScores()->whereHas('scoreLink');
+        $highScoresQuery = $playlist
+            ->highScores()
+            ->whereHas('user', fn ($userQuery) => $userQuery->default())
+            ->whereHas('scoreLink');
 
         [$highScores, $hasMore] = $highScoresQuery
             ->clone()

app/Models/Multiplayer/PlaylistItemUserHighScore.php

@@ -7,6 +7,7 @@
 
 use App\Models\Model;
 use App\Models\Traits\WithDbCursorHelper;
+use App\Models\User;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
@@ -106,6 +107,11 @@ public function scoreLink()
         return $this->belongsTo(ScoreLink::class, 'score_id');
     }
 
+    public function user(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'user_id');
+    }
+
     public function scopePassing(Builder $query): Builder
     {
         return $query->where('total_score', '>', 0);