Update structs for returned data

Author: Celeo

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rfesi"
-version = "0.16.1"
+version = "0.17.0"
 authors = ["Celeo <[email protected]>"]
 edition = "2021"
 description = "Rust API for EVE Online's ESI"

src/groups/alliance.rs

@@ -11,16 +11,17 @@ pub struct AllianceInfo {
     pub creator_corporation_id: u64,
     pub creator_id: u64,
     pub date_founded: String,
-    pub executor_corporation_id: u64,
+    pub executor_corporation_id: Option<u32>,
+    pub faction_id: Option<u32>,
     pub name: String,
     pub ticker: String,
 }
 
 #[derive(Debug, Deserialize)]
 #[allow(missing_docs)]
 pub struct AllianceIcons {
-    pub px128x128: String,
-    pub px64x64: String,
+    pub px128x128: Option<String>,
+    pub px64x64: Option<String>,
 }
 
 impl<'a> AllianceGroup<'a> {
@@ -29,7 +30,7 @@ impl<'a> AllianceGroup<'a> {
         list_ids,
         "get_alliances",
         RequestType::Public,
-        Vec<u64>,
+        Vec<u32>,
     );
 
     api_get!(
@@ -46,7 +47,7 @@ impl<'a> AllianceGroup<'a> {
         get_alliance_corporations,
         "get_alliances_alliance_id_corporations",
         RequestType::Public,
-        Vec<u64>,
+        Vec<u32>,
         (alliance_id: u64) => "{alliance_id}"
     );
 

src/groups/assets.rs

@@ -8,6 +8,7 @@ pub struct AssetsGroup<'a> {
 #[derive(Debug, Deserialize)]
 #[allow(missing_docs)]
 pub struct Asset {
+    pub is_blueprint_copy: Option<bool>,
     pub is_singleton: bool,
     pub item_id: u64,
     pub location_flag: String,
@@ -69,15 +70,14 @@ impl<'a> AssetsGroup<'a> {
         item_ids: &[u64],
     );
 
-    // NOTE: assuming return type; don't have the permissions to check
     api_get!(
         /// Get a corporation's assets.
         ///
         /// Requires the auth'd character to be a director/+ in the corp.
         get_corporation_assets,
         "get_corporations_corporation_id_assets",
         RequestType::Authenticated,
-        Vec<u64>,
+        Vec<Asset>,
         (corporation_id: u64) => "{corporation_id}"
     );
 

src/groups/character.rs

@@ -8,40 +8,43 @@ pub struct CharacterGroup<'a> {
 #[derive(Debug, Deserialize)]
 #[allow(missing_docs)]
 pub struct CharacterPublicInfo {
-    pub alliance_id: u64,
+    pub alliance_id: Option<u64>,
     pub birthday: String,
     pub bloodline_id: u64,
     pub corporation_id: u64,
-    pub description: String,
+    pub description: Option<String>,
     pub gender: String,
     pub name: String,
     pub race_id: u16,
-    pub security_status: f64,
+    pub security_status: Option<f64>,
+    pub title: Option<String>,
 }
 
 #[derive(Debug, Deserialize)]
 #[allow(missing_docs)]
 pub struct CharacterCorporationHistoryItem {
     pub corporation_id: u64,
+    pub is_deleted: Option<bool>,
     pub record_id: u64,
     pub start_date: String,
 }
 
 #[derive(Debug, Deserialize)]
 #[allow(missing_docs)]
 pub struct CharacterPortraitInfo {
-    pub px128x128: String,
-    pub px256x256: String,
-    pub px512x512: String,
-    pub px64x64: String,
+    pub px128x128: Option<String>,
+    pub px256x256: Option<String>,
+    pub px512x512: Option<String>,
+    pub px64x64: Option<String>,
 }
 
 #[derive(Debug, Deserialize)]
 #[allow(missing_docs)]
 pub struct CharacterAffiliation {
-    pub alliance_id: u64,
-    pub character: u64,
-    pub corporation: u64,
+    pub alliance_id: Option<u64>,
+    pub character_id: u64,
+    pub corporation_id: u64,
+    pub faction_id: Option<u64>,
 }
 
 impl<'a> CharacterGroup<'a> {

src/groups/clones.rs

@@ -8,15 +8,15 @@ pub struct ClonesGroup<'a> {
 #[derive(Debug, Deserialize)]
 #[allow(missing_docs)]
 pub struct CloneHome {
-    pub location_id: u64,
-    pub location_type: String,
+    pub location_id: Option<u64>,
+    pub location_type: Option<String>,
 }
 
 #[derive(Debug, Deserialize)]
 #[allow(missing_docs)]
 pub struct JumpClone {
-    pub implants: Vec<u64>,
-    pub jump_clone_id: u64,
+    pub implants: Vec<u32>,
+    pub jump_clone_id: u32,
     pub location_id: u64,
     pub location_type: String,
     pub name: Option<String>,
@@ -25,7 +25,7 @@ pub struct JumpClone {
 #[derive(Debug, Deserialize)]
 #[allow(missing_docs)]
 pub struct Clones {
-    pub home_location: CloneHome,
+    pub home_location: Option<CloneHome>,
     pub jump_clones: Vec<JumpClone>,
     pub last_clone_jump_date: String,
 }
@@ -45,7 +45,7 @@ impl<'a> ClonesGroup<'a> {
         get_clone_implants,
         "get_characters_character_id_implants",
         RequestType::Authenticated,
-        Vec<u64>,
+        Vec<u32>,
         (character_id: u64) => "{character_id}"
     );
 }

src/groups/corporation.rs

@@ -6,22 +6,24 @@ pub struct CorporationPublicInfo {
     pub alliance_id: Option<u64>,
     pub ceo_id: u64,
     pub creator_id: u64,
-    pub date_founded: String,
-    pub description: String,
-    pub home_station_id: u64,
+    pub date_founded: Option<String>,
+    pub description: Option<String>,
+    pub faction_id: Option<u64>,
+    pub home_station_id: Option<u64>,
     pub member_count: u64,
     pub name: String,
-    pub shares: u64,
+    pub shares: Option<u64>,
     pub tax_rate: f32,
-    pub ticket: String,
-    pub url: String,
-    pub war_eligible: bool,
+    pub ticker: Option<String>,
+    pub url: Option<String>,
+    pub war_eligible: Option<bool>,
 }
 
 #[derive(Debug, Deserialize)]
 #[allow(missing_docs)]
 pub struct CorporationHistoryItem {
-    pub alliance_id: u64,
+    pub alliance_id: Option<u64>,
+    pub is_deleted: Option<bool>,
     pub record_id: u64,
     pub start_date: String,
 }

src/groups/faction_warfare.rs

@@ -8,8 +8,8 @@ pub struct FactionWarfareGroup<'a> {
 #[derive(Debug, Deserialize)]
 #[allow(missing_docs)]
 pub struct FactionLeaderboardItem {
-    pub amount: u64,
-    pub faction_id: u64,
+    pub amount: Option<u64>,
+    pub faction_id: Option<u64>,
 }
 
 #[derive(Debug, Deserialize)]
@@ -74,37 +74,37 @@ pub struct FWCorporationLeaderboards {
 #[derive(Debug, Deserialize)]
 #[allow(missing_docs)]
 pub struct FWStatsItemRange {
-    pub total: u64,
-    pub last_week: u64,
-    pub yesterday: u64,
+    pub total: u32,
+    pub last_week: u32,
+    pub yesterday: u32,
 }
 
 #[derive(Debug, Deserialize)]
 #[allow(missing_docs)]
 pub struct FWStatsItem {
-    pub faction_id: u64,
+    pub faction_id: u32,
     pub kills: FWStatsItemRange,
-    pub pilots: u64,
-    pub systems_controlled: u64,
+    pub pilots: u32,
+    pub systems_controlled: u32,
     pub victory_points: FWStatsItemRange,
 }
 
 #[derive(Debug, Deserialize)]
 #[allow(missing_docs)]
 pub struct FWSystem {
     pub contested: String,
-    pub occupier_faction_id: u64,
-    pub owner_faction_id: u64,
-    pub solar_system_id: u64,
-    pub victory_points: u64,
-    pub victory_points_threshold: u64,
+    pub occupier_faction_id: u8,
+    pub owner_faction_id: u32,
+    pub solar_system_id: u32,
+    pub victory_points: u32,
+    pub victory_points_threshold: u32,
 }
 
 #[derive(Debug, Deserialize)]
 #[allow(missing_docs)]
 pub struct FWWar {
-    pub faction_id: u64,
-    pub against_id: u64,
+    pub faction_id: u32,
+    pub against_id: u32,
 }
 
 impl<'a> FactionWarfareGroup<'a> {

src/groups/incursions.rs

@@ -11,9 +11,9 @@ pub struct Incursion {
     pub constellation_id: u64,
     pub faction_id: u64,
     pub has_boss: bool,
-    pub infested_solar_systems: Vec<u64>,
+    pub infested_solar_systems: Vec<u32>,
     pub influence: f64,
-    pub staging_solar_system_id: i64,
+    pub staging_solar_system_id: u64,
     pub state: String,
     #[serde(rename = "type")]
     pub incursion_type: String,

src/groups/killmails.rs

@@ -5,36 +5,45 @@ pub struct KillmailsGroup<'a> {
     pub(crate) esi: &'a Esi,
 }
 
+#[derive(Debug, Deserialize)]
+#[allow(missing_docs)]
+pub struct RecentKillMail {
+    pub killmail_hash: String,
+    pub killmail_id: i32,
+}
+
 #[derive(Debug, Deserialize)]
 #[allow(missing_docs)]
 pub struct KillmailAttacker {
-    pub alliance_id: u64,
-    pub character_id: u64,
-    pub corporation_id: u64,
+    pub alliance_id: Option<u64>,
+    pub character_id: Option<u64>,
+    pub corporation_id: Option<u64>,
     pub damage_done: u64,
     pub final_blow: bool,
     pub security_status: f64,
-    pub ship_type_id: u64,
-    pub weapon_type_id: u64,
+    pub ship_type_id: Option<u64>,
+    pub weapon_type_id: Option<u64>,
 }
 
 #[derive(Debug, Deserialize)]
 #[allow(missing_docs)]
 pub struct KillmailItem {
     pub flag: u64,
     pub item_type_id: u64,
-    pub quantity_dropped: u64,
-    pub singleton: u8,
+    pub quantity_destroyed: Option<u64>,
+    pub quantity_dropped: Option<u64>,
+    pub singleton: u32,
 }
 
 #[derive(Debug, Deserialize)]
 #[allow(missing_docs)]
 pub struct KillmailVictim {
-    pub character_id: u64,
-    pub corporation_id: u64,
+    pub alliance_id: Option<u32>,
+    pub character_id: Option<u64>,
+    pub corporation_id: Option<u64>,
     pub damage_taken: u64,
-    pub faction_id: u64,
-    pub items: Vec<KillmailItem>,
+    pub faction_id: Option<u64>,
+    pub items: Option<Vec<KillmailItem>>,
 }
 
 #[derive(Debug, Deserialize)]
@@ -43,6 +52,7 @@ pub struct Killmail {
     pub killmail_id: u64,
     pub killmail_type: String,
     pub solar_system_id: u64,
+    pub moon_id: Option<i32>,
     pub attackers: Vec<KillmailAttacker>,
     pub victim: KillmailVictim,
 }
@@ -54,7 +64,7 @@ impl<'a> KillmailsGroup<'a> {
         get_character_recent,
         "get_characters_character_id_killmails_recent",
         RequestType::Authenticated,
-        Vec<serde_json::Value>,
+        Vec<RecentKillMail>,
         (character_id: u64) => "{character_id}"
     );
 

src/groups/location.rs

@@ -10,14 +10,15 @@ pub struct LocationGroup<'a> {
 pub struct LocationInfo {
     pub solar_system_id: u64,
     pub station_id: Option<u64>,
+    pub structure_id: Option<u64>,
 }
 
 #[derive(Debug, Deserialize)]
 #[allow(missing_docs)]
 pub struct OnlineStatus {
-    pub last_login: String,
-    pub last_logout: String,
-    pub logins: u64,
+    pub last_login: Option<String>,
+    pub last_logout: Option<String>,
+    pub logins: Option<u64>,
     pub online: bool,
 }
 

src/groups/universe.rs

@@ -47,7 +47,7 @@ pub struct SystemPlanet {
 pub struct System {
     constellation_id: i32,
     name: String,
-    planets: Vec<SystemPlanet>,
+    planets: Option<Vec<SystemPlanet>>,
     position: Position,
     security_class: Option<String>,
     security_status: f64,