I think thats leagues v1??

Author: fatfingers23

trackscape-discord-bot/src/commands/toggle_broadcasts_command.rs

@@ -85,13 +85,32 @@ pub fn register() -> CreateCommand {
                 BroadcastType::PersonalBest.to_string(),
                 BroadcastType::PersonalBest.to_slug(),
             )
+            .add_string_choice(
+                BroadcastType::AreaUnlock.to_string(),
+                BroadcastType::AreaUnlock.to_slug(),
+            )
+            .add_string_choice(
+                BroadcastType::LeaguesRank.to_string(),
+                BroadcastType::LeaguesRank.to_slug(),
+            )
+            .add_string_choice(
+                BroadcastType::CombatMasteries.to_string(),
+                BroadcastType::CombatMasteries.to_slug(),
+            )
+            .add_string_choice(
+                BroadcastType::RelicTier.to_string(),
+                BroadcastType::RelicTier.to_slug(),
+            )
+            .required(true),
+        )
+        .add_option(
+            CreateCommandOption::new(
+                CommandOptionType::Boolean,
+                "toggle",
+                "Turns on(true) or off(false) the broadcast type.",
+            )
             .required(true),
         )
-        .add_option(CreateCommandOption::new(
-            CommandOptionType::Boolean,
-            "toggle",
-            "Turns on(true) or off(false) the broadcast type.",
-        ))
 }
 
 pub async fn run(

trackscape-discord-shared/src/osrs_broadcast_extractor.rs

@@ -288,6 +288,18 @@ pub mod osrs_broadcast_extractor {
         NormalBroadCast
     }
 
+    impl LeaguesBroadCastType {
+        pub fn to_broadcast_type(&self) -> BroadcastType {
+            match self {
+                LeaguesBroadCastType::AreaUnlock => BroadcastType::AreaUnlock,
+                LeaguesBroadCastType::LeaguesRank => BroadcastType::LeaguesRank,
+                LeaguesBroadCastType::CombatMasteries => BroadcastType::CombatMasteries,
+                LeaguesBroadCastType::RelicTier => BroadcastType::RelicTier,
+                LeaguesBroadCastType::NormalBroadCast => BroadcastType::Unknown,
+            }
+        }
+    }
+
     #[derive(PartialEq, Deserialize, Serialize, Debug, Clone)]
     pub enum BroadcastType {
         ItemDrop,

trackscape-discord-shared/src/osrs_broadcast_handler.rs

@@ -509,10 +509,6 @@ impl<T: DropLogs, CL: ClanMateCollectionLogTotals, CM: ClanMates, J: JobQueue>
                 }
             }
             BroadcastType::PersonalBest => self.personal_best_handler().await,
-            // BroadcastType::AreaUnlock
-            // | BroadcastType::LeaguesRank
-            // | BroadcastType::CombatMasteries
-            // | BroadcastType::RelicTier => self.leagues_handler().await,
             _ => None,
         }
     }
@@ -851,14 +847,22 @@ impl<T: DropLogs, CL: ClanMateCollectionLogTotals, CM: ClanMates, J: JobQueue>
     }
 
     pub async fn extract_leagues_message(&self) -> Option<BroadcastMessageToDiscord> {
-        let possible_leagues_broad_cast_type =
+        let possible_leagues_broadcast_type =
             leagues_catch_all_broadcast_extractor(self.clan_message.message.clone());
-        info!(
-            "possible_leagues_broad_cast_type: {:?}",
-            possible_leagues_broad_cast_type
-        );
-        match possible_leagues_broad_cast_type {
-            Some(leagues_broadcast_type) => match leagues_broadcast_type {
+
+        if let Some(leagues_broadcast_type) = possible_leagues_broadcast_type {
+            //Bit odd to have same name enums in each but did it to keep commands
+            let full_broadcast = leagues_broadcast_type.to_broadcast_type();
+            let is_disallowed = self.check_if_allowed_broad_cast(full_broadcast);
+            info!(
+                "Leagues broadcast type: {:?} is disallowed: {}",
+                leagues_broadcast_type, is_disallowed
+            );
+            if is_disallowed {
+                return None;
+            }
+
+            match leagues_broadcast_type {
                 LeaguesBroadCastType::AreaUnlock => Some(BroadcastMessageToDiscord {
                     type_of_broadcast: BroadcastType::AreaUnlock,
                     player_it_happened_to: "".to_string(),
@@ -893,8 +897,9 @@ impl<T: DropLogs, CL: ClanMateCollectionLogTotals, CM: ClanMates, J: JobQueue>
                 }),
                 //Ideally previous broadcast logic should catch this and we just come to leagues for the new types
                 LeaguesBroadCastType::NormalBroadCast => None,
-            },
-            None => None,
+            }
+        } else {
+            None
         }
     }