refactor(imports): add prelude for easiest imports

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

@@ -1,4 +1,4 @@
-use crate::BotState;
+use crate::prelude::types::*;
 use axum::extract::{Query, State};
 use axum::response::Redirect;
 use axum_extra::extract::cookie::{Cookie, CookieJar, SameSite};

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

@@ -1,5 +1,5 @@
-use crate::BotState;
-use crate::api::utils::get_user_id_from_session::get_user_id_from_session;
+use crate::prelude::api::*;
+use crate::prelude::types::*;
 use axum::extract::{Query, State};
 use axum::response::Redirect;
 use axum_extra::extract::CookieJar;

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

@@ -1,5 +1,5 @@
-use crate::BotState;
-use crate::api::utils::get_user_id_from_session::get_user_id_from_session;
+use crate::prelude::api::*;
+use crate::prelude::types::*;
 use axum::extract::State;
 use axum::response::Redirect;
 use axum_extra::extract::CookieJar;

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

@@ -1,3 +1,7 @@
 pub mod callback;
 pub mod login;
 pub mod logout;
+
+pub use callback::*;
+pub use login::*;
+pub use logout::*;

rustmail/src/api/handler/bot/mod.rs

@@ -3,3 +3,9 @@ pub mod start;
 pub mod status;
 pub mod stop;
 pub mod tickets;
+
+pub use restart::*;
+pub use start::*;
+pub use status::*;
+pub use stop::*;
+pub use tickets::*;

rustmail/src/api/handler/bot/restart.rs

@@ -1,5 +1,5 @@
-use crate::api::utils::ping_internal::ping_internal;
-use crate::{BotState, BotStatus};
+use crate::prelude::api::*;
+use crate::prelude::types::*;
 use axum::Json;
 use axum::extract::State;
 use axum::http::StatusCode;

rustmail/src/api/handler/bot/start.rs

@@ -1,6 +1,6 @@
 use crate::bot::run_bot;
-use crate::config::load_config;
-use crate::{BotState, BotStatus};
+use crate::prelude::config::*;
+use crate::prelude::types::*;
 use axum::Json;
 use axum::extract::State;
 use axum::http::StatusCode;

rustmail/src/api/handler/bot/status.rs

@@ -1,4 +1,4 @@
-use crate::BotState;
+use crate::prelude::types::*;
 use axum::Json;
 use axum::extract::State;
 use axum::http::StatusCode;
@@ -10,11 +10,11 @@ pub async fn handle_status_bot(State(bot_state): State<Arc<Mutex<BotState>>>) ->
     let state_lock = bot_state.lock().await;
 
     match state_lock.status {
-        crate::BotStatus::Running { .. } => (
+        BotStatus::Running { .. } => (
             StatusCode::OK,
             Json(serde_json::json!({"status": "running"})),
         ),
-        crate::BotStatus::Stopped => (
+        BotStatus::Stopped => (
             StatusCode::OK,
             Json(serde_json::json!({"status": "stopped"})),
         ),

rustmail/src/api/handler/bot/stop.rs

@@ -1,4 +1,4 @@
-use crate::{BotState, BotStatus};
+use crate::prelude::types::*;
 use axum::Json;
 use axum::extract::State;
 use axum::http::StatusCode;

rustmail/src/api/handler/bot/tickets.rs

@@ -1,4 +1,4 @@
-use crate::BotState;
+use crate::prelude::types::*;
 use axum::{
     Json,
     extract::{Query, State},

rustmail/src/api/handler/mod.rs

@@ -2,3 +2,8 @@ pub mod auth;
 pub mod bot;
 pub mod panel;
 pub mod user;
+
+pub use auth::*;
+pub use bot::*;
+pub use panel::*;
+pub use user::*;

rustmail/src/api/handler/panel/mod.rs

@@ -1 +1,3 @@
 pub mod panel;
+
+pub use panel::*;

rustmail/src/api/handler/panel/panel.rs

@@ -1,4 +1,4 @@
-use crate::BotState;
+use crate::prelude::types::*;
 use axum::extract::State;
 use axum::response::IntoResponse;
 use std::sync::Arc;

rustmail/src/api/handler/user/avatar.rs

@@ -1,5 +1,5 @@
-use crate::BotState;
-use crate::api::utils::get_user_id_from_session::get_user_id_from_session;
+use crate::prelude::api::*;
+use crate::prelude::types::*;
 use axum::extract::State;
 use axum::response::IntoResponse;
 use axum_extra::extract::CookieJar;

rustmail/src/api/handler/user/mod.rs

@@ -1 +1,3 @@
 pub mod avatar;
+
+pub use avatar::*;

rustmail/src/api/middleware/auth.rs

@@ -1,5 +1,5 @@
-use crate::api::utils::get_user_id_from_session::get_user_id_from_session;
-use crate::{BotCommand, BotState, BotStatus};
+use crate::prelude::api::*;
+use crate::prelude::types::*;
 use axum::extract::State;
 use axum::extract::{ConnectInfo, Request};
 use axum::middleware::Next;

rustmail/src/api/middleware/mod.rs

@@ -1 +1,3 @@
 pub mod auth;
+
+pub use auth::*;

rustmail/src/api/mod.rs

@@ -3,3 +3,9 @@ pub mod middleware;
 pub mod router;
 pub mod routes;
 pub mod utils;
+
+pub use handler::*;
+pub use middleware::*;
+pub use router::*;
+pub use routes::*;
+pub use utils::*;

rustmail/src/api/router.rs

@@ -1,8 +1,5 @@
-use crate::BotState;
-use crate::api::routes::auth::create_auth_router;
-use crate::api::routes::bot::create_bot_router;
-use crate::api::routes::panel::create_panel_router;
-use crate::api::routes::user::create_user_router;
+use crate::prelude::api::*;
+use crate::prelude::types::*;
 use axum::Router;
 use std::sync::Arc;
 use tokio::sync::Mutex;

rustmail/src/api/routes/auth.rs

@@ -1,7 +1,5 @@
-use crate::BotState;
-use crate::api::handler::auth::callback::handle_callback;
-use crate::api::handler::auth::login::handle_login;
-use crate::api::handler::auth::logout::handle_logout;
+use crate::prelude::api::*;
+use crate::prelude::types::*;
 use axum::Router;
 use axum::routing::get;
 use std::sync::Arc;

rustmail/src/api/routes/bot.rs

@@ -1,10 +1,5 @@
-use crate::BotState;
-use crate::api::handler::bot::restart::handle_restart_bot;
-use crate::api::handler::bot::start::handle_start_bot;
-use crate::api::handler::bot::status::handle_status_bot;
-use crate::api::handler::bot::stop::handle_stop_bot;
-use crate::api::handler::bot::tickets::handle_tickets_bot;
-use crate::api::middleware::auth::auth_middleware;
+use crate::prelude::api::*;
+use crate::prelude::types::*;
 use axum::Router;
 use axum::routing::{get, post};
 use std::sync::Arc;

rustmail/src/api/routes/mod.rs

@@ -2,3 +2,8 @@ pub mod auth;
 pub mod bot;
 pub mod panel;
 pub mod user;
+
+pub use auth::*;
+pub use bot::*;
+pub use panel::*;
+pub use user::*;

rustmail/src/api/routes/panel.rs

@@ -1,6 +1,5 @@
-use crate::BotState;
-use crate::api::handler::panel::panel::handle_panel_check;
-use crate::api::middleware::auth::auth_middleware;
+use crate::prelude::api::*;
+use crate::prelude::types::*;
 use axum::Router;
 use axum::routing::get;
 use std::sync::Arc;

rustmail/src/api/routes/user.rs

@@ -1,6 +1,5 @@
-use crate::BotState;
-use crate::api::handler::user::avatar::handle_get_user_avatar;
-use crate::api::middleware::auth::auth_middleware;
+use crate::prelude::api::*;
+use crate::prelude::types::*;
 use axum::Router;
 use axum::routing::get;
 use std::sync::Arc;

rustmail/src/api/utils/mod.rs

@@ -1,2 +1,5 @@
 pub mod get_user_id_from_session;
 pub mod ping_internal;
+
+pub use get_user_id_from_session::*;
+pub use ping_internal::*;

rustmail/src/bot.rs

@@ -1,36 +1,10 @@
-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;
-use crate::commands::close::slash_command::close::CloseCommand;
-use crate::commands::delete::slash_command::delete::DeleteCommand;
-use crate::commands::edit::slash_command::edit::EditCommand;
-use crate::commands::force_close::slash_command::force_close::ForceCloseCommand;
-use crate::commands::help::slash_command::help::HelpCommand;
-use crate::commands::id::slash_command::id::IdCommand;
-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::config::load_config;
-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;
-use crate::handlers::guild_message_reactions_handler::GuildMessageReactionsHandler;
-use crate::handlers::guild_messages_handler::GuildMessagesHandler;
-use crate::handlers::guild_moderation_handler::GuildModerationHandler;
-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::{BotCommand, BotState, BotStatus, db};
+use crate::prelude::commands::*;
+use crate::prelude::config::*;
+use crate::prelude::db::*;
+use crate::prelude::errors::*;
+use crate::prelude::handlers::*;
+use crate::prelude::panel_commands::*;
+use crate::prelude::types::*;
 use base64::Engine;
 use rand::RngCore;
 use serenity::all::{ClientBuilder, GatewayIntents};
@@ -43,9 +17,7 @@ use tokio::sync::Mutex;
 use tokio::{select, spawn};
 
 pub async fn init_bot_state() -> Arc<Mutex<BotState>> {
-    let pool = db::operations::init_database()
-        .await
-        .expect("An error occured!");
+    let pool = init_database().await.expect("An error occured!");
     println!("Database connected!");
 
     let mut bytes = [0u8; 32];

rustmail/src/commands/add_reminder/common.rs

@@ -1,7 +1,6 @@
-use crate::config::Config;
-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 crate::prelude::config::*;
+use crate::prelude::db::*;
+use crate::prelude::utils::*;
 use chrono::Local;
 use serenity::all::{ChannelId, CommandInteraction, Context, Message, UserId};
 use sqlx::SqlitePool;

rustmail/src/commands/add_reminder/mod.rs

@@ -1,3 +1,7 @@
 pub mod common;
 pub mod slash_command;
 pub mod text_command;
+
+pub use common::*;
+pub use slash_command::*;
+pub use text_command::*;

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

@@ -1,14 +1,10 @@
-use crate::commands::add_reminder::common::{
-    send_register_confirmation_from_command, spawn_reminder,
-};
-use crate::commands::{BoxFuture, RegistrableCommand};
-use crate::config::Config;
-use crate::db::reminders::{Reminder, insert_reminder};
-use crate::db::threads::get_thread_by_user_id;
-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 crate::prelude::commands::*;
+use crate::prelude::config::*;
+use crate::prelude::db::*;
+use crate::prelude::errors::*;
+use crate::prelude::handlers::*;
+use crate::prelude::i18n::*;
+use crate::prelude::utils::*;
 use chrono::{Local, NaiveTime, TimeZone};
 use regex::Regex;
 use serenity::FutureExt;
@@ -100,7 +96,7 @@ impl RegistrableCommand for AddReminderCommand {
             let pool = config
                 .db_pool
                 .as_ref()
-                .ok_or_else(common::database_connection_failed)?;
+                .ok_or_else(database_connection_failed)?;
 
             let _ = defer_response(&ctx, &command).await;
 

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

@@ -1 +1,3 @@
 pub mod add_reminder;
+
+pub use add_reminder::*;

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

@@ -1,12 +1,9 @@
-use crate::commands::add_reminder::common::{
-    send_register_confirmation_from_message, spawn_reminder,
-};
-use crate::config::Config;
-use crate::db::reminders::{Reminder, insert_reminder};
-use crate::db::threads::get_thread_by_user_id;
-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 crate::prelude::commands::*;
+use crate::prelude::config::*;
+use crate::prelude::db::*;
+use crate::prelude::errors::*;
+use crate::prelude::handlers::*;
+use crate::prelude::utils::*;
 use chrono::{Local, NaiveTime, TimeZone};
 use regex::Regex;
 use serenity::all::{Context, Message};
@@ -21,7 +18,7 @@ pub async fn add_reminder(
     let pool = config
         .db_pool
         .as_ref()
-        .ok_or_else(common::database_connection_failed)?;
+        .ok_or_else(database_connection_failed)?;
 
     let content =
         match extract_reply_content(&msg.content, &config.command.prefix, &["remind", "rem"]) {

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

@@ -1 +1,3 @@
 pub mod add_reminder;
+
+pub use add_reminder::*;

rustmail/src/commands/add_staff/common.rs

@@ -1,5 +1,5 @@
-use crate::config::Config;
-use crate::errors::ModmailResult;
+use crate::prelude::config::*;
+use crate::prelude::errors::*;
 use serenity::all::{
     ChannelId, Context, Message, PermissionOverwrite, PermissionOverwriteType, UserId,
 };
@@ -26,7 +26,7 @@ pub async fn add_user_to_channel(
     Ok(())
 }
 
-pub async fn extract_user_id(msg: &Message, config: &Config) -> String {
+pub async fn extract_staff_id(msg: &Message, config: &Config) -> String {
     let content = msg.content.trim();
     let prefix = &config.command.prefix;
     let command_names = ["addmod", "am"];

rustmail/src/commands/add_staff/mod.rs

@@ -1,3 +1,7 @@
 pub mod common;
 pub mod slash_command;
 pub mod text_command;
+
+pub use common::*;
+pub use slash_command::*;
+pub use text_command::*;