From dacf4f70b5e217fa65df699a70167012027c32da Mon Sep 17 00:00:00 2001 From: Celeo Date: Tue, 30 Jan 2024 11:47:18 -0800 Subject: [PATCH] Update types for ESI-given types --- src/groups/alliance.rs | 18 ++++++++-------- src/groups/assets.rs | 24 ++++++++++----------- src/groups/character.rs | 38 ++++++++++++++++----------------- src/groups/clones.rs | 12 +++++------ src/groups/corporation.rs | 24 ++++++++++----------- src/groups/faction_warfare.rs | 22 +++++++++---------- src/groups/incursions.rs | 6 +++--- src/groups/industry.rs | 2 +- src/groups/killmails.rs | 40 +++++++++++++++++------------------ src/groups/location.rs | 10 ++++----- src/groups/skills.rs | 24 ++++++++++----------- src/groups/universe.rs | 6 +++--- 12 files changed, 113 insertions(+), 113 deletions(-) diff --git a/src/groups/alliance.rs b/src/groups/alliance.rs index b4e9331..df89452 100644 --- a/src/groups/alliance.rs +++ b/src/groups/alliance.rs @@ -8,11 +8,11 @@ pub struct AllianceGroup<'a> { #[derive(Debug, Deserialize, Serialize, Clone)] #[allow(missing_docs)] pub struct AllianceInfo { - pub creator_corporation_id: u64, - pub creator_id: u64, + pub creator_corporation_id: i32, + pub creator_id: i32, pub date_founded: String, - pub executor_corporation_id: Option, - pub faction_id: Option, + pub executor_corporation_id: Option, + pub faction_id: Option, pub name: String, pub ticker: String, } @@ -30,7 +30,7 @@ impl<'a> AllianceGroup<'a> { list_ids, "get_alliances", RequestType::Public, - Vec, + Vec, ); api_get!( @@ -39,7 +39,7 @@ impl<'a> AllianceGroup<'a> { "get_alliances_alliance_id", RequestType::Public, AllianceInfo, - (alliance_id: u64) => "{alliance_id}" + (alliance_id: i32) => "{alliance_id}" ); api_get!( @@ -47,8 +47,8 @@ impl<'a> AllianceGroup<'a> { get_alliance_corporations, "get_alliances_alliance_id_corporations", RequestType::Public, - Vec, - (alliance_id: u64) => "{alliance_id}" + Vec, + (alliance_id: i32) => "{alliance_id}" ); api_get!( @@ -57,6 +57,6 @@ impl<'a> AllianceGroup<'a> { "get_alliances_alliance_id_icons", RequestType::Public, AllianceIcons, - (alliance_id: u64) => "{alliance_id}" + (alliance_id: i32) => "{alliance_id}" ); } diff --git a/src/groups/assets.rs b/src/groups/assets.rs index b7bf121..a8ef965 100644 --- a/src/groups/assets.rs +++ b/src/groups/assets.rs @@ -10,26 +10,26 @@ pub struct AssetsGroup<'a> { pub struct Asset { pub is_blueprint_copy: Option, pub is_singleton: bool, - pub item_id: u64, + pub item_id: i64, pub location_flag: String, - pub location_id: u64, + pub location_id: i64, pub location_type: String, - pub quantity: u64, - pub type_id: u64, + pub quantity: i32, + pub type_id: i32, } #[derive(Debug, Deserialize)] #[allow(missing_docs)] pub struct AssetLocationPosition { - pub x: u64, - pub y: u64, - pub z: u64, + pub x: f64, + pub y: f64, + pub z: f64, } #[derive(Debug, Deserialize)] #[allow(missing_docs)] pub struct AssetLocation { - pub item_id: u64, + pub item_id: i64, pub position: AssetLocationPosition, } @@ -47,7 +47,7 @@ impl<'a> AssetsGroup<'a> { "get_characters_character_id_assets", RequestType::Authenticated, Vec, - (character_id: u64) => "{character_id}" + (character_id: i32) => "{character_id}" ); api_post!( @@ -56,8 +56,8 @@ impl<'a> AssetsGroup<'a> { "post_characters_character_id_assets_locations", RequestType::Authenticated, Vec, - (character_id: u64) => "{character_id}", - item_ids: &[u64], + (character_id: i32) => "{character_id}", + item_ids: &[i64], ); api_post!( @@ -66,7 +66,7 @@ impl<'a> AssetsGroup<'a> { "post_characters_character_id_assets_names", RequestType::Authenticated, Vec, - (character_id: u64) => "{character_id}", + (character_id: i32) => "{character_id}", item_ids: &[u64], ); diff --git a/src/groups/character.rs b/src/groups/character.rs index f941dd9..503eed4 100644 --- a/src/groups/character.rs +++ b/src/groups/character.rs @@ -8,10 +8,10 @@ pub struct CharacterGroup<'a> { #[derive(Debug, Deserialize)] #[allow(missing_docs)] pub struct CharacterPublicInfo { - pub alliance_id: Option, + pub alliance_id: Option, pub birthday: String, - pub bloodline_id: u64, - pub corporation_id: u64, + pub bloodline_id: i32, + pub corporation_id: i32, pub description: Option, pub gender: String, pub name: String, @@ -23,9 +23,9 @@ pub struct CharacterPublicInfo { #[derive(Debug, Deserialize)] #[allow(missing_docs)] pub struct CharacterCorporationHistoryItem { - pub corporation_id: u64, + pub corporation_id: i32, pub is_deleted: Option, - pub record_id: u64, + pub record_id: i32, pub start_date: String, } @@ -41,23 +41,23 @@ pub struct CharacterPortraitInfo { #[derive(Debug, Deserialize)] #[allow(missing_docs)] pub struct CharacterAffiliation { - pub alliance_id: Option, - pub character_id: u64, - pub corporation_id: u64, - pub faction_id: Option, + pub alliance_id: Option, + pub character_id: i32, + pub corporation_id: i32, + pub faction_id: Option, } #[derive(Debug, Deserialize)] #[allow(missing_docs)] pub struct Blueprint { - pub item_id: u64, + pub item_id: i64, pub location_flag: String, - pub location_id: u64, - pub material_efficiency: u8, + pub location_id: i64, + pub material_efficiency: i32, pub quantity: i32, - pub runs: i64, - pub time_efficiency: u8, - pub type_id: u64, + pub runs: i32, + pub time_efficiency: i32, + pub type_id: i32, } impl<'a> CharacterGroup<'a> { @@ -67,7 +67,7 @@ impl<'a> CharacterGroup<'a> { "get_characters_character_id", RequestType::Public, CharacterPublicInfo, - (character_id: u64) => "{character_id}" + (character_id: i32) => "{character_id}" ); api_get!( @@ -76,7 +76,7 @@ impl<'a> CharacterGroup<'a> { "get_characters_character_id_corporationhistory", RequestType::Public, Vec, - (character_id: u64) => "{character_id}" + (character_id: i32) => "{character_id}" ); api_get!( @@ -85,7 +85,7 @@ impl<'a> CharacterGroup<'a> { "get_characters_character_id_portrait", RequestType::Public, CharacterPortraitInfo, - (character_id: u64) => "{character_id}" + (character_id: i32) => "{character_id}" ); api_post!( @@ -104,7 +104,7 @@ impl<'a> CharacterGroup<'a> { "get_characters_character_id_blueprints", RequestType::Authenticated, Vec, - (character_id: u64) => "{character_id}" + (character_id: i32) => "{character_id}" ); // more endpoints ... diff --git a/src/groups/clones.rs b/src/groups/clones.rs index 1858091..7f69c5e 100644 --- a/src/groups/clones.rs +++ b/src/groups/clones.rs @@ -8,16 +8,16 @@ pub struct ClonesGroup<'a> { #[derive(Debug, Deserialize)] #[allow(missing_docs)] pub struct CloneHome { - pub location_id: Option, + pub location_id: Option, pub location_type: Option, } #[derive(Debug, Deserialize)] #[allow(missing_docs)] pub struct JumpClone { - pub implants: Vec, - pub jump_clone_id: u32, - pub location_id: u64, + pub implants: Vec, + pub jump_clone_id: i32, + pub location_id: i64, pub location_type: String, pub name: Option, } @@ -37,7 +37,7 @@ impl<'a> ClonesGroup<'a> { "get_characters_character_id_clones", RequestType::Authenticated, Clones, - (character_id: u64) => "{character_id}" + (character_id: i32) => "{character_id}" ); api_get!( @@ -46,6 +46,6 @@ impl<'a> ClonesGroup<'a> { "get_characters_character_id_implants", RequestType::Authenticated, Vec, - (character_id: u64) => "{character_id}" + (character_id: i32) => "{character_id}" ); } diff --git a/src/groups/corporation.rs b/src/groups/corporation.rs index 46e3cd9..6efae0a 100644 --- a/src/groups/corporation.rs +++ b/src/groups/corporation.rs @@ -3,17 +3,17 @@ use crate::prelude::*; #[derive(Debug, Deserialize, Serialize, Clone)] #[allow(missing_docs)] pub struct CorporationPublicInfo { - pub alliance_id: Option, - pub ceo_id: u64, - pub creator_id: u64, + pub alliance_id: Option, + pub ceo_id: i32, + pub creator_id: i32, pub date_founded: Option, pub description: Option, - pub faction_id: Option, - pub home_station_id: Option, - pub member_count: u64, + pub faction_id: Option, + pub home_station_id: Option, + pub member_count: i32, pub name: String, pub shares: Option, - pub tax_rate: f32, + pub tax_rate: f64, pub ticker: Option, pub url: Option, pub war_eligible: Option, @@ -22,9 +22,9 @@ pub struct CorporationPublicInfo { #[derive(Debug, Deserialize)] #[allow(missing_docs)] pub struct CorporationHistoryItem { - pub alliance_id: Option, + pub alliance_id: Option, pub is_deleted: Option, - pub record_id: u64, + pub record_id: i32, pub start_date: String, } @@ -40,7 +40,7 @@ impl<'a> CorporationGroup<'a> { "get_corporations_corporation_id", RequestType::Public, CorporationPublicInfo, - (corporation_id: u64) => "{corporation_id}" + (corporation_id: i32) => "{corporation_id}" ); api_get!( @@ -49,7 +49,7 @@ impl<'a> CorporationGroup<'a> { "get_corporations_corporation_id_alliancehistory", RequestType::Public, Vec, - (corporation_id: u64) => "{corporation_id}" + (corporation_id: i32) => "{corporation_id}" ); api_get!( @@ -60,7 +60,7 @@ impl<'a> CorporationGroup<'a> { "get_corporations_corporation_id_members", RequestType::Authenticated, Vec, - (corporation_id: u64) => "{corporation_id}" + (corporation_id: i32) => "{corporation_id}" ); api_get!( diff --git a/src/groups/faction_warfare.rs b/src/groups/faction_warfare.rs index 48ed3d3..38c698a 100644 --- a/src/groups/faction_warfare.rs +++ b/src/groups/faction_warfare.rs @@ -8,8 +8,8 @@ pub struct FactionWarfareGroup<'a> { #[derive(Debug, Deserialize)] #[allow(missing_docs)] pub struct FactionLeaderboardItem { - pub amount: Option, - pub faction_id: Option, + pub amount: Option, + pub faction_id: Option, } #[derive(Debug, Deserialize)] @@ -30,8 +30,8 @@ pub struct FWLeaderboards { #[derive(Debug, Deserialize)] #[allow(missing_docs)] pub struct CharacterLeaderboardItem { - pub amount: u64, - pub character_id: u64, + pub amount: i32, + pub character_id: i32, } #[derive(Debug, Deserialize)] @@ -52,8 +52,8 @@ pub struct FWCharacterLeaderboards { #[derive(Debug, Deserialize)] #[allow(missing_docs)] pub struct CorporationLeaderboardItem { - pub amount: u64, - pub corporation_id: u64, + pub amount: i32, + pub corporation_id: i32, } #[derive(Debug, Deserialize)] @@ -74,9 +74,9 @@ pub struct FWCorporationLeaderboards { #[derive(Debug, Deserialize)] #[allow(missing_docs)] pub struct FWStatsItemRange { - pub total: u32, - pub last_week: u32, - pub yesterday: u32, + pub total: i32, + pub last_week: i32, + pub yesterday: i32, } #[derive(Debug, Deserialize)] @@ -103,8 +103,8 @@ pub struct FWSystem { #[derive(Debug, Deserialize)] #[allow(missing_docs)] pub struct FWWar { - pub faction_id: u32, - pub against_id: u32, + pub faction_id: i32, + pub against_id: i32, } impl<'a> FactionWarfareGroup<'a> { diff --git a/src/groups/incursions.rs b/src/groups/incursions.rs index cdb2cdd..e07ee1d 100644 --- a/src/groups/incursions.rs +++ b/src/groups/incursions.rs @@ -8,12 +8,12 @@ pub struct IncursionsGroup<'a> { #[derive(Debug, Deserialize)] #[allow(missing_docs)] pub struct Incursion { - pub constellation_id: u64, - pub faction_id: u64, + pub constellation_id: i32, + pub faction_id: i32, pub has_boss: bool, pub infested_solar_systems: Vec, pub influence: f64, - pub staging_solar_system_id: u64, + pub staging_solar_system_id: i32, pub state: String, #[serde(rename = "type")] pub incursion_type: String, diff --git a/src/groups/industry.rs b/src/groups/industry.rs index af378d2..efac423 100644 --- a/src/groups/industry.rs +++ b/src/groups/industry.rs @@ -11,7 +11,7 @@ pub struct IndustryGroup<'a> { #[allow(missing_docs)] pub struct CostIndex { pub activity: String, - pub cost_index: f32, + pub cost_index: f64, } #[derive(Debug, Deserialize, Serialize, Clone)] diff --git a/src/groups/killmails.rs b/src/groups/killmails.rs index 6aeefb2..fd268d2 100644 --- a/src/groups/killmails.rs +++ b/src/groups/killmails.rs @@ -15,43 +15,43 @@ pub struct RecentKillMail { #[derive(Debug, Deserialize)] #[allow(missing_docs)] pub struct KillmailAttacker { - pub alliance_id: Option, - pub character_id: Option, - pub corporation_id: Option, - pub damage_done: u64, + pub alliance_id: Option, + pub character_id: Option, + pub corporation_id: Option, + pub damage_done: i32, pub final_blow: bool, pub security_status: f64, - pub ship_type_id: Option, - pub weapon_type_id: Option, + pub ship_type_id: Option, + pub weapon_type_id: Option, } #[derive(Debug, Deserialize)] #[allow(missing_docs)] pub struct KillmailItem { - pub flag: u64, - pub item_type_id: u64, - pub quantity_destroyed: Option, - pub quantity_dropped: Option, - pub singleton: u32, + pub flag: i32, + pub item_type_id: i32, + pub quantity_destroyed: Option, + pub quantity_dropped: Option, + pub singleton: i32, } #[derive(Debug, Deserialize)] #[allow(missing_docs)] pub struct KillmailVictim { - pub alliance_id: Option, - pub character_id: Option, - pub corporation_id: Option, - pub damage_taken: u64, - pub faction_id: Option, + pub alliance_id: Option, + pub character_id: Option, + pub corporation_id: Option, + pub damage_taken: i32, + pub faction_id: Option, pub items: Option>, } #[derive(Debug, Deserialize)] #[allow(missing_docs)] pub struct Killmail { - pub killmail_id: u64, + pub killmail_id: i32, pub killmail_type: String, - pub solar_system_id: u64, + pub solar_system_id: i32, pub moon_id: Option, pub attackers: Vec, pub victim: KillmailVictim, @@ -65,7 +65,7 @@ impl<'a> KillmailsGroup<'a> { "get_characters_character_id_killmails_recent", RequestType::Authenticated, Vec, - (character_id: u64) => "{character_id}" + (character_id: i32) => "{character_id}" ); api_get!( @@ -74,7 +74,7 @@ impl<'a> KillmailsGroup<'a> { "get_killmails_killmail_id_killmail_hash", RequestType::Public, Killmail, - (killmail_id: u64) => "{killmail_id}", + (killmail_id: i32) => "{killmail_id}", (killmail_hash: &str) => "{killmail_hash}" ); diff --git a/src/groups/location.rs b/src/groups/location.rs index 316e755..7d2db66 100644 --- a/src/groups/location.rs +++ b/src/groups/location.rs @@ -10,7 +10,7 @@ pub struct LocationGroup<'a> { pub struct LocationInfo { pub solar_system_id: i32, pub station_id: Option, - pub structure_id: Option, + pub structure_id: Option, } #[derive(Debug, Deserialize)] @@ -25,7 +25,7 @@ pub struct OnlineStatus { #[derive(Debug, Deserialize)] #[allow(missing_docs)] pub struct CurrentShip { - pub ship_item_id: u64, + pub ship_item_id: i64, pub ship_name: String, pub ship_type_id: i32, } @@ -37,7 +37,7 @@ impl<'a> LocationGroup<'a> { "get_characters_character_id_location", RequestType::Authenticated, LocationInfo, - (character_id: u64) => "{character_id}" + (character_id: i32) => "{character_id}" ); api_get!( @@ -46,7 +46,7 @@ impl<'a> LocationGroup<'a> { "get_characters_character_id_online", RequestType::Authenticated, OnlineStatus, - (character_id: u64) => "{character_id}" + (character_id: i32) => "{character_id}" ); api_get!( @@ -55,6 +55,6 @@ impl<'a> LocationGroup<'a> { "get_characters_character_id_ship", RequestType::Authenticated, CurrentShip, - (character_id: u64) => "{character_id}" + (character_id: i32) => "{character_id}" ); } diff --git a/src/groups/skills.rs b/src/groups/skills.rs index aaa3602..2516472 100644 --- a/src/groups/skills.rs +++ b/src/groups/skills.rs @@ -1,25 +1,25 @@ use crate::prelude::*; +/// Endpoints for Skills +pub struct SkillsGroup<'a> { + pub(crate) esi: &'a Esi, +} + #[derive(Debug, Deserialize)] #[allow(missing_docs)] pub struct Skill { - pub skill_id: u32, - pub active_skill_level: u32, - pub skillpoints_in_skill: u64, - pub trained_skill_level: u32, + pub skill_id: i32, + pub active_skill_level: i32, + pub skillpoints_in_skill: i64, + pub trained_skill_level: i32, } #[derive(Debug, Deserialize)] #[allow(missing_docs)] pub struct Skills { pub skills: Vec, - pub total_sp: u64, - pub unallocated_sp: u32, -} - -/// Endpoints for Skills -pub struct SkillsGroup<'a> { - pub(crate) esi: &'a Esi, + pub total_sp: i64, + pub unallocated_sp: i32, } impl<'a> SkillsGroup<'a> { @@ -29,6 +29,6 @@ impl<'a> SkillsGroup<'a> { "get_characters_character_id_skills", RequestType::Authenticated, Skills, - (character_id: u64) => "{character_id}" + (character_id: i32) => "{character_id}" ); } diff --git a/src/groups/universe.rs b/src/groups/universe.rs index 137750b..9c00c53 100644 --- a/src/groups/universe.rs +++ b/src/groups/universe.rs @@ -72,7 +72,7 @@ pub struct Ids { #[derive(Debug, Deserialize)] #[allow(missing_docs)] pub struct Category { - pub id: u64, + pub id: i32, pub name: String, } @@ -259,7 +259,7 @@ impl<'a> UniverseGroup<'a> { "get_universe_stations_station_id", RequestType::Public, Station, - (station_id: u64) => "{station_id}" + (station_id: i32) => "{station_id}" ); api_get!( @@ -268,7 +268,7 @@ impl<'a> UniverseGroup<'a> { "get_universe_structures_structure_id", RequestType::Authenticated, Structure, - (structure_id: u64) => "{structure_id}" + (structure_id: i64) => "{structure_id}" ); api_post!(