pyrite/torn-api.rs
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

add faction id to rackets and fix territory wars

Browse source
This commit is contained in:
TotallyNot 2023-11-22 00:01:25 +01:00
parent af39b03ef2
commit c6e19918d0
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
torn-api/Cargo.toml
View file

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

18
torn-api/src/torn.rs
View file

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