add edit time limit to messages

Author: tinaun

src/ban.rs

@@ -1,3 +1,4 @@
+use super::CommandHistory;
 use crate::{
     api,
     commands::{Args, Result},
@@ -48,7 +49,7 @@ pub(crate) fn save_unban(user_id: String, guild_id: String) -> Result<()> {
     Ok(())
 }
 
-pub(crate) fn start_unban_thread(cx: Context) {
+pub(crate) fn start_cleanup_thread(cx: Context) {
     use std::str::FromStr;
     if !UNBAN_THREAD_INITIALIZED.load(Ordering::SeqCst) {
         UNBAN_THREAD_INITIALIZED.store(true, Ordering::SeqCst);
@@ -69,6 +70,20 @@ pub(crate) fn start_unban_thread(cx: Context) {
                     info!("Unbanning user {}", &row.1);
                     guild_id.unban(&cx, u64::from_str(&row.1)?)?;
                 }
+
+                let mut data = cx.data.write();
+                let history = data.get_mut::<CommandHistory>().unwrap();
+
+                // always keep the last command in history
+                if history.len() > 0 {
+                    info!("Clearing command history");
+                    let (key, value) = history.pop().unwrap();
+                    history.drain(..);
+                    history.insert(key, value);
+                }
+
+                drop(data);
+
                 sleep(Duration::new(HOUR, 0));
             }
         });

src/main.rs

@@ -26,8 +26,9 @@ use envy;
 use indexmap::IndexMap;
 use serde::Deserialize;
 use serenity::{model::prelude::*, prelude::*, utils::CustomMessage};
-use std::collections::HashMap;
+use std::time::Duration;
 
+const MESSAGE_AGE_MAX: Duration = Duration::from_secs(3600);
 #[derive(Deserialize)]
 struct Config {
     tags: bool,
@@ -224,7 +225,7 @@ fn main() {
 
 struct CommandHistory {}
 impl TypeMapKey for CommandHistory {
-    type Value = HashMap<MessageId, MessageId>;
+    type Value = IndexMap<MessageId, MessageId>;
 }
 
 struct Events {
@@ -242,24 +243,30 @@ impl RawEventHandler for Events {
                 drop(cache);
 
                 let mut data = cx.data.write();
-                data.insert::<CommandHistory>(HashMap::new());
+                data.insert::<CommandHistory>(IndexMap::new());
                 drop(data);
 
-                ban::start_unban_thread(cx);
+                ban::start_cleanup_thread(cx);
             }
             Event::MessageCreate(ev) => {
                 self.cmds.execute(cx, &ev.message);
             }
             Event::MessageUpdate(ev) => {
-                let mut msg = CustomMessage::new();
-
-                msg.id(ev.id)
-                    .channel_id(ev.channel_id)
-                    .content(ev.content.unwrap_or_else(|| String::new()));
-
-                let msg = msg.build();
-                info!("sending edited message - {:?}", msg.content);
-                self.cmds.execute(cx, &msg);
+                let age = ev.timestamp.and_then(|create| {
+                    ev.edited_timestamp
+                        .and_then(|edit| edit.signed_duration_since(create).to_std().ok())
+                });
+
+                if age.is_some() && age.unwrap() < MESSAGE_AGE_MAX {
+                    let mut msg = CustomMessage::new();
+                    msg.id(ev.id)
+                        .channel_id(ev.channel_id)
+                        .content(ev.content.unwrap_or_else(|| String::new()));
+
+                    let msg = msg.build();
+                    info!("sending edited message - {:?}", msg.content);
+                    self.cmds.execute(cx, &msg);
+                }
             }
             Event::MessageDelete(ev) => {
                 let mut data = cx.data.write();