From a8c1cc9cf1c3004f33420cbabad211fed5f6f2cf Mon Sep 17 00:00:00 2001
From: Brendan Golden <git@brendan.ie>
Date: Tue, 18 Feb 2025 22:46:58 +0000
Subject: [PATCH] fix: slight duplicate removal

---
 src/common/minecraft.rs |  4 ++--
 src/common/set_roles.rs | 16 ++++++----------
 src/main.rs             | 28 ++++++++++++++--------------
 3 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/src/common/minecraft.rs b/src/common/minecraft.rs
index 25bde46..7b27d36 100644
--- a/src/common/minecraft.rs
+++ b/src/common/minecraft.rs
@@ -102,7 +102,7 @@ struct BodyDelete {
 }
 
 pub async fn whitelist_wipe(server: &str, token: &str) {
-  let url_base = format!("http://panel.games.skynet.ie/api/client/servers/{server}");
+  let url_base = format!("https://panel.games.skynet.ie/api/client/servers/{server}");
   let bearer = format!("Bearer {token}");
 
   // delete whitelist
@@ -123,7 +123,7 @@ pub async fn whitelist_wipe(server: &str, token: &str) {
 }
 
 pub async fn server_information(server: &str, token: &str) -> Option<ServerDetailsRes> {
-  let url_base = format!("http://panel.games.skynet.ie/api/client/servers/{server}");
+  let url_base = format!("https://panel.games.skynet.ie/api/client/servers/{server}");
   let bearer = format!("Bearer {token}");
   get::<ServerDetailsRes>(&format!("{url_base}/"), &bearer).await
 }
diff --git a/src/common/set_roles.rs b/src/common/set_roles.rs
index f0a02cb..9ebd39e 100644
--- a/src/common/set_roles.rs
+++ b/src/common/set_roles.rs
@@ -341,21 +341,17 @@ pub mod committee {
   }
 
   async fn get_committees(db: &Pool<Sqlite>) -> Vec<Committees> {
-    match sqlx::query_as::<_, Committees>(
+    sqlx::query_as::<_, Committees>(
       r#"
         SELECT *
         FROM committees
         "#,
     )
-    .fetch_all(db)
-    .await
-    {
-      Ok(a) => a,
-      Err(e) => {
-        dbg!(e);
-        vec![]
-      }
-    }
+        .fetch_all(db)
+        .await.unwrap_or_else(|e| {
+      dbg!(e);
+      vec![]
+    })
   }
 
   async fn get_server_member_discord(db: &Pool<Sqlite>, user: &i64) -> Option<Wolves> {
diff --git a/src/main.rs b/src/main.rs
index e1fe422..8b1b20a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -91,6 +91,20 @@ Sign up on [UL Wolves]({}) and go to https://discord.com/channels/{}/{} and use
     }
   }
 
+  // handles role updates
+  async fn guild_member_update(&self, ctx: Context, _old_data: Option<Member>, new_data: Member) {
+    // get config/db
+    let db_lock = {
+      let data_read = ctx.data.read().await;
+      data_read.get::<DataBase>().expect("Expected Config in TypeMap.").clone()
+    };
+
+    let db = db_lock.read().await;
+
+    // check if the role changed is part of the oens for this server
+    on_role_change(&db, &ctx, new_data).await;
+  }
+
   async fn ready(&self, ctx: Context, ready: Ready) {
     println!("[Main] {} is connected!", ready.user.name);
     ctx.set_presence(Some(Activity::playing("with humanity's fate")), OnlineStatus::Online).await;
@@ -139,20 +153,6 @@ Sign up on [UL Wolves]({}) and go to https://discord.com/channels/{}/{} and use
       }
     }
   }
-
-  // handles role updates
-  async fn guild_member_update(&self, ctx: Context, _old_data: Option<Member>, new_data: Member) {
-    // get config/db
-    let db_lock = {
-      let data_read = ctx.data.read().await;
-      data_read.get::<DataBase>().expect("Expected Config in TypeMap.").clone()
-    };
-
-    let db = db_lock.read().await;
-
-    // check if the role changed is part of the oens for this server
-    on_role_change(&db, &ctx, new_data).await;
-  }
 }
 
 async fn get_committee(db: &Pool<Sqlite>, committee: &str) -> Vec<Committees> {