Skip to content

fix(mm): correctly handle lobby not found error if joining direclty to lobby id that doesn't exist #867

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

Merged
merged 1 commit into from
Jun 6, 2024
Merged

fix(mm): correctly handle lobby not found error if joining direclty to lobby id that doesn't exist #867

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 12 additions & 4 deletions svc/pkg/mm/worker/src/workers/lobby_find/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,10 @@ async fn worker(ctx: &OperationContext<mm::msg::lobby_find::Message>) -> GlobalR
fetch_ns_config_and_team(ctx.base(), namespace_id),
fetch_lobby_group_config(ctx.base(), query),
)?;
let Some(lobby_group_config) = lobby_group_config else {
fail(ctx, namespace_id, query_id, ErrorCode::LobbyNotFound, true).await?;
return complete_request(ctx.chirp(), analytics_events).await;
};

// Verify dev team status
if !team.deactivate_reasons.is_empty() {
Expand Down Expand Up @@ -467,11 +471,13 @@ pub struct LobbyGroupConfig {
}

/// Fetches the lobby group config (and lobby if direct).
///
/// Returning `None` indicates lobby not found.
#[tracing::instrument]
async fn fetch_lobby_group_config(
ctx: OperationContext<()>,
query: &Query,
) -> GlobalResult<LobbyGroupConfig> {
) -> GlobalResult<Option<LobbyGroupConfig>> {
// Get lobby group id from query
let (lobby_group_ids, lobby_info, lobby_state_json) = match query {
Query::LobbyGroup(backend::matchmaker::query::LobbyGroup {
Expand Down Expand Up @@ -499,7 +505,9 @@ async fn fetch_lobby_group_config(
lobby_ids: vec![lobby_id],
}),
)?;
let lobby = unwrap!(lobbies_res.lobbies.into_iter().next(), "lobby not found");
let Some(lobby) = lobbies_res.lobbies.into_iter().next() else {
return Ok(None);
};
let lobby_group_id = unwrap!(lobby.lobby_group_id);
let lobby_state = unwrap!(lobby_states_res.lobbies.into_iter().next());

Expand Down Expand Up @@ -551,13 +559,13 @@ async fn fetch_lobby_group_config(
.into_iter()
.unzip::<_, _, Vec<_>, Vec<_>>();

Ok(LobbyGroupConfig {
Ok(Some(LobbyGroupConfig {
version_id,
lobby_groups,
lobby_group_meta,
lobby_info,
lobby_state_json,
})
}))
}

#[derive(Clone)]
Expand Down