Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Filter out restricted user from Playlist scores #11488

Merged
merged 5 commits into from
Sep 13, 2024
Merged

Filter out restricted user from Playlist scores #11488

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3199919
filter out restricted user from room scores
notbakaneko Sep 13, 2024
542fefc
add relation
notbakaneko Sep 13, 2024
26481a1
move relation
notbakaneko Sep 13, 2024
da158ec
Update app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresControll…
notbakaneko Sep 13, 2024
8e595db
Merge branch 'master' into feature/room-highscore-filter-restricted
nanaya Sep 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,12 @@ 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', function ($userQuery) {
$userQuery->default();
})
notbakaneko marked this conversation as resolved.
Show resolved Hide resolved
->whereHas('scoreLink');

[$highScores, $hasMore] = $highScoresQuery
->clone()
Expand Down
6 changes: 6 additions & 0 deletions app/Models/Multiplayer/PlaylistItemUserHighScore.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -130,4 +131,9 @@ public function updateWithScoreLink(ScoreLink $scoreLink): bool
'total_score' => $score->total_score,
])->save();
}

public function user(): BelongsTo
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh right, this should be in relation function area?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are we still doing that 🤔

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think so for scopes, relations and laravel model setters/getters? 🤔

{
return $this->belongsTo(User::class, 'user_id');
}
}