Looks like its working? Just needs testing

fatfingers23 · fatfingers23 · commit 624fbe9190df · 2024-11-24T14:20:07.000-06:00
diff --git a/trackscape-discord-api/src/controllers/chat_controller.rs b/trackscape-discord-api/src/controllers/chat_controller.rs
@@ -3,7 +3,7 @@ use crate::{handler, ChatServerHandle};
 use actix_web::web::Data;
 use actix_web::{error, post, web, Error, HttpRequest, HttpResponse, Scope};
 use celery::Celery;
-use log::{error, info};
+use log::error;
 use serenity::all::{ChannelId, CreateEmbed, CreateEmbedAuthor};
 use serenity::builder::CreateMessage;
 use serenity::http::Http;
@@ -243,7 +243,36 @@ async fn new_clan_chats(
         let possible_broadcast = handler.extract_message().await;
 
         match possible_broadcast {
-            None => {}
+            None => {
+                if league_world {
+                    let possible_leagues_message = handler.extract_leagues_message().await;
+                    if let Some(leagues_message) = possible_leagues_message {
+                        let mut broadcast_embed = CreateEmbed::new()
+                            .title(leagues_message.title.clone())
+                            .description(leagues_message.message.clone())
+                            .color(0x0000FF)
+                            .timestamp(right_now);
+                        match leagues_message.icon_url {
+                            None => {}
+                            Some(icon_url) => {
+                                broadcast_embed = broadcast_embed.image(icon_url);
+                            }
+                        }
+                        let broadcast_message = CreateMessage::new().embed(broadcast_embed);
+                        //Only send if theres a leagues channel
+                        if let Some(channel_to_send_broadcast) =
+                            registered_guild.leagues_broadcast_channel
+                        {
+                            let new_broad_cast = ChannelId::new(channel_to_send_broadcast)
+                                .send_message(&*discord_http_client, broadcast_message)
+                                .await;
+                            if let Err(e) = new_broad_cast {
+                                error!("Error sending broadcast: {:?}", e);
+                            }
+                        }
+                    }
+                }
+            }
             Some(broadcast) => {
                 let _ = mongodb
                     .broadcasts
diff --git a/trackscape-discord-bot/src/commands/set_leagues_broadcast_channel.rs b/trackscape-discord-bot/src/commands/set_leagues_broadcast_channel.rs
@@ -6,7 +6,6 @@ use serenity::builder::{CreateCommand, CreateMessage};
 use serenity::client::Context;
 use serenity::model::channel::ChannelType;
 use serenity::model::prelude::Permissions;
-use std::any::Any;
 use tracing::info;
 use trackscape_discord_shared::database::BotMongoDb;
 
diff --git a/trackscape-discord-shared/src/osrs_broadcast_extractor.rs b/trackscape-discord-shared/src/osrs_broadcast_extractor.rs
@@ -257,6 +257,37 @@ pub mod osrs_broadcast_extractor {
         pub time_in_seconds: f64,
     }
 
+    //Leagues broadcasts
+    //TODO may come back and add more descriptive broadcasts for Leagues, but right now just going the "firehose" route
+    // #[derive(Clone, Debug, Serialize, Deserialize)]
+    // pub struct AreaUnlockBroadcast {
+    //     pub area: String,
+    //     pub player: String
+    // }
+
+    // #[derive(Clone, Debug, Serialize, Deserialize)]
+    // pub struct LeaguesRankBroadcast {
+    //     pub area: String,
+    //     pub player: String
+    // }
+
+    // #[derive(Clone, Debug, Serialize, Deserialize)]
+    // pub struct CombatMasteriesBroadcast {
+    //     pub player: String,
+    //     pub combat_mastery: String,
+    //     pub rank: i64,
+    // }
+    
+    #[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
+    pub enum LeaguesBroadCastType {
+        AreaUnlock,
+        LeaguesRank,
+        CombatMasteries,
+        RelicTier,
+        //Normal broadcast but for leagues, like drops
+        NormalBroadCast
+    }
+
     #[derive(PartialEq, Deserialize, Serialize, Debug, Clone)]
     pub enum BroadcastType {
         ItemDrop,
@@ -274,7 +305,12 @@ pub mod osrs_broadcast_extractor {
         ExpelledFromClan,
         CofferDonation,
         CofferWithdrawal,
-        PersonalBest,
+        PersonalBest,        
+        //Leagues Broadcasts        
+        AreaUnlock,
+        LeaguesRank,
+        CombatMasteries,
+        RelicTier,
         Unknown,
     }
 
@@ -297,7 +333,12 @@ pub mod osrs_broadcast_extractor {
                 BroadcastType::ExpelledFromClan => "Expelled From Clan".to_string(),
                 BroadcastType::CofferDonation => "Coffer Donation".to_string(),
                 BroadcastType::CofferWithdrawal => "Coffer Withdrawal".to_string(),
-                BroadcastType::PersonalBest => "Personal Best".to_string(),
+                BroadcastType::PersonalBest => "Personal Best".to_string(),                
+                //Leagues Broadcasts
+                BroadcastType::AreaUnlock => "Area Unlock".to_string(),
+                BroadcastType::LeaguesRank => "Leagues Rank".to_string(),
+                BroadcastType::CombatMasteries => "Combat Masteries".to_string(),
+                BroadcastType::RelicTier => "Relic Tier".to_string(),
             }
         }
 
@@ -315,6 +356,11 @@ pub mod osrs_broadcast_extractor {
                 "Level Milestone" => BroadcastType::LevelMilestone,
                 "Collection Log" => BroadcastType::CollectionLog,
                 "Personal Best" => BroadcastType::PersonalBest,
+                //Leagues Broadcasts
+                "Area Unlock" => BroadcastType::AreaUnlock,
+                "Leagues Rank" => BroadcastType::LeaguesRank,
+                "Combat Masteries" => BroadcastType::CombatMasteries,
+                "Relic Tier" => BroadcastType::RelicTier,
                 _ => BroadcastType::Unknown,
             }
         }
@@ -338,6 +384,11 @@ pub mod osrs_broadcast_extractor {
                 BroadcastType::CofferDonation,
                 BroadcastType::CofferWithdrawal,
                 BroadcastType::PersonalBest,
+                //Leagues Broadcasts
+                BroadcastType::AreaUnlock,
+                BroadcastType::LeaguesRank,
+                BroadcastType::CombatMasteries,
+                BroadcastType::RelicTier,
             ]
         }
 
@@ -650,6 +701,23 @@ pub mod osrs_broadcast_extractor {
         }
     }
 
+    pub fn leagues_catch_all_broadcast_extractor(
+        message: String,
+    ) -> Option<LeaguesBroadCastType> {
+        if message.contains("has earned") && message.contains("Combat mastery") {
+            return Some(LeaguesBroadCastType::CombatMasteries);
+        }
+
+        if message.contains("has unlocked") && message.contains("League area") {
+            return Some(LeaguesBroadCastType::AreaUnlock);
+        }
+
+        if message.contains("has unlocked") && message.contains("League relic!") {
+            return Some(LeaguesBroadCastType::RelicTier);
+        }
+        None
+    }
+
     /// Parses a time string in the format of `HH:MM:SS` or `MM:SS` and returns the time in seconds
     pub fn osrs_time_parser(time: &str) -> f64 {
         let split_sub_second: Vec<&str> = time.split(".").collect();
@@ -826,6 +894,7 @@ mod tests {
         LevelMilestoneBroadcast, PersonalBestBroadcast, PetDropBroadcast, PkBroadcast,
         QuestCompletedBroadcast, XPMilestoneBroadcast,
     };
+    use osrs_broadcast_extractor::LeaguesBroadCastType;
     use rstest::rstest;
     use tracing::info;
 
@@ -1453,6 +1522,21 @@ mod tests {
         }
     }
 
+    #[test]
+    fn test_leagues_catch_all_broadcast_extractor() {
+        let test_leagues_catch_all = get_leagues_catch_all_broadcast_messages();
+        for test_leagues_catch_all in test_leagues_catch_all {
+            let possible_leagues_catch_all_extract =
+                osrs_broadcast_extractor::leagues_catch_all_broadcast_extractor(
+                    test_leagues_catch_all.message.clone(),
+                );
+            let leagues_catch_all = possible_leagues_catch_all_extract.unwrap();
+            info!("{:?}", leagues_catch_all);
+            assert_eq!(leagues_catch_all, test_leagues_catch_all.broadcast);
+        }
+    }
+
+
     #[rstest]
     #[case("0:56.40", 56.40)]
     #[case("1:25", 85.0)]
@@ -2302,4 +2386,27 @@ mod tests {
 
         messages
     }
+
+    fn get_leagues_catch_all_broadcast_messages() -> Vec<TestBroadcast<LeaguesBroadCastType>> {
+        let mut messages: Vec<TestBroadcast<LeaguesBroadCastType>> = Vec::new();
+
+        messages.push(TestBroadcast {
+            message: "RuneScape Player has earned their 6th Combat mastery point!".to_string(),
+            broadcast: LeaguesBroadCastType::CombatMasteries,
+        });
+
+        messages.push(TestBroadcast {
+            message: "RuneScape Player has unlocked their 3rd League area!".to_string(),
+            broadcast: LeaguesBroadCastType::AreaUnlock,
+        });
+
+        messages.push(TestBroadcast {
+            message: "RuneScape Player has unlocked their tier 3 League relic!".to_string(),
+            broadcast: LeaguesBroadCastType::RelicTier,
+        });
+
+        //TODO add rank as we find more examples
+
+        messages
+    }
 }
diff --git a/trackscape-discord-shared/src/osrs_broadcast_handler.rs b/trackscape-discord-shared/src/osrs_broadcast_handler.rs
@@ -9,13 +9,14 @@ use crate::osrs_broadcast_extractor::osrs_broadcast_extractor::{
     coffer_donation_broadcast_extractor, coffer_withdrawal_broadcast_extractor,
     collection_log_broadcast_extractor, diary_completed_broadcast_extractor,
     drop_broadcast_extractor, expelled_from_clan_broadcast_extractor, get_broadcast_type,
-    invite_broadcast_extractor, left_the_clan_broadcast_extractor,
-    levelmilestone_broadcast_extractor, personal_best_broadcast_extractor, pet_broadcast_extractor,
-    pk_broadcast_extractor, quest_completed_broadcast_extractor, raid_broadcast_extractor,
-    xpmilestone_broadcast_extractor, BroadcastType, ClanMessage,
+    invite_broadcast_extractor, leagues_catch_all_broadcast_extractor,
+    left_the_clan_broadcast_extractor, levelmilestone_broadcast_extractor,
+    personal_best_broadcast_extractor, pet_broadcast_extractor, pk_broadcast_extractor,
+    quest_completed_broadcast_extractor, raid_broadcast_extractor, xpmilestone_broadcast_extractor,
+    BroadcastType, ClanMessage, LeaguesBroadCastType,
 };
 use crate::wiki_api::wiki_api::WikiQuest;
-use log::error;
+use log::{error, info};
 use num_format::{Locale, ToFormattedString};
 use serde::{Deserialize, Serialize};
 use std::sync::Arc;
@@ -508,6 +509,10 @@ 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,
         }
     }
@@ -845,6 +850,54 @@ impl<T: DropLogs, CL: ClanMateCollectionLogTotals, CM: ClanMates, J: JobQueue>
         }
     }
 
+    pub async fn extract_leagues_message(&self) -> Option<BroadcastMessageToDiscord> {
+        let possible_leagues_broad_cast_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 {
+                LeaguesBroadCastType::AreaUnlock => Some(BroadcastMessageToDiscord {
+                    type_of_broadcast: BroadcastType::AreaUnlock,
+                    player_it_happened_to: "".to_string(),
+                    message: self.clan_message.message.clone(),
+                    icon_url: Some("https://oldschool.runescape.wiki/images/Leagues_V-_Raging_Echoes_-_Summer_Summit_2024_%282%29.png?3877a".to_string()),
+                    title: ":new: New Leagues Area Unlock!".to_string(),
+                    item_quantity: None,
+                }),
+                LeaguesBroadCastType::LeaguesRank => Some(BroadcastMessageToDiscord {
+                    type_of_broadcast: BroadcastType::LeaguesRank,
+                    player_it_happened_to: "".to_string(),
+                    message: self.clan_message.message.clone(),
+                    icon_url: Some("https://oldschool.runescape.wiki/images/thumb/Leagues_icon.png/260px-Leagues_icon.png?0570b".to_string()),
+                    title: ":new: New Leagues Rank Unlock!".to_string(),
+                    item_quantity: None,
+                }),
+                LeaguesBroadCastType::CombatMasteries => Some(BroadcastMessageToDiscord {
+                    type_of_broadcast: BroadcastType::CombatMasteries,
+                    player_it_happened_to: "".to_string(),
+                    message: self.clan_message.message.clone(),
+                    icon_url: Some("https://oldschool.runescape.wiki/images/Raging_Echoes_League_combat_masteries_icon.png?4e2c2".to_string()),
+                    title: ":new: New Leagues Combat Mastery earned!".to_string(),
+                    item_quantity: None,
+                }),
+                LeaguesBroadCastType::RelicTier => Some(BroadcastMessageToDiscord {
+                    type_of_broadcast: BroadcastType::RelicTier,
+                    player_it_happened_to: "".to_string(),
+                    message: self.clan_message.message.clone(),
+                    icon_url: Some("https://oldschool.runescape.wiki/images/thumb/Leagues_icon.png/260px-Leagues_icon.png?0570b".to_string()),
+                    title: ":new: New Leagues Relic unlocked!".to_string(),
+                    item_quantity: None,
+                }),
+                //Ideally previous broadcast logic should catch this and we just come to leagues for the new types
+                LeaguesBroadCastType::NormalBroadCast => None,
+            },
+            None => None,
+        }
+    }
+
     fn best_guest_pb_icon(&self, activity: String) -> String {
         match activity.as_str().to_lowercase() {
             x if x.contains("theatre of blood") => {
