Skip to content

Commit

Permalink
fix: added missing faction, cleaned up factions
Browse files Browse the repository at this point in the history
  • Loading branch information
Mettwasser committed Jun 22, 2024
1 parent 4cfa9fd commit 07d0dca
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 24 deletions.
12 changes: 11 additions & 1 deletion src/worldstate/models/arbitration.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,17 @@ mod test {

match client.fetch::<Arbitration>().await {
Ok(_arbitration) => Ok(()),
Err(why) => Err(why),
Err(why) => {
if let ApiError::ApiError(error) = why {
if error.code == 404 {
Ok(())
} else {
Err(ApiError::ApiError(error))
}
} else {
Err(why)
}
}
}
}

Expand Down
4 changes: 3 additions & 1 deletion src/worldstate/models/faction.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,7 @@ enum_builder! {
Tenno,
Narmer,
Crossfire,
Murmur = "The Murmur"
Murmur = "The Murmur",
:"Honestly, no idea what this is"
FcMitw = "FC_MITW"
}
46 changes: 24 additions & 22 deletions src/worldstate/models/mission_type.rs
Original file line number Diff line number Diff line change
@@ -1,44 +1,46 @@
use super::macros::enum_builder;
enum_builder! {
:"A Mission Type in Warframe"
MissionType;
AncientRetribution = "Ancient Retribution",
Arena = "Arena",
Assassination = "Assassination",
Assault = "Assault",
Capture = "Capture",
Conclave = "Conclave",
Arena,
Assassination,
Assault,
Capture,
Conclave,
DarkSectorDefection = "Dark Sector Defection",
DarkSectorDefense = "Dark Sector Defense",
DarkSectorDisruption = "Dark Sector Disruption",
DarkSectorExcavation = "Dark Sector Excavation",
DarkSectorSabotage = "Dark Sector Sabotage",
DarkSectorSurvival = "Dark Sector Survival",
Defense = "Defense",
Disruption = "Disruption",
Excavation = "Excavation",
Defense,
Disruption,
Excavation,
ExterminationArchwing = "Extermination (Archwing)",
Extermination = "Extermination",
Extermination,
FreeRoam = "Free Roam",
Hijack = "Hijack",
Hive = "Hive",
Hijack,
Hive,
HiveSabotage = "Hive Sabotage",
Interception = "Interception",
Interception,
InterceptionArchwing = "Interception (Archwing)",
MobileDefense = "Mobile Defense",
MobileDefenseArchwing = "Mobile Defense (Archwing)",
OrokinSabotage = "Orokin Sabotage",
Orphix = "Orphix",
Orphix,
PursuitArchwing = "Pursuit (Archwing)",
Relay = "Relay",
Rescue = "Rescue",
Relay,
Rescue,
RushArchwing = "Rush (Archwing)",
Sabotage = "Sabotage",
Sabotage,
SabotageArchwing = "Sabotage (Archwing)",
Skirmish = "Skirmish",
Spy = "Spy",
Survival = "Survival",
Volatile = "Volatile",
Alchemy = "Alchemy",
Corruption = "Corruption",
Skirmish,
Spy,
Survival,
Volatile,
Alchemy,
Corruption,
VoidCascade = "Void Cascade",
Defection
}

0 comments on commit 07d0dca

Please sign in to comment.