diff options
| author | Ilion Beyst <ilion.beyst@gmail.com> | 2022-06-10 21:09:33 +0200 |
|---|---|---|
| committer | Ilion Beyst <ilion.beyst@gmail.com> | 2022-06-10 21:09:33 +0200 |
| commit | 5ee66c9c9b4156692c739a861c9cdbaf0c65aec8 (patch) | |
| tree | 55c1ce0b99b26c6837304d72da772be6491882ff /planetwars-server/src/routes | |
| parent | d1977b95c82f608bc558432cdfba8026aaf0648d (diff) | |
| download | planetwars.dev-5ee66c9c9b4156692c739a861c9cdbaf0c65aec8.tar.xz planetwars.dev-5ee66c9c9b4156692c739a861c9cdbaf0c65aec8.zip | |
allow match_player code_bundle_id to be null
Diffstat (limited to 'planetwars-server/src/routes')
| -rw-r--r-- | planetwars-server/src/routes/bots.rs | 2 | ||||
| -rw-r--r-- | planetwars-server/src/routes/demo.rs | 4 | ||||
| -rw-r--r-- | planetwars-server/src/routes/matches.rs | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/planetwars-server/src/routes/bots.rs b/planetwars-server/src/routes/bots.rs index 3bbaa1a..df0c4d0 100644 --- a/planetwars-server/src/routes/bots.rs +++ b/planetwars-server/src/routes/bots.rs @@ -12,7 +12,7 @@ use std::path::PathBuf; use thiserror; use crate::db::bots::{self, CodeBundle}; -use crate::db::ratings::{RankedBot, self}; +use crate::db::ratings::{self, RankedBot}; use crate::db::users::User; use crate::modules::bots::save_code_bundle; use crate::{DatabaseConnection, BOTS_DIR}; diff --git a/planetwars-server/src/routes/demo.rs b/planetwars-server/src/routes/demo.rs index 7f7ba71..3318dfd 100644 --- a/planetwars-server/src/routes/demo.rs +++ b/planetwars-server/src/routes/demo.rs @@ -58,12 +58,12 @@ pub async fn submit_bot( match_players: vec![ FullMatchPlayerData { base: match_data.match_players[0].clone(), - code_bundle: player_code_bundle, + code_bundle: Some(player_code_bundle), bot: None, }, FullMatchPlayerData { base: match_data.match_players[1].clone(), - code_bundle: opponent_code_bundle, + code_bundle: Some(opponent_code_bundle), bot: Some(opponent), }, ], diff --git a/planetwars-server/src/routes/matches.rs b/planetwars-server/src/routes/matches.rs index b61008d..7169ebe 100644 --- a/planetwars-server/src/routes/matches.rs +++ b/planetwars-server/src/routes/matches.rs @@ -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()), }) |