Reorganize alittle. Add ban help command, only bans applied using the

?ban command are temporary.  This means that right clicking on a user
and banning them will still perma-ban them.

Author: technetos

src/api.rs

@@ -1,4 +1,8 @@
-use crate::{commands::{Args, Result}, db::DB, schema::roles, ban};
+use crate::{
+    commands::{Args, Result},
+    db::DB,
+    schema::roles,
+};
 use diesel::prelude::*;
 use serenity::{model::prelude::*, utils::parse_username};
 
@@ -91,33 +95,3 @@ pub(crate) fn kick(args: Args) -> Result<()> {
     }
     Ok(())
 }
-
-/// Ban an user from the guild.  
-///
-/// Requires the ban members permission
-pub(crate) fn ban(args: Args) -> Result<()> {
-    if is_mod(&args)? {
-        let user_id = parse_username(
-            &args
-                .params
-                .get("user")
-                .ok_or("unable to retrieve user param")?,
-        )
-        .ok_or("unable to retrieve user id")?;
-
-        use std::str::FromStr;
-
-        let hours = u64::from_str(
-            args.params
-                .get("hours")
-                .ok_or("unable to retrieve hours 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")?;
-            ban::save_ban(format!("{}", user_id), format!("{}", guild.read().id), hours)?;
-        }
-    }
-    Ok(())
-}

src/ban.rs

@@ -1,6 +1,6 @@
-use crate::{commands::Result, db::DB, schema::bans};
+use crate::{api, commands::{Result, Args}, db::DB, schema::bans};
 use diesel::prelude::*;
-use serenity::{model::prelude::*, prelude::*};
+use serenity::{prelude::*, model::prelude::*, utils::parse_username};
 use std::{
     sync::atomic::{AtomicBool, Ordering},
     thread::sleep,
@@ -69,3 +69,46 @@ pub(crate) fn start_unban_thread(cx: Context) {
         });
     }
 }
+
+/// Temporarily ban an user from the guild.  
+///
+/// Requires the ban members permission
+pub(crate) fn temp_ban(args: Args) -> Result<()> {
+    if api::is_mod(&args)? {
+        let user_id = parse_username(
+            &args
+                .params
+                .get("user")
+                .ok_or("unable to retrieve user param")?,
+        )
+        .ok_or("unable to retrieve user id")?;
+
+        use std::str::FromStr;
+
+        let hours = u64::from_str(
+            args.params
+                .get("hours")
+                .ok_or("unable to retrieve hours 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")?;
+            save_ban(
+                format!("{}", user_id),
+                format!("{}", guild.read().id),
+                hours,
+            )?;
+        }
+    }
+    Ok(())
+}
+
+pub(crate) fn help(args: Args) -> Result<()> {
+    let help_string = "ban a user for a temporary amount of time
+```
+?ban {user} {hours}
+```";
+    api::send_reply(&args, &help_string)?;
+    Ok(())
+}

src/main.rs

@@ -112,7 +112,8 @@ fn app() -> Result {
     cmds.add("?kick {user}", api::kick);
 
     // Ban
-    cmds.add("?ban {user} {hours}", api::ban);
+    cmds.add("?ban help", ban::help);
+    cmds.add("?ban {user} {hours}", ban::temp_ban);
 
     // Post the welcome message to the welcome channel.
     cmds.add("?CoC {channel}", welcome::post_message);