diff options
| author | Ilion Beyst <ilion.beyst@gmail.com> | 2022-07-04 20:16:42 +0200 |
|---|---|---|
| committer | Ilion Beyst <ilion.beyst@gmail.com> | 2022-07-04 20:16:42 +0200 |
| commit | 268e080ec1b11e75309c3b134e16cf6ea7004ac6 (patch) | |
| tree | 6cf54c91b4575494f1f2c2feb7790aadae817eb7 /planetwars-server/src/routes/matches.rs | |
| parent | bbed87755419f97b0ee8967617af0c6573c168af (diff) | |
| parent | 7a3b801f58752a78b65e3e7e7b998b6479f980f7 (diff) | |
| download | planetwars.dev-268e080ec1b11e75309c3b134e16cf6ea7004ac6.tar.xz planetwars.dev-268e080ec1b11e75309c3b134e16cf6ea7004ac6.zip | |
Merge branch 'bot-api' into next
Diffstat (limited to 'planetwars-server/src/routes/matches.rs')
| -rw-r--r-- | planetwars-server/src/routes/matches.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/planetwars-server/src/routes/matches.rs b/planetwars-server/src/routes/matches.rs index b61008d..874c775 100644 --- a/planetwars-server/src/routes/matches.rs +++ b/planetwars-server/src/routes/matches.rs @@ -61,7 +61,7 @@ pub async fn play_match( }); bot_ids.push(matches::MatchPlayerData { - code_bundle_id: code_bundle.id, + code_bundle_id: Some(code_bundle.id), }); } @@ -107,7 +107,7 @@ pub struct ApiMatch { #[derive(Serialize, Deserialize)] pub struct ApiMatchPlayer { - code_bundle_id: i32, + code_bundle_id: Option<i32>, bot_id: Option<i32>, bot_name: Option<String>, } @@ -127,7 +127,7 @@ pub fn match_data_to_api(data: matches::FullMatchData) -> ApiMatch { .match_players .iter() .map(|_p| ApiMatchPlayer { - code_bundle_id: _p.code_bundle.id, + code_bundle_id: _p.code_bundle.as_ref().map(|cb| cb.id), bot_id: _p.bot.as_ref().map(|b| b.id), bot_name: _p.bot.as_ref().map(|b| b.name.clone()), }) |