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.

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

Require multiplayer api to join multiplayer room #11743

Merged
merged 1 commit into from
Dec 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 3 additions & 7 deletions app/Singletons/OsuAuthorize.php
Original file line number Diff line number Diff line change
Expand Up @@ -1027,7 +1027,7 @@ public function checkChatChannelRead(?User $user, Channel $channel): string
* @return string
* @throws AuthorizationCheckException
*/
public function checkChatChannelJoin(?User $user, Channel $channel): string
public function checkChatChannelJoin(?User $user, Channel $channel): ?string
{
$prefix = 'chat.';

Expand All @@ -1039,13 +1039,9 @@ public function checkChatChannelJoin(?User $user, Channel $channel): string

$this->ensureCleanRecord($user, $prefix);

// This check is only for when joining the channel directly; joining via the Room
// will always add the user to the channel.
// joining multiplayer room is done through room endpoint
if ($channel->isMultiplayer()) {
$room = Room::hasParticipated($user)->find($channel->room_id);
if ($room !== null) {
return 'ok';
}
return null;
}

// allow joining of 'tournament' matches (for lazer/tournament client)
Expand Down
2 changes: 1 addition & 1 deletion tests/Controllers/Chat/ChannelsControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ public function testChannelJoinMultiplayerWhenParticipated()
'user' => $this->user->getKey(),
]));

$request->assertStatus(200)->assertJsonFragment(['channel_id' => $scoreLink->playlistItem->room->channel_id, 'type' => Channel::TYPES['multiplayer']]);
$request->assertStatus(403);
}

//endregion
Expand Down
Loading