Bug fixes for leagues broadcasts

Author: fatfingers23

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;
+use log::{error, info};
 use serenity::all::{ChannelId, CreateEmbed, CreateEmbedAuthor};
 use serenity::builder::CreateMessage;
 use serenity::http::Http;
@@ -26,6 +26,8 @@ struct MyError {
     message: &'static str,
 }
 
+const LEAGUES_ICON_TAG: &str = "<img=22> ";
+
 #[post("/new-discord-message")]
 async fn new_discord_message(
     req: HttpRequest,
@@ -88,7 +90,7 @@ async fn new_clan_chats(
         let result = Err(MyError {
             message: "No verification code was set",
         });
-        return result.map_err(|err| error::ErrorBadRequest(err.message));
+        return result.map_err(|err: MyError| error::ErrorBadRequest(err.message));
     }
 
     let verification_code = possible_verification_code.unwrap().to_str().unwrap();
@@ -113,7 +115,7 @@ async fn new_clan_chats(
         return result.map_err(|err| error::ErrorBadRequest(err.message));
     };
 
-    for chat in new_chat.clone() {
+    for mut chat in new_chat.clone() {
         if chat.sender.clone() == "" && chat.clan_name.clone() == "" {
             continue;
         }
@@ -141,6 +143,12 @@ async fn new_clan_chats(
             }
         }
 
+        //HACK leagues. is_league_world is not getting set as expected so we need to check the icon_id
+        if let Some(icon_id) = chat.icon_id {
+            //League icon id
+            chat.is_league_world = Some(icon_id == 22);
+        }
+
         //Sets the clan name to the guild. Bit of a hack but best way to get clan name
         if let None = registered_guild.clan_name {
             registered_guild.clan_name = Some(chat.clan_name.clone());
@@ -168,7 +176,8 @@ async fn new_clan_chats(
                     CreateEmbed::new()
                         .title("")
                         .author(CreateEmbedAuthor::new(chat.sender.clone()).icon_url(author_image))
-                        .description(chat.message.clone())
+                        //HACK
+                        .description(chat.message.clone().replace(LEAGUES_ICON_TAG, ""))
                         .color(0x0000FF)
                         .timestamp(right_now),
                 );
@@ -218,7 +227,13 @@ async fn new_clan_chats(
             continue;
         }
 
-        let league_world = chat.is_league_world.unwrap_or(false);
+        // let league_world = chat.is_league_world.unwrap_or(false);
+        //HACK leagues. is_league_world is not getting set as expected so we need to check the broadcast for the icon tag
+        let league_world = chat.message.starts_with(LEAGUES_ICON_TAG);
+        if league_world {
+            chat.message = chat.message.replace(LEAGUES_ICON_TAG, "");
+            chat.is_league_world = Some(true);
+        }
 
         let item_mapping_from_redis = get_item_mapping(&mut redis_connection).await;
 

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

@@ -11,5 +11,6 @@ pub mod set_leagues_broadcast_channel;
 pub mod set_quest_min_command;
 pub mod set_threshold_command;
 pub mod set_wom_id_command;
+pub mod stop_leagues_notifications;
 pub mod toggle_broadcasts_command;
 pub mod trackscape_command_trait;

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

@@ -0,0 +1,36 @@
+use crate::on_boarding_message::send_on_boarding;
+use serenity::all::{CommandDataOption, CreateCommand};
+use serenity::client::Context;
+use serenity::model::id::ChannelId;
+use trackscape_discord_shared::database::BotMongoDb;
+
+pub fn register() -> CreateCommand {
+    CreateCommand::new("stop_leagues_notifications")
+        .description("Stops leagues notifications, can reenable by setting the channel again.")
+}
+
+pub async fn run(
+    _options: &[CommandDataOption],
+    ctx: &Context,
+    db: &BotMongoDb,
+    guild_id: u64,
+) -> Option<String> {
+    let saved_guild_query = db.guilds.get_by_guild_id(guild_id).await;
+
+    return match saved_guild_query {
+        Ok(possible_guild) => match possible_guild {
+            Some(mut saved_guild) => {
+                saved_guild.leagues_broadcast_channel = None;
+                db.guilds.update_guild(saved_guild).await;
+                Some("You have stopped receiving leagues notifications. You can reenable by setting the channel again.".to_string())
+            }
+            None => {
+                Some("Error finding your server as registered. Try kicking and re adding the bot please.".to_string())
+            }
+        },
+        Err(_) => {
+            Some("There was a technical error. Please try again later.".to_string())
+        }
+    };
+    None
+}

trackscape-discord-bot/src/main.rs

@@ -298,6 +298,15 @@ impl EventHandler for Bot {
                     )
                     .await
                 }
+                "stop_leagues_notifications" => {
+                    commands::stop_leagues_notifications::run(
+                        &command.data.options,
+                        &ctx,
+                        &self.mongo_db,
+                        command.guild_id.unwrap().get(),
+                    )
+                    .await
+                }
                 _ => {
                     info!("not implemented :(");
                     None
@@ -339,6 +348,7 @@ fn get_commands() -> Vec<CreateCommand> {
     commands.push(commands::name_change_command::register());
     commands.push(commands::manually_run_wom_sync_command::register());
     commands.push(commands::set_leagues_broadcast_channel::register());
+    commands.push(commands::stop_leagues_notifications::register());
     commands
 }
 pub async fn create_commands_for_guild(guild_id: &GuildId, ctx: Context) {