refactor(api): add Ctx to BotState to be able to use MessageBuilder in api endpoints

Author: Akinator31

rustmail/src/api/handler/externals/tickets/create.rs

@@ -30,7 +30,7 @@ pub async fn handle_external_ticket_create(
 
     let user_id = UserId::new(user_id_u64);
 
-    let (config, db_pool, bot_http, command_tx) = {
+    let (mut config, db_pool, bot_http, command_tx) = {
         let state = bot_state.lock().await;
         let config = state
             .config
@@ -61,6 +61,8 @@ pub async fn handle_external_ticket_create(
         (config, db_pool, bot_http, command_tx)
     };
 
+    config.db_pool = Some(db_pool.clone());
+
     println!(
         "API Key #{} creating ticket for Discord ID: {}",
         api_key.id, user_id_u64
@@ -187,14 +189,34 @@ pub async fn handle_external_ticket_create(
 
     let open_thread_message = get_user_recap(user_id, &username, &member_join_date, &logs_info);
 
-    if let Err(e) = channel.id.say(&bot_http, open_thread_message).await {
-        eprintln!("Failed to send welcome message to thread: {}", e);
+    let ctx = {
+        let state = bot_state.lock().await;
+        let ctx_lock = state.bot_context.read().await;
+        ctx_lock
+            .as_ref()
+            .ok_or((
+                StatusCode::INTERNAL_SERVER_ERROR,
+                "Bot context not available".to_string(),
+            ))?
+            .clone()
+    };
+
+    if let Err(e) = MessageBuilder::system_message(&ctx, &config)
+        .to_channel(channel.id)
+        .content(open_thread_message)
+        .send(true)
+        .await
+    {
+        eprintln!("Failed to send message to channel via MessageBuilder: {:?}", e);
     }
 
-    if let Ok(dm_channel) = user.create_dm_channel(&bot_http).await {
-        if let Err(e) = dm_channel.say(&bot_http, &config.bot.welcome_message).await {
-            eprintln!("Failed to send DM to user: {}", e);
-        }
+    if let Err(e) = MessageBuilder::system_message(&ctx, &config)
+        .content(&config.bot.welcome_message)
+        .to_user(user_id)
+        .send(true)
+        .await
+    {
+        eprintln!("Failed to send DM via MessageBuilder: {:?}", e);
     }
 
     println!(

rustmail/src/bot.rs

@@ -35,6 +35,7 @@ pub async fn init_bot_state() -> Arc<Mutex<BotState>> {
         db_pool: Some(pool),
         command_tx: command_tx.clone(),
         bot_http: None,
+        bot_context: Arc::new(tokio::sync::RwLock::new(None)),
     };
 
     Arc::new(Mutex::new(bot_state))
@@ -147,6 +148,7 @@ pub async fn run_bot(
             &config,
             registry.clone(),
             shutdown_rx.clone(),
+            bot_state.clone(),
         ))
         .event_handler(
             GuildMessagesHandler::new(

rustmail/src/handlers/ready_handler.rs

@@ -3,6 +3,7 @@ use crate::prelude::commands::*;
 use crate::prelude::config::*;
 use crate::prelude::features::*;
 use crate::prelude::modules::*;
+use crate::prelude::types::*;
 use serenity::all::{ActivityData, CreateCommand, GuildId};
 use serenity::futures::future::join_all;
 use serenity::{
@@ -12,22 +13,29 @@ use serenity::{
 use sqlx::SqlitePool;
 use std::sync::Arc;
 use std::time::Duration;
-use tokio::sync::watch::Receiver;
+use tokio::sync::{watch::Receiver, Mutex};
 use tokio::time::interval;
 
 #[derive(Clone)]
 pub struct ReadyHandler {
     pub config: Config,
     pub registry: Arc<CommandRegistry>,
     pub shutdown: Arc<Receiver<bool>>,
+    pub bot_state: Arc<Mutex<BotState>>,
 }
 
 impl ReadyHandler {
-    pub fn new(config: &Config, registry: Arc<CommandRegistry>, shutdown: Receiver<bool>) -> Self {
+    pub fn new(
+        config: &Config,
+        registry: Arc<CommandRegistry>,
+        shutdown: Receiver<bool>,
+        bot_state: Arc<Mutex<BotState>>,
+    ) -> Self {
         Self {
             config: config.clone(),
             registry,
             shutdown: Arc::new(shutdown),
+            bot_state,
         }
     }
 }
@@ -36,6 +44,13 @@ impl ReadyHandler {
 impl EventHandler for ReadyHandler {
     async fn ready(&self, ctx: Context, ready: Ready) {
         println!("{} is online !", ready.user.name);
+
+        {
+            let state = self.bot_state.lock().await;
+            let mut ctx_lock = state.bot_context.write().await;
+            *ctx_lock = Some(ctx.clone());
+        }
+
         let pool = match &self.config.db_pool {
             Some(pool) => pool,
             None => {

rustmail/src/types/bot.rs

@@ -1,7 +1,7 @@
 use crate::prelude::config::*;
-use serenity::all::Http;
+use serenity::all::{Context, Http};
 use std::sync::Arc;
-use tokio::sync::watch::Sender;
+use tokio::sync::{watch::Sender, RwLock};
 use tokio::task::JoinHandle;
 
 pub enum BotStatus {
@@ -25,4 +25,5 @@ pub struct BotState {
     pub db_pool: Option<sqlx::SqlitePool>,
     pub command_tx: tokio::sync::mpsc::Sender<BotCommand>,
     pub bot_http: Option<Arc<Http>>,
+    pub bot_context: Arc<RwLock<Option<Context>>>,
 }