Merge commit '7fa442fb28a2b9156690ff147206275163e7aec8' into beta

2025-10-19 06:50:50 +03:00
parent 3a92adfb82 7fa442fb28
commit cc963cfc40
1007 changed files with 143497 additions and 11362 deletions
--- a/apps/app/src/api/mod.rs
+++ b/apps/app/src/api/mod.rs
@@ -46,8 +46,12 @@ pub enum TheseusSerializableError {
    Tauri(#[from] tauri::Error),

    #[cfg(feature = "updater")]
-    #[error("Tauri updater error: {0}")]
-    TauriUpdater(#[from] tauri_plugin_updater::Error),
+    #[error("Updater error: {0}")]
+    Updater(#[from] tauri_plugin_updater::Error),
+
+    #[cfg(feature = "updater")]
+    #[error("HTTP error: {0}")]
+    Http(#[from] tauri_plugin_http::reqwest::Error),
 }

 // Generic implementation of From<T> for ErrorTypeA
@@ -105,5 +109,6 @@ impl_serialize! {
 impl_serialize! {
    IO,
    Tauri,
-    TauriUpdater,
+    Updater,
+    Http,
 }