From 74d86a9a0c73c9926efa0dda462c7dca2f4d71aa Mon Sep 17 00:00:00 2001 From: Jonni Liljamo Date: Thu, 9 Feb 2023 14:05:00 +0200 Subject: [PATCH] feat(sdbclient): adhere to new game API responses --- sdbclient/src/api/game/mod.rs | 5 +---- sdbclient/src/api/game/types.rs | 2 ++ sdbclient/src/plugins/menu/play/allformingcall.rs | 4 +--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/sdbclient/src/api/game/mod.rs b/sdbclient/src/api/game/mod.rs index 5492a2d..fed8706 100644 --- a/sdbclient/src/api/game/mod.rs +++ b/sdbclient/src/api/game/mod.rs @@ -37,10 +37,7 @@ pub fn create(api_address: String, token: String) -> ResponseCreateGame { resp.json().unwrap() } -#[derive(Debug, Serialize, Deserialize)] -pub struct ResultAllForming { - pub games: Vec, -} +pub type ResultAllForming = Vec; #[derive(Debug, Serialize, Deserialize)] #[serde(untagged)] diff --git a/sdbclient/src/api/game/types.rs b/sdbclient/src/api/game/types.rs index 6bbcc1b..67828ef 100644 --- a/sdbclient/src/api/game/types.rs +++ b/sdbclient/src/api/game/types.rs @@ -11,6 +11,8 @@ use serde::{Deserialize, Serialize}; #[derive(Debug, Serialize, Deserialize)] pub struct Game { pub id: String, + pub created_at: String, + pub updated_at: String, pub p1: String, pub p2: String, pub state: u8, diff --git a/sdbclient/src/plugins/menu/play/allformingcall.rs b/sdbclient/src/plugins/menu/play/allformingcall.rs index 78184af..a840eb9 100644 --- a/sdbclient/src/plugins/menu/play/allformingcall.rs +++ b/sdbclient/src/plugins/menu/play/allformingcall.rs @@ -67,9 +67,7 @@ pub(super) fn handle( if let Some(all_forming_call_response) = future::block_on(future::poll_once(&mut task.0)) { rtdmenu.waiting_for_all_forming_call = false; match all_forming_call_response.all_forming { - ResponseAllForming::Valid(res) => { - rtdmenu.all_forming_games = res.games; - } + ResponseAllForming::Valid(res) => rtdmenu.all_forming_games = res, ResponseAllForming::Error(error) => { console.send(PrintConsoleLine::new( format!("Fetching all forming games faield, got error: '{}'", error).into(), -- 2.44.1