refactor: app settings

src-tauri/src/commands/account.rs

@@ -5,7 +5,7 @@ use specta::Type;
 use std::{str::FromStr, time::Duration};
 use tauri::{Emitter, State};
 
-use crate::{common::get_all_accounts, Nostr};
+use crate::{common::get_all_accounts, Nostr, Settings};
 
 #[derive(Debug, Clone, Serialize, Deserialize, Type)]
 struct Account {
@@ -249,3 +249,21 @@ pub async fn set_signer(
         }
     }
 }
+
+#[tauri::command]
+#[specta::specta]
+pub async fn get_app_settings(state: State<'_, Nostr>) -> Result<Settings, String> {
+    let settings = state.settings.read().await.clone();
+    Ok(settings)
+}
+
+#[tauri::command]
+#[specta::specta]
+pub async fn set_app_settings(settings: String, state: State<'_, Nostr>) -> Result<(), String> {
+    let parsed: Settings = serde_json::from_str(&settings).map_err(|e| e.to_string())?;
+    let mut settings = state.settings.write().await;
+    // Update state
+    settings.clone_from(&parsed);
+
+    Ok(())
+}

src-tauri/src/commands/event.rs

@@ -36,6 +36,7 @@ pub async fn get_event(id: String, state: State<'_, Nostr>) -> Result<RichEvent,
         Ok(RichEvent { raw, parsed })
     } else {
         let filter = Filter::new().id(event_id);
+
         let mut rich_event = RichEvent {
             raw: "".to_string(),
             parsed: None,

src-tauri/src/commands/metadata.rs

@@ -7,21 +7,9 @@ use tauri::{Emitter, Manager, State};
 
 use crate::{
     common::{get_latest_event, process_event},
-    Nostr, RichEvent, Settings,
+    Nostr, RichEvent,
 };
 
-#[derive(Clone, Serialize, Deserialize, Type)]
-pub struct Profile {
-    name: String,
-    display_name: String,
-    about: Option<String>,
-    picture: String,
-    banner: Option<String>,
-    nip05: Option<String>,
-    lud16: Option<String>,
-    website: Option<String>,
-}
-
 #[derive(Clone, Serialize, Deserialize, Type)]
 pub struct Mention {
     pubkey: String,
@@ -116,30 +104,9 @@ pub async fn get_contact_list(id: String, state: State<'_, Nostr>) -> Result<Vec
 
 #[tauri::command]
 #[specta::specta]
-pub async fn set_profile(profile: Profile, state: State<'_, Nostr>) -> Result<String, String> {
+pub async fn set_profile(new_profile: String, state: State<'_, Nostr>) -> Result<String, String> {
     let client = &state.client;
-    let mut metadata = Metadata::new()
-        .name(profile.name)
-        .display_name(profile.display_name)
-        .about(profile.about.unwrap_or_default())
-        .nip05(profile.nip05.unwrap_or_default())
-        .lud16(profile.lud16.unwrap_or_default());
-
-    if let Ok(url) = Url::parse(&profile.picture) {
-        metadata = metadata.picture(url)
-    }
-
-    if let Some(b) = profile.banner {
-        if let Ok(url) = Url::parse(&b) {
-            metadata = metadata.banner(url)
-        }
-    }
-
-    if let Some(w) = profile.website {
-        if let Ok(url) = Url::parse(&w) {
-            metadata = metadata.website(url)
-        }
-    }
+    let metadata = Metadata::from_json(new_profile).map_err(|e| e.to_string())?;
 
     match client.set_metadata(&metadata).await {
         Ok(id) => Ok(id.to_string()),
@@ -612,21 +579,6 @@ pub async fn get_notifications(id: String, state: State<'_, Nostr>) -> Result<Ve
     }
 }
 
-#[tauri::command]
-#[specta::specta]
-pub async fn get_user_settings(state: State<'_, Nostr>) -> Result<Settings, String> {
-    Ok(state.settings.lock().await.clone())
-}
-
-#[tauri::command]
-#[specta::specta]
-pub async fn set_user_settings(settings: String, state: State<'_, Nostr>) -> Result<(), String> {
-    let parsed: Settings = serde_json::from_str(&settings).map_err(|e| e.to_string())?;
-    state.settings.lock().await.clone_from(&parsed);
-
-    Ok(())
-}
-
 #[tauri::command]
 #[specta::specta]
 pub async fn verify_nip05(id: String, nip05: &str) -> Result<bool, String> {