feat(shard): insert shard manager in client's data to be able to fetch discord's api latency

Author: Akinator31

rustmail/src/bot.rs

@@ -7,15 +7,22 @@ use crate::prelude::panel_commands::*;
 use crate::prelude::types::*;
 use base64::Engine;
 use rand::RngCore;
-use serenity::all::{ClientBuilder, GatewayIntents};
+use serenity::all::{ClientBuilder, GatewayIntents, ShardManager};
 use serenity::cache::Settings as CacheSettings;
+use serenity::prelude::TypeMapKey;
 use std::collections::HashMap;
 use std::process;
 use std::sync::Arc;
 use std::time::Duration;
 use tokio::sync::Mutex;
 use tokio::{select, spawn};
 
+pub struct ShardManagerKey;
+
+impl TypeMapKey for ShardManagerKey {
+    type Value = Arc<ShardManager>;
+}
+
 pub async fn init_bot_state() -> Arc<Mutex<BotState>> {
     let pool = init_database().await.expect("An error occured!");
     println!("Database connected!");
@@ -136,6 +143,7 @@ pub async fn run_bot(
     registry.register_command(LogsCommand);
     registry.register_command(TakeCommand);
     registry.register_command(ReleaseCommand);
+    registry.register_command(PingCommand);
 
     let registry = Arc::new(registry);
 
@@ -174,6 +182,12 @@ pub async fn run_bot(
         state_lock.bot_http = Some(client.http.clone());
     }
 
+    {
+        let mut data = client.data.write().await;
+
+        data.insert::<ShardManagerKey>(client.shard_manager.clone());
+    }
+
     if let Err(e) = config.validate_servers(&client.http).await {
         eprintln!("Configuration validation error: {}", e);
         eprintln!(

rustmail/src/config.rs

@@ -21,7 +21,8 @@ pub struct Config {
 
     pub db_pool: Option<SqlitePool>,
     pub error_handler: Option<Arc<ErrorHandler>>,
-    pub thread_locks: Arc<std::sync::Mutex<std::collections::HashMap<u64, Arc<tokio::sync::Mutex<()>>>>>,
+    pub thread_locks:
+        Arc<std::sync::Mutex<std::collections::HashMap<u64, Arc<tokio::sync::Mutex<()>>>>>,
 }
 
 fn get_local_ip() -> Option<String> {
@@ -50,21 +51,30 @@ pub fn load_config(path: &str) -> Option<Config> {
     }
 
     if u64::from_str_radix(&config_response.thread.user_message_color, 16).is_err() {
-        eprintln!("Incorrect user message color in the config.toml! Please put a color in hex format!");
+        eprintln!(
+            "Incorrect user message color in the config.toml! Please put a color in hex format!"
+        );
         return None;
     }
 
     if u64::from_str_radix(&config_response.thread.staff_message_color, 16).is_err() {
-        eprintln!("Incorrect staff message color in the config.toml! Please put a color in hex format!");
+        eprintln!(
+            "Incorrect staff message color in the config.toml! Please put a color in hex format!"
+        );
         return None;
     }
 
     if u64::from_str_radix(&config_response.reminders.embed_color, 16).is_err() {
-        eprintln!("Incorrect reminder embed color in the config.toml! Please put a color in hex format!");
+        eprintln!(
+            "Incorrect reminder embed color in the config.toml! Please put a color in hex format!"
+        );
         return None;
     }
 
-    if !config_response.language.is_language_supported(config_response.language.get_default_language()) {
+    if !config_response
+        .language
+        .is_language_supported(config_response.language.get_default_language())
+    {
         eprintln!(
             "Warning: Default language '{}' is not in supported languages list",
             config_response.language.default_language