Merge pull request #53

Update user table handling
TheRustyPickle · Feb 10, 2024 · 06f361c · 06f361c
2 parents 7b2ade4 + c99fe27
commit 06f361c
Show file tree

Hide file tree

Showing 5 changed files with 253 additions and 177 deletions.
diff --git a/src/tg_handler/counter.rs b/src/tg_handler/counter.rs
@@ -87,7 +87,7 @@ impl TGClient {
         let mut start_at = if let Some(num) = start_num { num } else { -1 };
 
         info!(
-            "Staring message num {}, ending message num {}",
+            "Starting message num {}, ending message num {}",
             start_at, end_at
         );
 

diff --git a/src/ui_components/processor/states.rs b/src/ui_components/processor/states.rs
@@ -167,6 +167,39 @@ impl ColumnName {
             ColumnName::Whitelisted => ColumnName::Name,
         }
     }
+
+    pub fn get_previous(&self) -> Self {
+        match self {
+            ColumnName::Name => ColumnName::Whitelisted,
+            ColumnName::Username => ColumnName::Name,
+            ColumnName::UserID => ColumnName::Username,
+            ColumnName::TotalMessage => ColumnName::UserID,
+            ColumnName::TotalWord => ColumnName::TotalMessage,
+            ColumnName::TotalChar => ColumnName::TotalWord,
+            ColumnName::AverageWord => ColumnName::TotalChar,
+            ColumnName::AverageChar => ColumnName::AverageWord,
+            ColumnName::FirstMessageSeen => ColumnName::AverageChar,
+            ColumnName::LastMessageSeen => ColumnName::FirstMessageSeen,
+            ColumnName::Whitelisted => ColumnName::LastMessageSeen,
+        }
+    }
+
+    pub fn from_num(num: i32) -> Self {
+        match num {
+            0 => ColumnName::Name,
+            1 => ColumnName::Username,
+            2 => ColumnName::UserID,
+            3 => ColumnName::TotalMessage,
+            4 => ColumnName::TotalWord,
+            5 => ColumnName::TotalChar,
+            6 => ColumnName::AverageWord,
+            7 => ColumnName::AverageChar,
+            8 => ColumnName::FirstMessageSeen,
+            9 => ColumnName::LastMessageSeen,
+            10 => ColumnName::Whitelisted,
+            _ => unreachable!("Invalid enum variant for number {}", num),
+        }
+    }
 }
 
 #[derive(Default, PartialEq)]

diff --git a/src/ui_components/processor/tg_comms.rs b/src/ui_components/processor/tg_comms.rs
@@ -81,7 +81,7 @@ impl MainWindow {
                             .add_user(sender, local_time_date, count_data.name());
 
                     if user_id != 0 && self.whitelist_data.is_user_whitelisted(&user_id) {
-                        self.user_table.set_as_whitelisted(&user_id);
+                        self.user_table.set_as_whitelisted(user_id);
                     }
 
                     let chart_user = {
@@ -249,7 +249,7 @@ impl MainWindow {
                         chat.seen_by,
                     );
                     self.whitelist_data.clear_text_box();
-                    self.user_table.set_as_whitelisted(&user_id);
+                    self.user_table.set_as_whitelisted(user_id);
                     self.process_state = ProcessState::AddedToWhitelist;
                 }
                 ProcessResult::ChatExists(chat_name, start_at, end_at) => {