Adapted to some more changes in the api

Lol3rrr · Dec 13, 2023 · 71b9b7d · 71b9b7d
1 parent d68c023
commit 71b9b7d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/collector.rs b/src/collector.rs
@@ -48,11 +48,11 @@ pub struct PlayerInfo {
     warPreference: String,
     attackWins: usize,
     defenseWins: usize,
-    versusTrophies: usize,
-    bestVersusTrophies: usize,
+    versusTrophies: Option<usize>,
+    bestVersusTrophies: Option<usize>,
     townHallLevel: usize,
     townHallWeaponLevel: Option<usize>,
-    versusBattleWins: usize,
+    versusBattleWins: Option<usize>,
     legendStatistics: Option<serde_json::Value>,
     troops: serde_json::Value,
     heroes: serde_json::Value,
@@ -109,7 +109,7 @@ pub struct ClanInfo {
     capitalLeague: serde_json::Value,
     pub memberList: Vec<ClanMember>,
     tag: ClanTag,
-    requiredVersusTrophies: usize,
+    requiredVersusTrophies: Option<usize>,
     isWarLogPublic: bool,
     clanLevel: usize,
     warWinStreak: usize,
@@ -122,7 +122,7 @@ pub struct ClanInfo {
     isFamilyFriendly: bool,
     warFrequency: serde_json::Value,
     clanBuilderBasePoints: usize,
-    clanVersusPoints: usize,
+    clanVersusPoints: Option<usize>,
     clanCapitalPoints: usize,
     requiredTrophies: usize,
     requiredBuilderBaseTrophies: usize,
@@ -141,7 +141,7 @@ pub struct ClanInfo {
 pub struct ClanMember {
     league: serde_json::Value,
     builderBaseLeague: serde_json::Value,
-    versusTrophies: usize,
+    versusTrophies: Option<usize>,
     pub tag: PlayerTag,
     name: String,
     role: serde_json::Value,

diff --git a/src/main.rs b/src/main.rs
@@ -55,10 +55,10 @@ async fn main() {
 
     let mut storage_backend = args
         .subcommand_matches("bot")
-        .unwrap()
+        .expect("Missing subcommand")
         .get_one::<String>("storage")
         .map(|arg: &String| gold_pass_bot::parse_storage(&arg))
-        .unwrap()
+        .expect("Missing Storage")
         .unwrap();
 
     let api_path = std::env::var("API_PATH").unwrap_or_else(|_| "api.key".to_string());