clean up

Author: technetos

src/api.rs

@@ -1,6 +1,4 @@
-use crate::commands::{Args, Result};
-use crate::db::DB;
-use crate::schema::{bans, roles};
+use crate::{commands::{Args, Result}, db::DB, schema::roles, ban};
 use diesel::prelude::*;
 use serenity::{model::prelude::*, utils::parse_username};
 
@@ -117,21 +115,8 @@ pub(crate) fn ban(args: Args) -> Result<()> {
 
         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 conn = DB.get()?;
-            use std::time::{Duration, SystemTime};
-            diesel::insert_into(bans::table)
-                .values((
-                    bans::user_id.eq(format!("{}", user_id)),
-                    bans::guild_id.eq(format!("{}", guild.read().id)),
-                    bans::start_time.eq(SystemTime::now()),
-                    bans::end_time.eq(SystemTime::now()
-                        .checked_add(Duration::new(hours * 60 * 60, 0))
-                        .ok_or("out of range Duration for ban end_time")?),
-                ))
-                .execute(&conn)?;
+            ban::save_ban(format!("{}", user_id), format!("{}", guild.read().id), hours)?;
         }
     }
     Ok(())

src/ban.rs

@@ -7,9 +7,10 @@ use std::{
     time::{Duration, SystemTime},
 };
 
+const HOUR: u64 = 3600;
 static UNBAN_THREAD_INITIALIZED: AtomicBool = AtomicBool::new(false);
 
-pub(crate) fn save_ban(user_id: String, guild_id: String) -> Result<()> {
+pub(crate) fn save_ban(user_id: String, guild_id: String, hours: u64) -> Result<()> {
     info!("Recording ban for user {}", &user_id);
     let conn = DB.get()?;
     diesel::insert_into(bans::table)
@@ -18,7 +19,7 @@ pub(crate) fn save_ban(user_id: String, guild_id: String) -> Result<()> {
             bans::guild_id.eq(guild_id),
             bans::start_time.eq(SystemTime::now()),
             bans::end_time.eq(SystemTime::now()
-                .checked_add(Duration::new(1 * 60, 0))
+                .checked_add(Duration::new(hours * HOUR, 0))
                 .ok_or("out of range Duration for ban end_time")?),
         ))
         .execute(&conn)?;
@@ -37,6 +38,7 @@ pub(crate) fn save_unban(user_id: String, guild_id: String) -> Result<()> {
         )
         .set(bans::unbanned.eq(true))
         .execute(&conn)?;
+
     Ok(())
 }
 
@@ -48,13 +50,13 @@ pub(crate) fn start_unban_thread(cx: Context) {
         UNBAN_THREAD_INITIALIZED.store(true, Ordering::SeqCst);
         std::thread::spawn(move || -> std::result::Result<(), SendSyncError> {
             loop {
-                sleep(Duration::new(20, 0));
+                sleep(Duration::new(HOUR, 0));
                 let conn = DB.get()?;
                 let to_unban = bans::table
                     .filter(
                         bans::unbanned
-                        .eq(false)
-                        .and(bans::end_time.le(SystemTime::now())),
+                            .eq(false)
+                            .and(bans::end_time.le(SystemTime::now())),
                     )
                     .load::<(i32, String, String, bool, SystemTime, SystemTime)>(&conn)?;
 

src/main.rs

@@ -154,13 +154,10 @@ impl RawEventHandler for Events {
                     println!("{}", e);
                 }
             }
-            Event::GuildBanAdd(ref ev) => {
-                if let Err(e) = ban::save_ban(format!("{}", ev.user.id), format!("{}", ev.guild_id)) {
-                    error!("{}", e);
-                }
-            }
             Event::GuildBanRemove(ref ev) => {
-                if let Err(e) = ban::save_unban(format!("{}", ev.user.id), format!("{}", ev.guild_id)) {
+                if let Err(e) =
+                    ban::save_unban(format!("{}", ev.user.id), format!("{}", ev.guild_id))
+                {
                     error!("{}", e);
                 }
             }