It now uses config-rs for configuration management instead of hard coded values

Author: Harshith-2208

Cargo.toml

@@ -17,3 +17,5 @@ dotenv = "0.15.0"
 serenity = { version = "0.12.4", features = ["chrono"] }
 poise = "0.6.1"
 tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
+config = "0.13"
+lazy_static = "1.4"

config.toml

@@ -0,0 +1,24 @@
+[discord]
+roles_message_id = 1298636092886749294
+
+[roles]
+archive = 1208457364274028574
+mobile = 1298553701094395936
+systems = 1298553801191718944
+ai = 1298553753523453952
+research = 1298553855474270219
+devops = 1298553883169132554
+web = 1298553910167994428
+
+[channels]
+group_one = 1225098248293716008
+group_two = 1225098298935738489
+group_three = 1225098353378070710
+group_four = 1225098407216156712
+status_update = 764575524127244318
+
+[status_update]
+title_url = "https://www.youtube.com/watch?v=epnuvyNj0FM"
+image_url = "https://media1.tenor.com/m/zAHCPvoyjNIAAAAd/yay-kitty.gif"
+author_url = "https://github.com/amfoss/amd"
+icon_url = "https://cdn.discordapp.com/avatars/1245352445736128696/da3c6f833b688f5afa875c9df5d86f91.webp?size=160"

src/config.rs

@@ -0,0 +1,58 @@
+use config::{Config, File};
+use serde::Deserialize;
+use lazy_static::lazy_static;
+use std::sync::Arc;
+
+#[derive(Debug, Deserialize)]
+pub struct Discord {
+    pub roles_message_id: u64,
+}
+
+#[derive(Debug, Deserialize)]
+pub struct Roles {
+    pub archive: u64,
+    pub mobile: u64,
+    pub systems: u64,
+    pub ai: u64,
+    pub research: u64,
+    pub devops: u64,
+    pub web: u64,
+}
+
+#[derive(Debug, Deserialize)]
+pub struct Channels {
+    pub group_one: u64,
+    pub group_two: u64,
+    pub group_three: u64,
+    pub group_four: u64,
+    pub status_update: u64,
+}
+
+#[derive(Debug, Deserialize)]
+pub struct StatusUpdate {
+    pub title_url: String,
+    pub image_url: String,
+    pub author_url: String,
+    pub icon_url: String,
+}
+
+#[derive(Debug, Deserialize)]
+pub struct Settings {
+    pub discord: Discord,
+    pub roles: Roles,
+    pub channels: Channels,
+    pub status_update: StatusUpdate,
+}
+
+lazy_static! {
+    pub static ref CONFIG: Arc<Settings> = {
+        let config = Config::builder()
+            .add_source(File::with_name("config.toml"))
+            .build()
+            .expect("Failed to load configuration")
+            .try_deserialize()
+            .expect("Invalid configuration format");
+
+        Arc::new(config)
+    };
+}

src/ids.rs

@@ -28,6 +28,10 @@ mod tasks;
 /// Misc. helper functions that don't really have a place anywhere else.
 mod utils;
 
+mod config;
+
+use config::CONFIG;
+
 use anyhow::Context as _;
 use poise::{Context as PoiseContext, Framework, FrameworkOptions, PrefixFrameworkOptions};
 use serenity::{

src/main.rs

@@ -35,16 +35,12 @@ use crate::{
         models::Member,
         queries::{fetch_members, increment_streak, reset_streak},
     },
-    ids::{
-        GROUP_FOUR_CHANNEL_ID, GROUP_ONE_CHANNEL_ID, GROUP_THREE_CHANNEL_ID, GROUP_TWO_CHANNEL_ID,
-        STATUS_UPDATE_CHANNEL_ID,
-    },
 };
 
-const TITLE_URL: &str = "https://www.youtube.com/watch?v=epnuvyNj0FM";
-const IMAGE_URL: &str = "https://media1.tenor.com/m/zAHCPvoyjNIAAAAd/yay-kitty.gif";
-const AUTHOR_URL: &str = "https://github.com/amfoss/amd";
-const ICON_URL: &str = "https://cdn.discordapp.com/avatars/1245352445736128696/da3c6f833b688f5afa875c9df5d86f91.webp?size=160";
+const TITLE_URL: &str = &CONFIG.status_update.title_url;
+const IMAGE_URL: &str = &CONFIG.status_update.image_url;
+const AUTHOR_URL: &str = &CONFIG.status_update.author_url;
+const ICON_URL: &str = &CONFIG.status_update.icon_url;
 
 /// Checks for status updates daily at 9 AM.
 pub struct StatusUpdateCheck;
@@ -95,15 +91,15 @@ pub async fn check_status_updates(ctx: Context) -> anyhow::Result<()> {
 
 // TOOD: Get IDs through ENV instead
 fn get_channel_ids() -> anyhow::Result<Vec<ChannelId>> {
-    trace!("Getting channel ids...");
     Ok(vec![
-        ChannelId::new(GROUP_ONE_CHANNEL_ID),
-        ChannelId::new(GROUP_TWO_CHANNEL_ID),
-        ChannelId::new(GROUP_THREE_CHANNEL_ID),
-        ChannelId::new(GROUP_FOUR_CHANNEL_ID),
+        ChannelId::new(CONFIG.channels.group_one),
+        ChannelId::new(CONFIG.channels.group_two),
+        ChannelId::new(CONFIG.channels.group_three),
+        ChannelId::new(CONFIG.channels.group_four),
     ])
 }
 
+
 async fn send_and_save_limiting_messages(
     channel_ids: &Vec<ChannelId>,
     ctx: &Context,
@@ -295,18 +291,18 @@ async fn generate_embed(
 
     let mut embed = CreateEmbed::default()
         .title(format!("Status Update Report - {}", today))
-        .url(TITLE_URL)
+        .url(&CONFIG.status_update.title_url)
         .description(description)
         .color(serenity::all::Colour::new(0xeab308))
         .timestamp(Timestamp::now())
         .author(
             CreateEmbedAuthor::new("amD")
-                .url(AUTHOR_URL)
-                .icon_url(ICON_URL),
+                .url(&CONFIG.status_update.author_url)
+                .icon_url(&CONFIG.status_update.icon_url),
         );
 
     if naughty_list.is_empty() {
-        embed = embed.image(IMAGE_URL);
+        embed = embed.image(&CONFIG.status_update.image_url);
     }
 
     Ok(embed)