From d1ef0a010f8b4b59ec12f56dc95ff08cdbb1e6cc Mon Sep 17 00:00:00 2001
From: Wind-Explorer <windexplorer@outlook.com>
Date: Sun, 25 Jan 2026 21:54:36 +0800
Subject: [PATCH] deduplicated `RemoteError`

---
 src-tauri/src/models/dolls.rs        |  9 ---------
 src-tauri/src/models/friends.rs      | 11 -----------
 src-tauri/src/models/mod.rs          |  1 +
 src-tauri/src/models/remote_error.rs | 11 +++++++++++
 src-tauri/src/remotes/dolls.rs       |  1 +
 src-tauri/src/remotes/friends.rs     |  1 +
 6 files changed, 14 insertions(+), 20 deletions(-)
 create mode 100644 src-tauri/src/models/remote_error.rs

diff --git a/src-tauri/src/models/dolls.rs b/src-tauri/src/models/dolls.rs
index 348e59c..4d5c935 100644
--- a/src-tauri/src/models/dolls.rs
+++ b/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)]
diff --git a/src-tauri/src/models/friends.rs b/src-tauri/src/models/friends.rs
index 3ded058..5bf911b 100644
--- a/src-tauri/src/models/friends.rs
+++ b/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)]
diff --git a/src-tauri/src/models/mod.rs b/src-tauri/src/models/mod.rs
index 99155a0..44dc13e 100644
--- a/src-tauri/src/models/mod.rs
+++ b/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;
diff --git a/src-tauri/src/models/remote_error.rs b/src-tauri/src/models/remote_error.rs
new file mode 100644
index 0000000..e398d4a
--- /dev/null
+++ b/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),
+}
diff --git a/src-tauri/src/remotes/dolls.rs b/src-tauri/src/remotes/dolls.rs
index 61ecbe4..e03ab5a 100644
--- a/src-tauri/src/remotes/dolls.rs
+++ b/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,
diff --git a/src-tauri/src/remotes/friends.rs b/src-tauri/src/remotes/friends.rs
index 46b574b..335ef0d 100644
--- a/src-tauri/src/remotes/friends.rs
+++ b/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,