Fix bugs with comp mode data. Support for collision_competitive

mikechambers · mikechambers · commit eecd9e062a9a · 2024-11-12T19:10:17.000-08:00
diff --git a/RELEASE.md b/RELEASE.md
@@ -1,5 +1,10 @@
 # dcli Release Notes
 
+## v0.99.9 November 12, 2024
+
+-   Fix API issues for competitive matches.
+-   Added Mode support for CollisionCompetitive (collision_competitive)
+
 ## v0.99.8 January 26, 2024
 
 -   Fixed crash when adding player with no player profiles.
diff --git a/src/Cargo.lock b/src/Cargo.lock
diff --git a/src/dcli/Cargo.toml b/src/dcli/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "dcli"
 #version
-version = "0.99.8"
+version = "0.99.9"
 authors = ["Mike Chambers <mikechambers@gmail.com>"]
 edition = "2018"
 description = "Library for the dcli collection of command line tools for Destiny 2."
diff --git a/src/dcli/src/activitystoreinterface.rs b/src/dcli/src/activitystoreinterface.rs
@@ -964,6 +964,42 @@ impl ActivityStoreInterface {
             || activity.activity_details.director_activity_hash
                 == FREELANCE_COMPETITIVE_PVP_ACTIVITY_HASH
         {
+
+            /*
+            	out.activityDetails.addToModes(mode: Mode.competitive.rawValue);
+			
+			if out.activityDetails.mode == Mode.zoneControl.rawValue {
+				out.activityDetails.setMode(mode: Mode.competitiveCollision.rawValue)
+				
+				//fix generic activity hash set (competitive)
+				out.activityDetails.setDirectorActivityHash(hash: collisionActivityHash)
+			}
+			
+			if out.activityDetails.mode == Mode.clashQuickplay.rawValue {
+				out.activityDetails.removeFromModes(mode: Mode.clashQuickplay.rawValue)
+				out.activityDetails.removeFromModes(mode: Mode.quickplay.rawValue)
+				out.activityDetails.setMode(mode: Mode.competitiveClash.rawValue)
+				
+				//fix generic activity hash set (competitive)
+				out.activityDetails.setDirectorActivityHash(hash: clashActivityHash)
+			}
+             */
+            
+
+            if activity.activity_details.mode == Mode::ZoneControl {
+                self.set_mode(activity, Mode::CollisionCompetitive);
+                self.add_to_modes(activity, Mode::PvPCompetitive);
+                was_updated = true;
+            }
+
+            if activity.activity_details.mode == Mode::ClashQuickplay {
+                self.remove_from_modes(activity, Mode::ClashQuickplay);
+                self.remove_from_modes(activity, Mode::PvPQuickplay);
+                self.set_mode(activity, Mode::ClashCompetitive);
+                self.add_to_modes(activity, Mode::PvPCompetitive);
+                was_updated = true;
+            }
+
             if activity.activity_details.mode == Mode::Rift {
                 self.set_mode(activity, Mode::RiftCompetitive);
                 self.add_to_modes(activity, Mode::RiftCompetitive);
diff --git a/src/dcli/src/enums/mode.rs b/src/dcli/src/enums/mode.rs
@@ -123,6 +123,7 @@ pub enum Mode {
     ShowdownCompetitive = 701,
     SurvivalCompetitive = 702,
     CountdownCompetitive = 703,
+    CollisionCompetitive = 704,
 
     CheckmateAll = 710,
     CheckmateControl = 711,
@@ -228,6 +229,7 @@ impl Mode {
             701 => Ok(Mode::ShowdownCompetitive),
             702 => Ok(Mode::SurvivalCompetitive),
             703 => Ok(Mode::CountdownCompetitive),
+            704 => Ok(Mode::CollisionCompetitive),
 
             710 => Ok(Mode::CheckmateAll),
             711 => Ok(Mode::CheckmateControl),
@@ -319,6 +321,7 @@ impl Mode {
             || *self == Mode::CheckmateRumble
             || *self == Mode::CheckmateClash
             || *self == Mode::CheckmateCountdown
+            || *self == Mode::CollisionCompetitive
             || *self == Mode::IronBannerTribute
             || *self == Mode::IronBannerFortress
     }
@@ -441,6 +444,8 @@ impl FromStr for Mode {
             "checkmate_rumble" => Ok(Mode::CheckmateRumble),
             "checkmate_clash" => Ok(Mode::CheckmateClash),
             "checkmate_countdown" => Ok(Mode::CheckmateCountdown),
+            "collision_competitive" => Ok(Mode::CollisionCompetitive),
+
             "iron_banner_tribute" => Ok(Mode::IronBannerTribute),
             "iron_banner_fortress" => Ok(Mode::IronBannerFortress),
 
@@ -540,6 +545,8 @@ impl fmt::Display for Mode {
             Mode::ShowdownCompetitive => "Showdown Competitive",
             Mode::SurvivalCompetitive => "Survival Competitive",
             Mode::CountdownCompetitive => "Countdown Competitive",
+            Mode::CollisionCompetitive => "Collision Competitive",
+
             Mode::Relic => "Relic",
 
             Mode::CheckmateAll => "All Checkmate",
diff --git a/src/dclia/Cargo.toml b/src/dclia/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "dclia"
 #version
-version = "0.99.8"
+version = "0.99.9"
 authors = ["Mike Chambers <mikechambers@gmail.com>"]
 description = "Command line tool for retrieving information on current activity for specified player character."
 homepage = "https://www.mikechambers.com"
diff --git a/src/dcliad/Cargo.toml b/src/dcliad/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "dcliad"
 #version
-version = "0.99.8"
+version = "0.99.9"
 authors = ["Mike Chambers <mikechambers@gmail.com>"]
 edition = "2018"
 description = "Command line tool for viewing Destiny 2 activity details."
diff --git a/src/dcliad/README.md b/src/dcliad/README.md
@@ -67,7 +67,7 @@ OPTIONS:
 
             Addition values available are crimsom_doubles, supremacy, survival, countdown, all_doubles, doubles,
             private_clash, private_control, private_survival, private_rumble, showdown_competitive, survival_competitive, rift_competitive, showdown, lockdown, scorched, rift, iron_banner_rift, zone_control, iron_banner_zone_control
-            scorched_team, breakthrough, clash_quickplay, trials_of_the_nine, relic, countdown_competitive, checkmate_all, checkmate_control, checkmate_rumble, checkmate_survival, checkmate_rumble, checkmate_clash, checkmate_countdown, iron_banner_tribute, iron_banner_fortress [default: all_pvp]
+            scorched_team, breakthrough, clash_quickplay, trials_of_the_nine, relic, countdown_competitive, checkmate_all, checkmate_control, checkmate_rumble, checkmate_survival, checkmate_rumble, checkmate_clash, checkmate_countdown, collision_competitive, iron_banner_tribute, iron_banner_fortress [default: all_pvp]
     -n, --name <name>
             Bungie name for player
 
@@ -79,7 +79,7 @@ OPTIONS:
 
 | ARGUMENT | OPTIONS                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
 | -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| --mode   | all_pvp (default), control, clash, elimination, mayhem, iron_banner, all_private, rumble, pvp_competitive, quickplay and trials_of_osiris, crimsom_doubles, supremacy, survival, countdown, all_doubles, doubles private_clash, private_control, private_survival, private_rumble, showdown_competitive, survival_competitive, rift_competitive, showdown, lockdown, scorched, rift, iron_banner_rift, zone_control, iron_banner_zone_control, scorched_team, breakthrough, clash_quickplay, trials_of_the_nine, relic, countdown_competitive, checkmate_all, checkmate_control, checkmate_rumble, checkmate_survival, checkmate_rumble, checkmate_clash, checkmate_countdown, iron_banner_tribute, iron_banner_fortress |
+| --mode   | all_pvp (default), control, clash, elimination, mayhem, iron_banner, all_private, rumble, pvp_competitive, quickplay and trials_of_osiris, crimsom_doubles, supremacy, survival, countdown, all_doubles, doubles private_clash, private_control, private_survival, private_rumble, showdown_competitive, survival_competitive, rift_competitive, showdown, lockdown, scorched, rift, iron_banner_rift, zone_control, iron_banner_zone_control, scorched_team, breakthrough, clash_quickplay, trials_of_the_nine, relic, countdown_competitive, checkmate_all, checkmate_control, checkmate_rumble, checkmate_survival, checkmate_rumble, checkmate_clash, checkmate_countdown, collision_competitive, iron_banner_tribute, iron_banner_fortress |
 
 Manifest can be downloaded and synced with from [dclim](https://github.com/mikechambers/dcli/tree/main/src/dclim).
 
diff --git a/src/dcliad/src/main.rs b/src/dcliad/src/main.rs
@@ -508,7 +508,7 @@ struct Opt {
     /// private_survival, private_rumble, showdown_competitive, survival_competitive,
     /// rift_competitive, showdown, lockdown, iron_banner_rift,
     /// zone_control, iron_banner_zone_control, rift,
-    /// scorched, scorched_team, breakthrough, clash_quickplay, trials_of_the_nine, relic, countdown_competitive, checkmate_all, checkmate_control, checkmate_rumble, checkmate_survival, checkmate_rumble, checkmate_clash, checkmate_countdown, iron_banner_tribute, iron_banner_fortress
+    /// scorched, scorched_team, breakthrough, clash_quickplay, trials_of_the_nine, relic, countdown_competitive, checkmate_all, checkmate_control, checkmate_rumble, checkmate_survival, checkmate_rumble, checkmate_clash, checkmate_countdown, collision_competitive, iron_banner_tribute, iron_banner_fortress
     #[structopt(long = "mode", short = "M", 
         parse(try_from_str=parse_and_validate_mode), default_value = "all_pvp")]
     mode: Mode,
diff --git a/src/dcliah/Cargo.toml b/src/dcliah/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "dcliah"
 #version
-version = "0.99.8"
+version = "0.99.9"
 authors = ["Mike Chambers <mikechambers@gmail.com>"]
 edition = "2018"
 description = "Command line tool for viewing Destiny 2 activity history."
diff --git a/src/dcliah/README.md b/src/dcliah/README.md
@@ -93,7 +93,7 @@ OPTIONS:
             rumble, pvp_competitive, quickplay and trials_of_osiris.
 
             Addition values available are crimsom_doubles, supremacy, survival, countdown, all_doubles, doubles,
-            private_clash, private_control, private_survival, private_rumble, showdown_competitive, survival_competitive, rift_competitive, showdown, lockdown, scorched, rift, iron_banner_rift,zone_control, iron_banner_zone_control, scorched_team, breakthrough, clash_quickplay, trials_of_the_nine, relic, countdown_competitive, checkmate_all, checkmate_control, checkmate_rumble, checkmate_survival, checkmate_rumble, checkmate_clash, checkmate_countdown, iron_banner_tribute, iron_banner_fortress [default: all_pvp]
+            private_clash, private_control, private_survival, private_rumble, showdown_competitive, survival_competitive, rift_competitive, showdown, lockdown, scorched, rift, iron_banner_rift,zone_control, iron_banner_zone_control, scorched_team, breakthrough, clash_quickplay, trials_of_the_nine, relic, countdown_competitive, checkmate_all, checkmate_control, checkmate_rumble, checkmate_survival, checkmate_rumble, checkmate_clash, checkmate_countdown, collision_competitive, iron_banner_tribute, iron_banner_fortress [default: all_pvp]
     -T, --moment <moment>
             Start moment from which to pull activities from
 
diff --git a/src/dcliah/src/main.rs b/src/dcliah/src/main.rs
@@ -663,7 +663,7 @@ struct Opt {
     /// private_survival, private_rumble, showdown_competitive, survival_competitive,
     /// rift_competitive, showdown, lockdown, iron_banner_rift,
     /// zone_control, iron_banner_zone_control, rift,
-    /// scorched, scorched_team, breakthrough, clash_quickplay, trials_of_the_nine, relic, countdown_competitive, checkmate_all, checkmate_control, checkmate_rumble, checkmate_survival, checkmate_rumble, checkmate_clash, checkmate_countdown, iron_banner_tribute, iron_banner_fortress
+    /// scorched, scorched_team, breakthrough, clash_quickplay, trials_of_the_nine, relic, countdown_competitive, checkmate_all, checkmate_control, checkmate_rumble, checkmate_survival, checkmate_rumble, checkmate_clash, checkmate_countdown, collision_competitive, iron_banner_tribute, iron_banner_fortress
     #[structopt(long = "mode", short = "M", 
         parse(try_from_str=parse_and_validate_crucible_mode), default_value = "all_pvp")]
     mode: Mode,
diff --git a/src/dclif/Cargo.toml b/src/dclif/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "dclif"
 #version
-version = "0.99.8"
+version = "0.99.9"
 authors = ["Mike Chambers <mikechambers@gmail.com>"]
 edition = "2018"
 description = "Command line tool for querying specific Destiny 2 pvp stats."
diff --git a/src/dclif/src/main.rs b/src/dclif/src/main.rs
@@ -207,7 +207,7 @@ struct Opt {
     /// private_survival, private_rumble, showdown_competitive, survival_competitive,
     /// rift_competitive, showdown, lockdown, iron_banner_rift,
     /// zone_control, iron_banner_zone_control, rift,
-    /// scorched, scorched_team, breakthrough, clash_quickplay, trials_of_the_nine, relic, countdown_competitive, checkmate_all, checkmate_control, checkmate_rumble, checkmate_survival, checkmate_rumble, checkmate_clash, checkmate_countdown, iron_banner_tribute, iron_banner_fortress
+    /// scorched, scorched_team, breakthrough, clash_quickplay, trials_of_the_nine, relic, countdown_competitive, checkmate_all, checkmate_control, checkmate_rumble, checkmate_survival, checkmate_rumble, checkmate_clash, checkmate_countdown, collision_competitive, iron_banner_tribute, iron_banner_fortress
     #[structopt(long = "mode", short = "M", 
         parse(try_from_str=parse_and_validate_crucible_mode), default_value = "all_pvp")]
     mode: Mode,
diff --git a/src/dclim/Cargo.toml b/src/dclim/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "dclim"
 #version
-version = "0.99.8"
+version = "0.99.9"
 authors = ["Mike Chambers <mikechambers@gmail.com>"]
 edition = "2018"
 description = "Command line tool for managing and syncing the remote Destiny 2 API manifest database."
diff --git a/src/dclistat/Cargo.toml b/src/dclistat/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "dclistat"
 #version
-version = "0.99.8"
+version = "0.99.9"
 authors = ["Mike Chambers <mikechambers@gmail.com>"]
 edition = "2018"
 description = "Command line tool for querying specific Destiny 2 pvp stats."
diff --git a/src/dclistat/README.md b/src/dclistat/README.md
diff --git a/src/dclistat/src/main.rs b/src/dclistat/src/main.rs
diff --git a/src/dclisync/Cargo.toml b/src/dclisync/Cargo.toml
diff --git a/src/dclitime/Cargo.toml b/src/dclitime/Cargo.toml
diff --git a/src/tell/Cargo.toml b/src/tell/Cargo.toml
