Send message to user when they have been banned

Author: technetos

Cargo.toml

@@ -8,7 +8,7 @@ license = "MIT"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-serenity = { version = "0.8.0", features = ["cache", "model"] }
+serenity = { version = "0.8.0", features = ["model"] }
 diesel = { version = "1.4.0", features = ["postgres", "r2d2"] }
 diesel_migrations = { version = "1.4.0", features = ["postgres"] }
 reqwest = { version = "0.10", features = ["blocking", "json"] }

src/ban.rs

@@ -3,6 +3,7 @@ use crate::{
     commands::{Args, Result},
     db::DB,
     schema::bans,
+    text::ban_message,
 };
 use diesel::prelude::*;
 use serenity::{model::prelude::*, prelude::*, utils::parse_username};
@@ -47,15 +48,13 @@ pub(crate) fn save_unban(user_id: String, guild_id: String) -> Result<()> {
     Ok(())
 }
 
-type SendSyncError = Box<dyn std::error::Error + Send + Sync>;
-
 pub(crate) fn start_unban_thread(cx: Context) {
     use std::str::FromStr;
     if !UNBAN_THREAD_INITIALIZED.load(Ordering::SeqCst) {
         UNBAN_THREAD_INITIALIZED.store(true, Ordering::SeqCst);
+        type SendSyncError = Box<dyn std::error::Error + Send + Sync>;
         std::thread::spawn(move || -> std::result::Result<(), SendSyncError> {
             loop {
-                sleep(Duration::new(HOUR, 0));
                 let conn = DB.get()?;
                 let to_unban = bans::table
                     .filter(
@@ -70,6 +69,7 @@ pub(crate) fn start_unban_thread(cx: Context) {
                     info!("Unbanning user {}", &row.1);
                     guild_id.unban(&cx, u64::from_str(&row.1)?)?;
                 }
+                sleep(Duration::new(HOUR, 0));
             }
         });
     }
@@ -96,9 +96,20 @@ pub(crate) fn temp_ban(args: Args) -> Result<()> {
                 .ok_or("unable to retrieve hours param")?,
         )?;
 
+        let reason = args
+            .params
+            .get("reason")
+            .ok_or("unable to retrieve reason param")?;
+
         if let Some(guild) = args.msg.guild(&args.cx) {
             info!("Banning user from guild");
-            guild.read().ban(args.cx, UserId::from(user_id), &"all")?;
+            let user = UserId::from(user_id);
+
+            user.create_dm_channel(args.cx)?
+                .say(args.cx, ban_message(reason, hours))?;
+
+            guild.read().ban(args.cx, &user, &"all")?;
+
             save_ban(
                 format!("{}", user_id),
                 format!("{}", guild.read().id),
@@ -110,10 +121,30 @@ pub(crate) fn temp_ban(args: Args) -> Result<()> {
 }
 
 pub(crate) fn help(args: Args) -> Result<()> {
-    let help_string = "ban a user for a temporary amount of time
+    let hours = 24;
+    let reason = "violating the code of conduct";
+
+    let help_string = format!(
+        "
+Ban a user for a temporary amount of time
+```
+{command}
+```
+Example:
+```
+?ban @someuser {hours} {reason}
 ```
-?ban {user} {hours}
-```";
+will ban a user for {hours} hours and send them the following message:
+```
+{user_message}
+```
+",
+        command = "?ban {user} {hours} reason...",
+        user_message = ban_message(reason, hours),
+        hours = hours,
+        reason = reason,
+    );
+
     api::send_reply(&args, &help_string)?;
     Ok(())
 }

src/main.rs

@@ -15,6 +15,7 @@ mod db;
 mod schema;
 mod state_machine;
 mod tags;
+mod text;
 mod welcome;
 
 use crate::db::DB;
@@ -113,7 +114,7 @@ fn app() -> Result {
 
     // Ban
     cmds.add("?ban help", ban::help);
-    cmds.add("?ban {user} {hours}", ban::temp_ban);
+    cmds.add("?ban {user} {hours} reason...", ban::temp_ban);
 
     // Post the welcome message to the welcome channel.
     cmds.add("?CoC {channel}", welcome::post_message);

src/text.rs

@@ -0,0 +1,7 @@
+pub(crate) const WELCOME_BILLBOARD: &'static str = "By participating in this community, you agree to follow the Rust Code of Conduct, as linked below. Please click the :white_check_mark: below to acknowledge and gain access to the channels.
+
+  https://www.rust-lang.org/policies/code-of-conduct  ";
+
+pub(crate) fn ban_message(reason: &str, hours: u64) -> String {
+    format!("You have been banned from The Rust Programming Language discord server for {}. The ban will expire in {} hours. If you feel this action was taken unfairly, you can reach the Rust moderation team at [email protected]", reason, hours)
+}

src/welcome.rs

@@ -3,6 +3,7 @@ use crate::{
     commands::Args,
     db::DB,
     schema::{messages, roles, users},
+    text::WELCOME_BILLBOARD,
     Result,
 };
 use diesel::prelude::*;
@@ -12,10 +13,6 @@ use serenity::{model::prelude::*, prelude::*};
 pub(crate) fn post_message(args: Args) -> Result {
     use std::str::FromStr;
 
-    const WELCOME_BILLBOARD: &'static str = "By participating in this community, you agree to follow the Rust Code of Conduct, as linked below. Please click the :white_check_mark: below to acknowledge and gain access to the channels.
-
-  https://www.rust-lang.org/policies/code-of-conduct  ";
-
     if api::is_mod(&args)? {
         let channel_name = &args
             .params