add faction id to rackets and fix territory wars

torn-api/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "torn-api"
-version = "0.6.1"
+version = "0.6.2"
 edition = "2021"
 authors = ["Pyrit [2111649]"]
 license = "MIT"

torn-api/src/torn.rs

@@ -21,7 +21,11 @@ pub enum TornSelection {
     )]
     Competition,
 
-    #[api(type = "HashMap<String, TerritoryWar>", field = "territorywars")]
+    #[api(
+        type = "HashMap<String, TerritoryWar>",
+        with = "decode_territory_wars",
+        field = "territorywars"
+    )]
     TerritoryWars,
 
     #[api(type = "HashMap<String, Racket>", field = "rackets")]
@@ -57,6 +61,15 @@ pub enum Competition {
     Unkown(String),
 }
 
+fn decode_territory_wars<'de, D>(deserializer: D) -> Result<HashMap<String, TerritoryWar>, D::Error>
+where
+    D: serde::Deserializer<'de>,
+{
+    let map: Option<_> = serde::Deserialize::deserialize(deserializer)?;
+
+    Ok(map.unwrap_or_default())
+}
+
 fn decode_competition<'de, D>(deserializer: D) -> Result<Option<Competition>, D::Error>
 where
     D: serde::Deserializer<'de>,
@@ -140,6 +153,9 @@ pub struct Racket {
     pub created: DateTime<Utc>,
     #[serde(with = "chrono::serde::ts_seconds")]
     pub changed: DateTime<Utc>,
+
+    #[serde(rename = "faction")]
+    pub faction_id: Option<i32>,
 }
 
 #[derive(Debug, Clone, Deserialize)]