Redo the ban infra and revert the extra change I added earlier

Author: technetos

src/ban.rs

@@ -0,0 +1,69 @@
+use crate::{commands::Result, db::DB, schema::bans};
+use diesel::prelude::*;
+use serenity::{model::prelude::*, prelude::*};
+use std::{
+    sync::atomic::{AtomicBool, Ordering},
+    thread::sleep,
+    time::{Duration, SystemTime},
+};
+
+static UNBAN_THREAD_INITIALIZED: AtomicBool = AtomicBool::new(false);
+
+pub(crate) fn save_ban(user_id: String, guild_id: String) -> Result<()> {
+    info!("Recording ban for user {}", &user_id);
+    let conn = DB.get()?;
+    diesel::insert_into(bans::table)
+        .values((
+            bans::user_id.eq(user_id),
+            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))
+                .ok_or("out of range Duration for ban end_time")?),
+        ))
+        .execute(&conn)?;
+
+    Ok(())
+}
+
+pub(crate) fn save_unban(user_id: String, guild_id: String) -> Result<()> {
+    info!("Recording unban for user {}", &user_id);
+    let conn = DB.get()?;
+    diesel::update(bans::table)
+        .filter(
+            bans::user_id
+                .eq(user_id)
+                .and(bans::guild_id.eq(guild_id).and(bans::unbanned.eq(false))),
+        )
+        .set(bans::unbanned.eq(true))
+        .execute(&conn)?;
+    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);
+        std::thread::spawn(move || -> std::result::Result<(), SendSyncError> {
+            loop {
+                sleep(Duration::new(20, 0));
+                let conn = DB.get()?;
+                let to_unban = bans::table
+                    .filter(
+                        bans::unbanned
+                        .eq(false)
+                        .and(bans::end_time.le(SystemTime::now())),
+                    )
+                    .load::<(i32, String, String, bool, SystemTime, SystemTime)>(&conn)?;
+
+                for row in &to_unban {
+                    let guild_id = GuildId::from(u64::from_str(&row.2)?);
+                    info!("Unbanning user {}", &row.1);
+                    guild_id.unban(&cx, u64::from_str(&row.1)?)?;
+                }
+            }
+        });
+    }
+}

src/commands.rs

@@ -100,7 +100,6 @@ impl Commands {
 fn add_space(state_machine: &mut StateMachine, mut state: usize, i: usize) -> usize {
     if i > 0 {
         state = state_machine.add(state, CharacterSet::from_char(' '));
-        state_machine.add_next_state(state, state);
     }
     state
 }

src/main.rs

@@ -8,6 +8,7 @@ extern crate diesel_migrations;
 extern crate log;
 
 mod api;
+mod ban;
 mod commands;
 mod crates;
 mod db;
@@ -110,9 +111,6 @@ fn app() -> Result {
     // Kick
     cmds.add("?kick {user}", api::kick);
 
-    // Ban
-    cmds.add("?ban {user} {hours}", api::ban);
-
     // Post the welcome message to the welcome channel.
     cmds.add("?CoC {channel}", welcome::post_message);
 
@@ -153,6 +151,16 @@ 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)) {
+                    error!("{}", e);
+                }
+            }
             _ => (),
         }
     }
@@ -169,49 +177,6 @@ impl EventHandler for Messages {
 
     fn ready(&self, context: Context, ready: Ready) {
         info!("{} connected to discord", ready.user.name);
-        std::thread::spawn(
-            move || -> std::result::Result<(), Box<dyn std::error::Error + Send + Sync>> {
-                use std::{
-                    thread::sleep,
-                    time::{Duration, SystemTime},
-                };
-                let cx = context;
-
-                use crate::schema::bans;
-                use std::str::FromStr;
-
-                let conn = DB.get()?;
-                loop {
-                    sleep(Duration::new(3600, 0));
-                    let _ = conn.build_transaction().read_write().run::<_, Box<
-                        dyn std::error::Error + Send + Sync,
-                    >, _>(
-                        || {
-                            let to_unban = bans::table
-                                .filter(
-                                    bans::unbanned
-                                        .eq(false)
-                                        .and(bans::end_time.le(SystemTime::now())),
-                                )
-                                .load::<(i32, String, String, bool, SystemTime, SystemTime)>(
-                                    &conn,
-                                )?;
-
-                            for row in &to_unban {
-                                let guild_id = GuildId::from(u64::from_str(&row.2)?);
-                                guild_id.unban(&cx, u64::from_str(&row.1)?)?;
-                                diesel::update(bans::table)
-                                    .filter(bans::id.eq(&row.0))
-                                    .set(bans::unbanned.eq(true))
-                                    .execute(&conn)?;
-                            }
-
-                            dbg!(to_unban);
-                            Ok(())
-                        },
-                    )?;
-                }
-            },
-        );
+        ban::start_unban_thread(context);
     }
 }