@@ -73,4 +56,2 @@
   };
 
-  match add_server(&db, ctx, &server_data).await {
-    Ok(_) => {}

@@ -12,3 +12,2 @@
 pub async fn run(command: &CommandInteraction, ctx: &Context) -> String {
-  let sub_options = if let Some(CommandDataOption {
-    value: CommandDataOptionValue::SubCommand(options),
+  let Some(CommandDataOption {

@@ -27,2 +24,2 @@
-      false
-    };
+      })
+      .unwrap_or(false);

@@ -43,3 +40,2 @@
 
-    cs.sort_by_key(|(count, _)| *count);
-    cs.reverse();
+    cs.sort_by_key(|(count, _)| std::cmp::Reverse(*count));

@@ -46,3 +42,3 @@
 
     // msg can be a max 2000 chars long
-    let mut limit = 2000 - 3;
+    let limit = 2000 - 3;

@@ -60,2 +48,2 @@
-        limit -= length;
-      } else {
+      use std::fmt::Write;
+      let len_before = response.len();

@@ -106,2 +93,2 @@
-      }
-    }
+    let committees = get_committees(&db).await.into_iter().flatten().map(|committee| (committee.id, committee));
+    let committees: HashMap<_, _> = committees.collect();

@@ -155,3 +121,1 @@
-        response.push(line);
-        limit -= length;
-      } else {
+      use std::fmt::Write;

@@ -156,2 +121,2 @@
-        limit -= length;
-      } else {
+      use std::fmt::Write;
+      let len_before = response.len();

@@ -77,3 +70,1 @@
-      }
-    }
-    _ => None,
+  let x: i64 = row.try_get("discord").ok()?;

@@ -78,4 +78,2 @@
     .recv_json()
     .await
-  {
-    Ok(res) => Some(res),

@@ -61,3 +57,1 @@
-        .split(',')
-        .map(|s| {
-          let s = s.split(':').collect::<Vec<&str>>();
+    this.colors = if args.colors.contains(':') {

@@ -78,3 +74,1 @@
-
-        colors.push(c);
-      }
+        .collect::<std::io::Result<_>>()?;

@@ -393,4 +372,2 @@
     .fetch_optional(db)
     .await
-    {
-      Ok(_) => {}

@@ -254,3 +245,1 @@
-          continue;
-        }
-        Some(x) => x.to_owned(),
+      let Some(name) = path_local2.file_name().map(ToOwned::to_owned) else {

@@ -319,2 +304,2 @@
-        }
-      }
+      let name_lowercase = logo.name.to_ascii_lowercase();
+      let name_lowercase = name_lowercase.to_str().unwrap_or_default();

@@ -24,7 +24,7 @@ struct WolvesResultUserMin {
 }
 async fn add_users_wolves(db: &Pool<Sqlite>, user: &WolvesResultUserMin) {
   // expiry
-  match sqlx::query_as::<_, Wolves>(

@@ -122,2 +120,2 @@
-    if let Ok(x) = x.trim().parse::<u64>() {
-      config.compsoc_server = GuildId::new(x);
+    if let Ok(x) = x.trim().parse() {
+      config.compsoc_server = GuildId::new(x)

@@ -55,3 +55,3 @@
     // committee server takes priority
     let committee_server = config_global.committee_server;
-    if new_member.guild_id.get() == committee_server.get() {
+    if new_member.guild_id == committee_server {

@@ -116,3 +115,1 @@
-    if let Some(x) = new_data {
-      on_role_change(&db, &ctx, x).await;
-    }
+    let Some(x) = new_data else { return };

@@ -129,3 +127,3 @@
     let config = config_lock.read().await;
 
-    match Command::set_global_commands(
+    if let Err(e) = Command::set_global_commands(