fix

marci1175 · Aug 3, 2024 · 0f95d59 · 0f95d59
1 parent 0e538d8
commit 0f95d59
Show file tree

Hide file tree

Showing 17 changed files with 58 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,7 @@
 /target
 /dist
 /vendor
-build_info.szechat_build
+/Installer/MatthiasSetup/Debug
+/Installer/MatthiasSetup/Release
+/Installer/.vs/
+build_info.szechat_build
diff --git a/Installer/.vs/Matthias/v17/.suo b/Installer/.vs/Matthias/v17/.suo
diff --git a/...tthiasSetup/.vs/MatthiasSetup/FileContentIndex/f4481aaa-2b5d-4751-a215-dc96557fe343.vsidx b/...tthiasSetup/.vs/MatthiasSetup/FileContentIndex/f4481aaa-2b5d-4751-a215-dc96557fe343.vsidx
diff --git a/Installer/MatthiasSetup/.vs/MatthiasSetup/v17/.wsuo b/Installer/MatthiasSetup/.vs/MatthiasSetup/v17/.wsuo
diff --git a/Installer/MatthiasSetup/.vs/MatthiasSetup/v17/DocumentLayout.json b/Installer/MatthiasSetup/.vs/MatthiasSetup/v17/DocumentLayout.json
@@ -0,0 +1,12 @@
+{
+  "Version": 1,
+  "WorkspaceRootPath": "C:\\Users\\marci\\Desktop\\szeChat\\Installer\\MatthiasSetup\\",
+  "Documents": [],
+  "DocumentGroupContainers": [
+    {
+      "Orientation": 0,
+      "VerticalTabListWidth": 256,
+      "DocumentGroups": []
+    }
+  ]
+}
diff --git a/Installer/MatthiasSetup/.vs/ProjectSettings.json b/Installer/MatthiasSetup/.vs/ProjectSettings.json
@@ -0,0 +1,3 @@
+{
+  "CurrentProjectSetting": null
+}
diff --git a/Installer/MatthiasSetup/.vs/VSWorkspaceState.json b/Installer/MatthiasSetup/.vs/VSWorkspaceState.json
@@ -0,0 +1,7 @@
+{
+  "ExpandedNodes": [
+    "\\Debug",
+    "\\Release"
+  ],
+  "PreviewInSolutionExplorer": false
+}
diff --git a/Installer/MatthiasSetup/.vs/slnx.sqlite b/Installer/MatthiasSetup/.vs/slnx.sqlite
diff --git a/Installer/MatthiasSetup/MatthiasSetup.vdproj b/Installer/MatthiasSetup/MatthiasSetup.vdproj
@@ -141,6 +141,22 @@
                 }
             }
         }
+        "tst"
+        {
+        "DisplayName" = "8:tst"
+        "IsDebugOnly" = "11:FALSE"
+        "IsReleaseOnly" = "11:FALSE"
+        "OutputFilename" = "8:tst\\MatthiasSetup.msi"
+        "PackageFilesAs" = "3:2"
+        "PackageFileSize" = "3:-2147483648"
+        "CabType" = "3:1"
+        "Compression" = "3:2"
+        "SignOutput" = "11:FALSE"
+        "CertificateFile" = "8:"
+        "PrivateKeyFile" = "8:"
+        "TimeStampServer" = "8:"
+        "InstallerBootstrapper" = "3:2"
+        }
     }
     "Deployable"
     {

diff --git a/Installer/MatthiasSetup/Release/MatthiasSetup.msi b/Installer/MatthiasSetup/Release/MatthiasSetup.msi
diff --git a/Installer/MatthiasSetup/Release/setup.exe b/Installer/MatthiasSetup/Release/setup.exe
diff --git a/build_info.matthias_build b/build_info.matthias_build
@@ -1 +1 @@
-2024.08.03. 21:36
+2024.08.03. 21:50
diff --git a/src/app.rs b/src/app.rs
@@ -92,7 +92,7 @@ impl eframe::App for backend::Application {
             TODO: Restructure files
 
             TODO: make custom urls open up the chat app and automaticly connect
-            TODO: Reowrk logging (We already have tracing for that, replace dbg!s)
+            TODO: Reowrk logging (We already have tracing for that, replace dbg!)
         */
 
         //Check for startup args
@@ -118,6 +118,9 @@ impl eframe::App for backend::Application {
                 //Show settings window to alert user
                 self.settings_window = true;
             }
+
+            //Reset startup args
+            self.startup_args = None;
         }
 
         //Display notifications

diff --git a/src/app/lua.rs b/src/app/lua.rs
@@ -6,7 +6,7 @@ use std::{
 
 use egui::{Rect, Vec2};
 use mlua::{Lua, Value::Nil};
-use strum::{Display, ToString};
+use strum::Display;
 
 /// This function executes code provided, and if its a function adds it to the global register
 pub fn execute_code(lua: &Lua, code: String) -> anyhow::Result<()> {
@@ -158,13 +158,13 @@ pub enum EventCall {
 
 impl Extension {
     pub fn event_call_extensions(&mut self, event: EventCall, lua: &Lua, arg: Option<String>) {
-        for mut ext in self.extension_list.iter_mut() {
+        for ext in self.extension_list.iter_mut() {
             //If the extension should be running we skip that entry
             if !ext.is_running {
                 continue;
             }
 
-            match Self::load_and_call_function(lua, ext, &arg, String::from(event.to_string())) {
+            match Self::load_and_call_function(lua, ext, &arg, event.to_string()) {
                 Ok(_) => (),
                 Err(err) => {
                     //If the lua returned this error it means the callback couldnt be called
@@ -174,7 +174,7 @@ impl Extension {
                         return;
                     }
 
-                    Self::add_msg_to_log(self.output.clone(), &mut ext, err.to_string());
+                    Self::add_msg_to_log(self.output.clone(), ext, err.to_string());
                 }
             };
         }

diff --git a/src/app/server.rs b/src/app/server.rs
@@ -30,8 +30,7 @@ use crate::app::backend::{
     ClientMessageType::{
         FileRequestType, FileUpload, MessageEdit, NormalMessage, Reaction as ClientReaction,
         SyncMessage, VoipConnection,
-    },
-    ClientReaction as ClientReactionStruct, ServerFileReply, ServerImageReply,
+    }, ServerFileReply, ServerImageReply,
 };
 use tokio::{
     io::AsyncWrite,

diff --git a/src/app/ui/client.rs b/src/app/ui/client.rs
@@ -836,7 +836,7 @@ impl Application {
                                                             .client_ui
                                                             .incoming_messages
                                                             .reaction_list
-                                                            [reaction.message_index as usize]
+                                                            [reaction.message_index]
                                                             .message_reactions
                                                             .iter()
                                                             .position(|item| {
@@ -848,16 +848,15 @@ impl Application {
                                                             self.client_ui
                                                                 .incoming_messages
                                                                 .reaction_list
-                                                                [reaction.message_index
-                                                                    as usize]
+                                                                [reaction.message_index]
                                                                 .message_reactions[index]
                                                                 .times += 1;
                                                         } else {
                                                             //If no, add a new reaction counter
                                                             self.client_ui
                                                                 .incoming_messages
                                                                 .reaction_list
-                                                                [reaction.message_index as usize]
+                                                                [reaction.message_index]
                                                                 .message_reactions
                                                                 .push(Reaction {
                                                                     emoji_name: reaction
@@ -876,7 +875,7 @@ impl Application {
                                                             .client_ui
                                                             .incoming_messages
                                                             .reaction_list
-                                                            [reaction.message_index as usize]
+                                                            [reaction.message_index]
                                                             .message_reactions
                                                             .iter()
                                                             .position(|item| {
@@ -889,7 +888,7 @@ impl Application {
                                                                 .client_ui
                                                                 .incoming_messages
                                                                 .reaction_list
-                                                                [reaction.message_index as usize]
+                                                                [reaction.message_index]
                                                                 .message_reactions[index]
                                                                 .times;
 
@@ -901,8 +900,7 @@ impl Application {
                                                                 self.client_ui
                                                                     .incoming_messages
                                                                     .reaction_list
-                                                                    [reaction.message_index
-                                                                        as usize]
+                                                                    [reaction.message_index]
                                                                     .message_reactions
                                                                     .remove(index);
                                                             }

diff --git a/src/app/ui/client_ui/client_actions/audio_recording.rs b/src/app/ui/client_ui/client_actions/audio_recording.rs
@@ -10,7 +10,6 @@ use std::sync::mpsc::{self, Receiver};
 use std::sync::{Arc, Mutex};
 use std::thread::JoinHandle;
 use std::time::Duration;
-use tokio_util::sync::CancellationToken;
 
 use crate::app::ui::client::VOIP_PACKET_BUFFER_LENGHT_MS;