Merge pull request #220 from Rustmail/219-release-command

feat(commands): add release command

Author: Akinator31

rustmail/src/api/handler/auth/login.rs

@@ -1,9 +1,9 @@
-use crate::api::utils::get_user_id_from_session::get_user_id_from_session;
 use crate::BotState;
+use crate::api::utils::get_user_id_from_session::get_user_id_from_session;
 use axum::extract::{Query, State};
 use axum::response::Redirect;
 use axum_extra::extract::CookieJar;
-use sqlx::{query, Row};
+use sqlx::{Row, query};
 use std::collections::HashMap;
 use std::sync::Arc;
 use tokio::sync::Mutex;

rustmail/src/bot.rs

@@ -1,3 +1,4 @@
+use crate::commands::CommandRegistry;
 use crate::commands::add_reminder::slash_command::add_reminder::AddReminderCommand;
 use crate::commands::add_staff::slash_command::add_staff::AddStaffCommand;
 use crate::commands::alert::slash_command::alert::AlertCommand;
@@ -11,14 +12,14 @@ use crate::commands::logs::slash_command::logs::LogsCommand;
 use crate::commands::move_thread::slash_command::move_thread::MoveCommand;
 use crate::commands::new_thread::slash_command::new_thread::NewThreadCommand;
 use crate::commands::recover::slash_command::recover::RecoverCommand;
+use crate::commands::release::slash_command::release::ReleaseCommand;
 use crate::commands::remove_reminder::slash_command::remove_reminder::RemoveReminderCommand;
 use crate::commands::remove_staff::slash_command::remove_staff::RemoveStaffCommand;
 use crate::commands::reply::slash_command::reply::ReplyCommand;
 use crate::commands::take::slash_command::take::TakeCommand;
-use crate::commands::CommandRegistry;
 use crate::config::load_config;
-use crate::errors::types::ConfigError;
 use crate::errors::ModmailError;
+use crate::errors::types::ConfigError;
 use crate::handlers::guild_handler::GuildHandler;
 use crate::handlers::guild_interaction_handler::InteractionHandler;
 use crate::handlers::guild_members_handler::GuildMembersHandler;
@@ -29,7 +30,7 @@ use crate::handlers::ready_handler::ReadyHandler;
 use crate::handlers::typing_proxy_handler::TypingProxyHandler;
 use crate::panel_commands::user::is_member::is_member;
 use crate::types::logs::PaginationContext;
-use crate::{db, BotCommand, BotState, BotStatus};
+use crate::{BotCommand, BotState, BotStatus, db};
 use base64::Engine;
 use rand::RngCore;
 use serenity::all::{ClientBuilder, GatewayIntents};
@@ -162,6 +163,7 @@ pub async fn run_bot(
     registry.register_command(RemoveReminderCommand);
     registry.register_command(LogsCommand);
     registry.register_command(TakeCommand);
+    registry.register_command(ReleaseCommand);
 
     let registry = Arc::new(registry);
 

rustmail/src/commands/add_reminder/common.rs

@@ -1,5 +1,5 @@
 use crate::config::Config;
-use crate::db::reminders::{is_reminder_active, update_reminder_status, Reminder};
+use crate::db::reminders::{Reminder, is_reminder_active, update_reminder_status};
 use crate::utils::conversion::hex_string_to_int::hex_string_to_int;
 use crate::utils::message::message_builder::MessageBuilder;
 use chrono::Local;

rustmail/src/commands/add_reminder/slash_command/add_reminder.rs

@@ -3,19 +3,19 @@ use crate::commands::add_reminder::common::{
 };
 use crate::commands::{BoxFuture, RegistrableCommand};
 use crate::config::Config;
-use crate::db::reminders::{insert_reminder, Reminder};
+use crate::db::reminders::{Reminder, insert_reminder};
 use crate::db::threads::get_thread_by_user_id;
-use crate::errors::{common, CommandError, ModmailError, ModmailResult, ThreadError};
+use crate::errors::{CommandError, ModmailError, ModmailResult, ThreadError, common};
 use crate::handlers::guild_interaction_handler::InteractionHandler;
 use crate::i18n::get_translated_message;
 use crate::utils::command::defer_response::defer_response;
 use chrono::{Local, NaiveTime, TimeZone};
 use regex::Regex;
+use serenity::FutureExt;
 use serenity::all::{
     CommandDataOptionValue, CommandInteraction, CommandOptionType, Context, CreateCommand,
     CreateCommandOption, ResolvedOption,
 };
-use serenity::FutureExt;
 use std::sync::Arc;
 
 pub struct AddReminderCommand;

rustmail/src/commands/add_reminder/text_command/add_reminder.rs

@@ -2,9 +2,9 @@ use crate::commands::add_reminder::common::{
     send_register_confirmation_from_message, spawn_reminder,
 };
 use crate::config::Config;
-use crate::db::reminders::{insert_reminder, Reminder};
+use crate::db::reminders::{Reminder, insert_reminder};
 use crate::db::threads::get_thread_by_user_id;
-use crate::errors::{common, CommandError, ModmailError, ModmailResult, ThreadError};
+use crate::errors::{CommandError, ModmailError, ModmailResult, ThreadError, common};
 use crate::handlers::guild_messages_handler::GuildMessagesHandler;
 use crate::utils::command::extract_reply_content::extract_reply_content;
 use chrono::{Local, NaiveTime, TimeZone};

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

@@ -4,18 +4,18 @@ use crate::config::Config;
 use crate::db::thread_exists;
 use crate::errors::CommandError::InvalidFormat;
 use crate::errors::ThreadError::NotAThreadChannel;
-use crate::errors::{common, CommandError, ModmailError, ModmailResult};
+use crate::errors::{CommandError, ModmailError, ModmailResult, common};
 use crate::handlers::guild_interaction_handler::InteractionHandler;
 use crate::i18n::get_translated_message;
 use crate::utils::command::defer_response::defer_response;
 use crate::utils::message::message_builder::MessageBuilder;
+use serenity::FutureExt;
 use serenity::all::{
     CommandDataOptionValue, CommandInteraction, CommandOptionType, Context, CreateCommand,
     CreateCommandOption, ResolvedOption,
 };
 use std::collections::HashMap;
 use std::sync::Arc;
-use serenity::FutureExt;
 
 pub struct AddStaffCommand;
 

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

@@ -4,7 +4,7 @@ use crate::config::Config;
 use crate::db::thread_exists;
 use crate::errors::CommandError::InvalidFormat;
 use crate::errors::ThreadError::NotAThreadChannel;
-use crate::errors::{common, ModmailError, ModmailResult};
+use crate::errors::{ModmailError, ModmailResult, common};
 use crate::handlers::guild_messages_handler::GuildMessagesHandler;
 use crate::utils::message::message_builder::MessageBuilder;
 use serenity::all::{Context, Message, UserId};

rustmail/src/commands/alert/common.rs

@@ -3,7 +3,7 @@ use crate::db::{cancel_alert_for_staff, get_user_id_from_channel_id, set_alert_f
 use crate::errors::CommandError::AlertDoesNotExist;
 use crate::errors::DatabaseError::QueryFailed;
 use crate::errors::DiscordError::ApiError;
-use crate::errors::{common, ModmailError, ModmailResult};
+use crate::errors::{ModmailError, ModmailResult, common};
 use crate::utils::message::message_builder::MessageBuilder;
 use serenity::all::colours::branding::GREEN;
 use serenity::all::{CommandInteraction, Context, CreateInteractionResponse, Message};

rustmail/src/commands/alert/slash_command/alert.rs

@@ -4,16 +4,16 @@ use crate::commands::alert::common::{
 };
 use crate::commands::{BoxFuture, RegistrableCommand};
 use crate::config::Config;
-use crate::errors::{common, CommandError, ModmailError, ModmailResult};
+use crate::errors::{CommandError, ModmailError, ModmailResult, common};
 use crate::handlers::guild_interaction_handler::InteractionHandler;
 use crate::i18n::get_translated_message;
 use crate::utils::command::defer_response::defer_response;
+use serenity::FutureExt;
 use serenity::all::{
     CommandDataOptionValue, CommandInteraction, CommandOptionType, Context, CreateCommand,
     CreateCommandOption, ResolvedOption,
 };
 use std::sync::Arc;
-use serenity::FutureExt;
 
 pub struct AlertCommand;
 
@@ -24,9 +24,8 @@ impl RegistrableCommand for AlertCommand {
     }
 
     fn doc<'a>(&self, config: &'a Config) -> BoxFuture<'a, String> {
-        async move {
-            get_translated_message(config, "help.alert", None, None, None, None).await
-        }.boxed()
+        async move { get_translated_message(config, "help.alert", None, None, None, None).await }
+            .boxed()
     }
 
     fn register(&self, config: &Config) -> BoxFuture<'_, Vec<CreateCommand>> {

rustmail/src/commands/alert/text_command/alert.rs

@@ -3,7 +3,7 @@ use crate::commands::alert::common::{
     handle_set_alert_from_msg,
 };
 use crate::config::Config;
-use crate::errors::{common, ModmailResult};
+use crate::errors::{ModmailResult, common};
 use crate::handlers::guild_messages_handler::GuildMessagesHandler;
 use serenity::all::{Context, Message};
 use std::sync::Arc;