Fix for non-ladder game modes

Author: malted

src/base/clash.rs

@@ -16,12 +16,13 @@ pub struct ClashBattleArena {
 pub struct ClashBattleTeammate {
     pub tag: String,
     pub name: String,
-    pub starting_trophies: i64,
-    pub trophy_change: i64,
+    // Non-ladder modes (party/PvP variants) omit the trophy and tower fields.
+    pub starting_trophies: Option<i64>,
+    pub trophy_change: Option<i64>,
     pub crowns: i64,
-    pub king_tower_hit_points: i64,
+    pub king_tower_hit_points: Option<i64>,
     pub princess_towers_hit_points: Option<Vec<i64>>,
-    pub elixir_leaked: f64,
+    pub elixir_leaked: Option<f64>,
     pub cards: Vec<ClashCard>,
 }
 
@@ -62,8 +63,13 @@ pub async fn last_battles() -> reqwest::Result<Vec<ClashBattle>> {
 
     let url = format!("https://api.clashroyale.com/v1/players/{tag}/battlelog");
     let res: Value = client.get(url).send().await?.json().await?;
-    dbg!(&res);
-    let res: Vec<ClashBattle> = serde_json::from_value(res).unwrap();
+    let res: Vec<ClashBattle> = match serde_json::from_value(res) {
+        Ok(battles) => battles,
+        Err(e) => {
+            eprintln!("failed to parse clash battlelog: {e}");
+            Vec::new()
+        }
+    };
     Ok(res)
 }
 

src/main.rs

@@ -95,7 +95,19 @@ fn start_jobs(state: Arc<RwLock<State>>) {
             }
 
             match clash::last_battles().await {
-                Ok(battles) => state.write().last_clash_battle = battles.first().cloned(),
+                Ok(battles) => {
+                    // Find the first ladder game (there are so many party modes now...tsk)
+                    let last_ladder_game = battles.iter().find(|b| {
+                        let my_tag = std::env::var("CLASH_ROYALE_TAG")
+                            .expect("an env var named CLASH_ROYALE_TAG");
+                        b.team
+                            .iter()
+                            .find(|t| t.tag == my_tag)
+                            .map(|m| m.trophy_change.is_some())
+                            .unwrap_or(false)
+                    });
+                    state.write().last_clash_battle = last_ladder_game.cloned();
+                }
                 Err(e) => eprintln!("failed to fetch clash battles: {e}"),
             }
 
@@ -313,7 +325,7 @@ fn root(request: Request, state: Arc<RwLock<State>>) {
 
             let ago = chrono_humanize::HumanTime::from(battle.battle_time).to_string();
 
-            let s = if me.trophy_change.is_positive() {
+            let s = if me.trophy_change.expect("a None trophy_change should have been caught at the last_clash_battle setting point. It indicates it wasn't a ladder match.").is_positive() {
                 format!(
                     "\n{ago} I {}-crowned a {} deck using my {} deck in Clash Royale.\n",
                     me.crowns,