deduplicated RemoteError

src-tauri/src/models/dolls.rs

@@ -1,15 +1,6 @@
 use serde::{Deserialize, Serialize};
-use thiserror::Error;
 use ts_rs::TS;
 
-#[derive(Error, Debug)]
-pub enum RemoteError {
-    #[error("HTTP error: {0}")]
-    Http(#[from] reqwest::Error),
-    #[error("JSON parse error: {0}")]
-    Json(#[from] serde_json::Error),
-}
-
 #[derive(Default, Serialize, Deserialize, Clone, Debug, TS)]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]

src-tauri/src/models/friends.rs

@@ -1,19 +1,8 @@
 use serde::{Deserialize, Serialize};
-use thiserror::Error;
 use ts_rs::TS;
 
 use super::dolls::DollDto;
 
-#[derive(Error, Debug)]
-pub enum RemoteError {
-    #[error("HTTP error: {0}")]
-    Http(#[from] reqwest::Error),
-    #[error("JSON parse error: {0}")]
-    Json(#[from] serde_json::Error),
-    #[error("{0}")]
-    Api(String),
-}
-
 #[derive(Default, Serialize, Deserialize, Clone, Debug, TS)]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]

src-tauri/src/models/mod.rs

@@ -1,4 +1,5 @@
 pub mod app_data;
+pub mod remote_error;
 pub mod dolls;
 pub mod friends;
 pub mod health;

src-tauri/src/models/remote_error.rs

@@ -0,0 +1,11 @@
+use thiserror::Error;
+
+#[derive(Error, Debug)]
+pub enum RemoteError {
+    #[error("HTTP error: {0}")]
+    Http(#[from] reqwest::Error),
+    #[error("JSON parse error: {0}")]
+    Json(#[from] serde_json::Error),
+    #[error("{0}")]
+    Api(String),
+}

src-tauri/src/remotes/dolls.rs

@@ -1,6 +1,7 @@
 use reqwest::Client;
 
 use crate::{lock_r, services::auth::with_auth, state::FDOLL, models::dolls::*};
+use crate::models::remote_error::RemoteError;
 
 pub struct DollsRemote {
     pub base_url: String,

src-tauri/src/remotes/friends.rs

@@ -1,6 +1,7 @@
 use reqwest::Client;
 
 use crate::{lock_r, services::auth::with_auth, state::FDOLL, models::friends::*};
+use crate::models::remote_error::RemoteError;
 
 pub struct FriendRemote {
     pub base_url: String,