fmt: unwraps changed to ?

db/migrations/5_welcome-message.sql

@@ -0,0 +1,5 @@
+-- temp table to allow folks to verify by committee email.
+-- delete the col in teh server table
+ALTER TABLE servers ADD COLUMN bot_channel_id integer DEFAULT 0;
+ALTER TABLE servers ADD COLUMN server_name text NOT NULL;
+ALTER TABLE servers ADD COLUMN wolves_link text NOT NULL;

src/commands/add_server.rs

@@ -39,7 +39,7 @@ pub async fn run(command: &ApplicationCommandInteraction, ctx: &Context) -> Stri
     .as_ref()
     .expect("Expected role object")
   {
-    Some(role.id.to_owned())
+    role.id.to_owned()
   } else {
     return "Please provide a valid role for ``Role Current``".to_string();
   };
@@ -51,6 +51,48 @@ pub async fn run(command: &ApplicationCommandInteraction, ctx: &Context) -> Stri
     }
   };
 
+  let bot_channel_id = if let CommandDataOptionValue::Channel(channel) = command
+    .data
+    .options
+    .get(3)
+    .expect("Expected channel option")
+    .resolved
+    .as_ref()
+    .expect("Expected channel object")
+  {
+    channel.id.to_owned()
+  } else {
+    return "Please provide a valid channel for ``Bot Channel``".to_string();
+  };
+
+  let server_name = if let CommandDataOptionValue::String(name) = command
+    .data
+    .options
+    .get(4)
+    .expect("Expected Server Name option")
+    .resolved
+    .as_ref()
+    .expect("Expected Server Name object")
+  {
+    name
+  } else {
+    &"UL Computer Society".to_string()
+  };
+
+  let wolves_link = if let CommandDataOptionValue::String(wolves) = command
+    .data
+    .options
+    .get(5)
+    .expect("Expected Wolves Link option")
+    .resolved
+    .as_ref()
+    .expect("Expected Server Name object")
+  {
+    wolves
+  } else {
+    &"https://ulwolves.ie/society/computer".to_string()
+  };
+
   let db_lock = {
     let data_read = ctx.data.read().await;
     data_read.get::<DataBase>().expect("Expected Databse in TypeMap.").clone()
@@ -64,6 +106,9 @@ pub async fn run(command: &ApplicationCommandInteraction, ctx: &Context) -> Stri
     role_current,
     member_past: 0,
     member_current: 0,
+    bot_channel_id,
+    server_name: server_name.to_owned(),
+    wolves_link: wolves_link.to_string(),
   };
 
   match add_server(&db, ctx, &server_data).await {
@@ -102,23 +147,46 @@ pub fn register(command: &mut CreateApplicationCommand) -> &mut CreateApplicatio
         .kind(CommandOptionType::Role)
         .required(false)
     })
+    .create_option(|option| {
+      option
+        .name("bot_channel")
+        .description("Safe space for folks to use the bot commands.")
+        .kind(CommandOptionType::Channel)
+        .required(true)
+    })
+    .create_option(|option| {
+      option
+        .name("server_name")
+        .description("Name of the Discord Server.")
+        .kind(CommandOptionType::String)
+        .required(true)
+    })
+    .create_option(|option| {
+      option
+        .name("wolves_link")
+        .description("Link to the Club/Society on UL Wolves.")
+        .kind(CommandOptionType::String)
+        .required(true)
+    })
 }
 
 async fn add_server(db: &Pool<Sqlite>, ctx: &Context, server: &Servers) -> Result<Option<Servers>, Error> {
   let existing = get_server_config(db, &server.server).await;
   let role_past = server.role_past.map(|x| *x.as_u64() as i64);
-  let role_current = server.role_current.map(|x| *x.as_u64() as i64);
 
   let insert = sqlx::query_as::<_, Servers>(
     "
-      INSERT OR REPLACE INTO servers (server, wolves_api, role_past, role_current)
+      INSERT OR REPLACE INTO servers (server, wolves_api, role_past, role_current, bot_channel_id, server_name, wolves_link)
-      VALUES (?1, ?2, ?3, ?4)
+      VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7)
     ",
   )
   .bind(*server.server.as_u64() as i64)
   .bind(&server.wolves_api)
   .bind(role_past)
-  .bind(role_current)
+  .bind(*server.role_current.as_u64() as i64)
+  .bind(*server.bot_channel_id.as_u64() as i64)
+  .bind(&server.server_name)
+  .bind(&server.wolves_link)
   .fetch_optional(db)
   .await;
 
@@ -133,7 +201,7 @@ async fn add_server(db: &Pool<Sqlite>, ctx: &Context, server: &Servers) -> Resul
       if x.role_current != server.role_current {
         result.0 = true;
         result.1 = true;
-        result.2 = x.role_current;
+        result.2 = Some(x.role_current);
       }
       if x.role_past != server.role_past {
         result.0 = true;

src/commands/committee.rs

@@ -172,7 +172,7 @@ pub mod link {
     let creds = Credentials::new(config.mail_user.clone(), config.mail_pass.clone());
 
     // Open a remote connection to gmail using STARTTLS
-    let mailer = SmtpTransport::starttls_relay(&config.mail_smtp).unwrap().credentials(creds).build();
+    let mailer = SmtpTransport::starttls_relay(&config.mail_smtp)?.credentials(creds).build();
 
     // Send the email
     mailer.send(&email)

src/commands/link_email.rs

@@ -184,7 +184,7 @@ pub mod link {
     let creds = Credentials::new(config.mail_user.clone(), config.mail_pass.clone());
 
     // Open a remote connection to gmail using STARTTLS
-    let mailer = SmtpTransport::starttls_relay(&config.mail_smtp).unwrap().credentials(creds).build();
+    let mailer = SmtpTransport::starttls_relay(&config.mail_smtp)?.credentials(creds).build();
 
     // Send the email
     mailer.send(&email)
@@ -352,10 +352,8 @@ pub mod verify {
               }
             }
 
-            if let Some(role) = &role_current {
+            if !member.roles.contains(&role_current) {
-              if !member.roles.contains(role) {
+              roles.push(role_current.to_owned());
-                roles.push(role.to_owned());
-              }
             }
 
             if let Err(e) = member.add_roles(&ctx, &roles).await {

src/lib.rs

@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
 use serenity::{
   model::{
     guild,
-    id::{GuildId, RoleId},
+    id::{ChannelId, GuildId, RoleId},
   },
   prelude::TypeMapKey,
 };
@@ -228,9 +228,13 @@ pub struct Servers {
   pub server: GuildId,
   pub wolves_api: String,
   pub role_past: Option<RoleId>,
-  pub role_current: Option<RoleId>,
+  pub role_current: RoleId,
   pub member_past: i64,
   pub member_current: i64,
+  pub bot_channel_id: ChannelId,
+  // these can be removed in teh future with an API update
+  pub server_name: String,
+  pub wolves_link: String,
 }
 impl<'r> FromRow<'r, SqliteRow> for Servers {
   fn from_row(row: &'r SqliteRow) -> Result<Self, Error> {
@@ -250,15 +254,14 @@ impl<'r> FromRow<'r, SqliteRow> for Servers {
     let role_current = match row.try_get("role_current") {
       Ok(x) => {
         let tmp: i64 = x;
-        if tmp == 0 {
+        RoleId::from(tmp as u64)
-          None
-        } else {
-          Some(RoleId::from(tmp as u64))
       }
-      }
+      _ => RoleId::from(0u64),
-      _ => None,
     };
 
+    let bot_channel_tmp: i64 = row.try_get("bot_channel_id")?;
+    let bot_channel_id = ChannelId::from(bot_channel_tmp as u64);
+
     Ok(Self {
       server,
       wolves_api: row.try_get("wolves_api")?,
@@ -266,6 +269,9 @@ impl<'r> FromRow<'r, SqliteRow> for Servers {
       role_current,
       member_past: row.try_get("member_past")?,
       member_current: row.try_get("member_current")?,
+      bot_channel_id,
+      server_name: row.try_get("server_name")?,
+      wolves_link: row.try_get("wolves_link")?,
     })
   }
 }
@@ -300,7 +306,7 @@ pub async fn db_init(config: &Config) -> Result<Pool<Sqlite>, Error> {
     .await?;
 
   // migrations are amazing!
-  sqlx::migrate!("./db/migrations").run(&pool).await.unwrap();
+  sqlx::migrate!("./db/migrations").run(&pool).await?;
 
   Ok(pool)
 }
@@ -403,11 +409,9 @@ pub mod set_roles {
             }
           }
 
-          if let Some(role) = &role_current {
+          if !member.roles.contains(role_current) {
-            if !member.roles.contains(role) {
             roles_set[1] += 1;
-              roles.push(role.to_owned());
+            roles.push(role_current.to_owned());
-            }
           }
 
           if let Err(e) = member.add_roles(ctx, &roles).await {
@@ -422,16 +426,14 @@ pub mod set_roles {
             }
           }
 
-          if let Some(role) = &role_current {
+          if member.roles.contains(role_current) {
-            if member.roles.contains(role) {
             roles_set[2] += 1;
             // if theya re not a current member and have the role then remove it
-              if let Err(e) = member.remove_role(ctx, role).await {
+            if let Err(e) = member.remove_role(ctx, role_current).await {
               println!("{:?}", e);
             }
           }
         }
-        }
         for role in remove_roles.iter().flatten() {
           if let Err(e) = member.remove_role(ctx, role).await {
             println!("{:?}", e);

src/main.rs

@@ -42,37 +42,34 @@ impl EventHandler for Handler {
         }
       }
 
-      if let Some(role) = &config.role_current {
+      if !new_member.roles.contains(&config.role_current) {
-        if !new_member.roles.contains(role) {
+        roles.push(config.role_current.to_owned());
-          roles.push(role.to_owned());
-        }
       }
 
       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) {
+    } else {
-      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),
-      };
-
       let msg = format!(
-        "Welcome {} to the {} server! \n\
+        r#"
-        Sign up on [UL Wolves]({}) and {} and use ``/link_wolves`` to get full access",
+        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(),
-        server_name,
+        &config.server_name,
-        ulwolves_link,
+        &config.wolves_link,
-        bot_channel_message
+        &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);