fix(commands): replace thread_exist by thread_exist_by_channel and thread_exist_by_user

Author: Akinator31

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

@@ -134,7 +134,7 @@ pub async fn handle_external_ticket_create(
         ));
     }
 
-    if thread_exists(user_id, &db_pool).await {
+    if thread_exists_by_user(user_id, &db_pool).await {
         return if let Some(channel_id_str) = get_thread_channel_by_user_id(user_id, &db_pool).await
         {
             Err((

rustmail/src/commands/add_staff/slash_command/add_staff.rs

@@ -105,7 +105,7 @@ impl RegistrableCommand for AddStaffCommand {
                 }
             };
 
-            if thread_exists(command.user.id, pool).await {
+            if thread_exists_by_channel(command.channel_id, pool).await {
                 match add_user_to_channel(&ctx, command.channel_id, user_id).await {
                     Ok(_) => {
                         let mut params = HashMap::new();

rustmail/src/commands/add_staff/text_command/add_staff.rs

@@ -30,7 +30,7 @@ pub async fn add_staff(
         Err(_) => return Err(ModmailError::Command(CommandError::InvalidFormat)),
     };
 
-    if thread_exists(msg.author.id, pool).await {
+    if thread_exists_by_channel(msg.channel_id, pool).await {
         match add_user_to_channel(&ctx, msg.channel_id, user_id).await {
             Ok(_) => {
                 let mut params = HashMap::new();

rustmail/src/commands/new_thread/slash_command/new_thread.rs

@@ -121,7 +121,7 @@ impl RegistrableCommand for NewThreadCommand {
                 return Err(ModmailError::Discord(DiscordError::UserIsABot));
             }
 
-            if thread_exists(user_id, pool).await {
+            if thread_exists_by_user(user_id, pool).await {
                 return if let Some(channel_id_str) =
                     get_thread_channel_by_user_id(user_id, pool).await
                 {

rustmail/src/commands/new_thread/text_command/new_thread.rs

@@ -37,7 +37,7 @@ pub async fn new_thread(
         return Err(ModmailError::Discord(DiscordError::UserIsABot));
     }
 
-    if thread_exists(user_id, pool).await {
+    if thread_exists_by_user(user_id, pool).await {
         if let Some(channel_id_str) = get_thread_channel_by_user_id(user_id, pool).await {
             let mut params = HashMap::new();
             params.insert("user".to_string(), user.name.clone());

rustmail/src/commands/remove_staff/slash_command/remove_staff.rs

@@ -107,7 +107,7 @@ impl RegistrableCommand for RemoveStaffCommand {
                 }
             };
 
-            if thread_exists(command.user.id, pool).await {
+            if thread_exists_by_channel(command.channel_id, pool).await {
                 match remove_user_from_channel(&ctx, command.channel_id, user_id).await {
                     Ok(_) => {
                         let mut params = HashMap::new();

rustmail/src/commands/remove_staff/text_command/remove_staff.rs

@@ -30,7 +30,7 @@ pub async fn remove_staff(
         Err(_) => return Err(ModmailError::Command(CommandError::InvalidFormat)),
     };
 
-    if thread_exists(msg.author.id, pool).await {
+    if thread_exists_by_channel(msg.channel_id, pool).await {
         match remove_user_from_channel(&ctx, msg.channel_id, user_id).await {
             Ok(_) => {
                 let mut params = HashMap::new();

rustmail/src/db/operations/threads.rs

@@ -218,10 +218,16 @@ pub async fn close_thread(
     Ok(())
 }
 
-pub async fn thread_exists(user_id: UserId, pool: &SqlitePool) -> bool {
+pub async fn thread_exists_by_user(user_id: UserId, pool: &SqlitePool) -> bool {
     get_thread_channel_by_user_id(user_id, pool).await.is_some()
 }
 
+pub async fn thread_exists_by_channel(channel: ChannelId, pool: &SqlitePool) -> bool {
+    get_thread_by_channel_id(&channel.to_string(), pool)
+        .await
+        .is_some()
+}
+
 pub async fn is_a_ticket_channel(channel_id: ChannelId, pool: &SqlitePool) -> bool {
     sqlx::query_scalar("SELECT EXISTS(SELECT 1 FROM threads WHERE channel_id = ?)")
         .bind(channel_id.to_string())

rustmail/src/handlers/guild_messages_handler.rs

@@ -140,7 +140,7 @@ async fn manage_incoming_message(
     let user_mutex = get_thread_lock(config, user_key);
     let guard = user_mutex.lock().await;
 
-    if thread_exists(msg.author.id, pool).await {
+    if thread_exists_by_user(msg.author.id, pool).await {
         if let Some(channel_id_str) = get_thread_channel_by_user_id(msg.author.id, pool).await {
             let channel_id_num = channel_id_str
                 .parse::<u64>()

rustmail/src/i18n/language/en.rs

@@ -1169,6 +1169,14 @@ pub fn load_english_messages(dict: &mut ErrorDictionary) {
         "audit_log.member.role_update".to_string(),
         DictionaryMessage::new("Member Roles Updated"),
     );
+    dict.messages.insert(
+        "audit_log.member.move".to_string(),
+        DictionaryMessage::new("Member Moved"),
+    );
+    dict.messages.insert(
+        "audit_log.member.disconnect".to_string(),
+        DictionaryMessage::new("Member Disconnected"),
+    );
     dict.messages.insert(
         "audit_log.member.member_move".to_string(),
         DictionaryMessage::new("Member Moved"),