From 61b864086416edbe68a8dce8259399acd7e061ed Mon Sep 17 00:00:00 2001
From: David <daidavid0609@gmail.com>
Date: Sun, 8 Jan 2023 20:40:16 +0100
Subject: [PATCH] Minor bugfixes

---
 src/bot.rs   | 9 +++------
 src/main.rs  | 2 +-
 src/utils.rs | 5 +++--
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/bot.rs b/src/bot.rs
index e27142d..d0794f0 100644
--- a/src/bot.rs
+++ b/src/bot.rs
@@ -115,13 +115,15 @@ pub mod bot {
                 }
             }
 
+            let spam_info = SpamInfo::new();
+
             let bot = Bot {
                 client,
                 info: creds,
                 joined_room,
                 swear_list: swear_list.clone(),
                 database_handle: db,
-                spam_info: SpamInfo::new(),
+                spam_info,
                 members_list: members_list.clone(),
             };
 
@@ -266,8 +268,6 @@ pub mod bot {
 
         async fn detect_spam(&mut self, event: &OriginalSyncRoomMessageEvent) {
 
-            println!("{:?}", self.spam_info.author_msg_times);
-
             let author = self
                 .joined_room
                 .get_member(&event.sender)
@@ -284,8 +284,6 @@ pub mod bot {
                     msg_times.push(curr_utc)
             }
 
-            println!("{:?}", self.spam_info.author_msg_times);
-
             let expire_time: i64 = curr_utc - self.spam_info.detection_window;
 
             let mut expired_msgs: Vec<i64> = vec![];
@@ -304,7 +302,6 @@ pub mod bot {
                     .unwrap()
                     .retain(|value| *value != msg);
             }
-            println!("{:?}", self.spam_info.author_msg_times);
 
             if i64::try_from(
                 self.spam_info
diff --git a/src/main.rs b/src/main.rs
index 7bd842f..0241599 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -19,5 +19,5 @@ async fn main() {
     }
     let config_path = &args[1];
     let creds = BotUserInfo::get_info(config_path).unwrap();
-    Bot::bot_login(creds).await;
+    let _ = Bot::bot_login(creds).await;
 }
diff --git a/src/utils.rs b/src/utils.rs
index 0b8d04e..2aa7652 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -64,7 +64,8 @@ pub mod utils {
     }
 
     pub fn detect_swear_from_message(swear_list: &Vec<String>, message: &str) -> bool {
-        let message_words = message.split_whitespace();
+        let lowercase_message = message.to_lowercase();
+        let message_words = lowercase_message.split_whitespace();
         for words in message_words {
             for swear in swear_list {
                 if words.contains(swear) {
@@ -96,7 +97,7 @@ pub mod utils {
         let msg_length: f32 = characters.len() as f32;
         let mut counter: f32 = 0.0;
         for char in characters {
-            if !char.is_lowercase() {
+            if !char.is_lowercase() && char.is_alphabetic() {
                 counter += 1.0
             }
         }