Merge pull request #37 from ChristianPayne/main

v1.4.3

package.json

@@ -1,7 +1,7 @@
 {
   "name": "ennesults-rs",
   "private": true,
-  "version": "1.4.2",
+  "version": "1.4.3",
   "type": "module",
   "scripts": {
     "dev": "vite",

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ennesults-rs"
-version = "1.4.2"
+version = "1.4.3"
 description = "A Twitch bot created for Ennegineer to kindly insult her chat."
 authors = ["Christian Payne"]
 license = ""

src-tauri/src/bot/bot_data.rs

@@ -24,6 +24,12 @@ impl BotData {
             announcements: Mutex::new(announcements),
         }
     }
+
+    pub fn get_users(&self) -> Users {
+        let users_guard = self.users.lock().expect("Failed to get lock for users.");
+
+        users_guard.clone()
+    }
 }
 
 impl Default for BotData {

src-tauri/src/bot/insults.rs

@@ -189,14 +189,7 @@ pub fn format_insult(
 
     let mut users: Users = {
         match user_pool {
-            None => {
-                let users_state = state
-                    .bot_data
-                    .users
-                    .lock()
-                    .expect("Failed to get lock for users.");
-                users_state.clone()
-            }
+            None => state.bot_data.get_users(),
             Some(users) => Users::from(users),
         }
     };

src-tauri/src/changelog.rs

@@ -7,7 +7,12 @@ pub struct ChangelogVersionNotes {
     notes: &'static str,
 }
 
-const CHANGELOG: [ChangelogVersionNotes; 10] = [
+const CHANGELOG: [ChangelogVersionNotes; 11] = [
+    ChangelogVersionNotes {
+        version: "v1.4.3",
+        title: None,
+        notes: r"- Fixed a deadlock issue for consent and unconsent getting users.",
+    },
     ChangelogVersionNotes {
         version: "v1.4.2",
         title: None,

src-tauri/src/commands/consent.rs

@@ -22,12 +22,8 @@ impl Command for ConsentCommand {
         msg: &PrivmsgMessage,
         app_handle: AppHandle,
     ) -> Option<String> {
-        let bot_data = app_handle.state::<Bot>();
-        let mut users = bot_data
-            .bot_data
-            .users
-            .lock()
-            .expect("Failed to get lock for bot data.");
+        let state = app_handle.state::<Bot>();
+        let mut users = state.bot_data.get_users();
 
         let consent_target = match args.len() {
             0 => Some(msg.sender.name.clone()),

src-tauri/src/commands/unconsent.rs

@@ -23,11 +23,7 @@ impl Command for UnconsentCommand {
         app_handle: AppHandle,
     ) -> Option<String> {
         let state = app_handle.state::<Bot>();
-        let mut users = state
-            .bot_data
-            .users
-            .lock()
-            .expect("Failed to get lock for bot data.");
+        let mut users = state.bot_data.get_users();
 
         let consent_target = match args.len() {
             0 => Some(msg.sender.name.clone()),