From 0df7c8a29f5d5183e6539c7323cdda9b61ad01af Mon Sep 17 00:00:00 2001
From: Brendan Golden <git@brendan.ie>
Date: Tue, 17 Sep 2024 21:41:30 +0100
Subject: [PATCH] feat: using teh vars from teh DB now

---
 src/main.rs | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index b921de1..ee0d7fc 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -51,28 +51,27 @@ impl EventHandler for Handler {
       if let Err(e) = new_member.add_roles(&ctx, &roles).await {
         println!("{:?}", e);
       }
-    } else if let Some(server_name) = new_member.guild_id.name(&ctx) {
-      let ulwolves_link = "";
-      let mut bot_channel = String::new();
-
-      if let Ok(channels) = new_member.guild_id.channels(&ctx).await {
-        if let Some(channel) = channels.values().find(|c| c.name == "bot-commands") {
-          bot_channel = channel.id.to_string();
-        }
-      }
-      let bot_channel_message = match bot_channel.is_empty() {
-        true => "go to the bot channel".to_string(),
-        false => format!("go to https://discord.com/channels/{}/{}", new_member.guild_id, bot_channel),
-      };
-
+    } else {
       let msg = format!(
-        "Welcome {} to the {} server! \n\
-        Sign up on [UL Wolves]({}) and {} and use ``/link_wolves`` to get full access",
-        new_member.display_name(),
-        server_name,
-        ulwolves_link,
-        bot_channel_message
+        r#"
+        Welcome {} to the {} server!
+        Sign up on [UL Wolves]({}) and go to https://discord.com/channels/{}/{} and use ``/link_wolves`` to get full access.
+        "#,
+       new_member.display_name(),
+       &config.server_name,
+       &config.wolves_link,
+       &config.server,
+       &config.bot_channel_id
       );
+      // let msg = format!(
+      //   "Welcome {} to the {} server! \n\
+      //   Sign up on [UL Wolves]({}) and go to https://discord.com/channels/{}/{} and use ``/link_wolves`` to get full access.",
+      //   new_member.display_name(),
+      //   &config.server_name,
+      //   &config.wolves_link,
+      //   &config.server,
+      //   &config.bot_channel_id
+      // );
 
       if let Err(err) = new_member.user.direct_message(&ctx, |m| m.content(&msg)).await {
         dbg!(err);