Revert "chore: Update dependencies and add thiserror crate (#196)"

This reverts commit e254ee3203.

src-tauri/Cargo.toml

@@ -11,17 +11,16 @@ rust-version = "1.68"
 tauri-build = { version = "2.0.0-beta", features = [] }
 
 [dependencies]
-thiserror = "1.0"
 nostr-sdk = { version = "0.31", features = ["sqlite"] }
 tokio = { version = "1", features = ["full"] }
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 tauri = { version = "2.0.0-beta", features = [
-    "unstable",
+  "unstable",
-    "tray-icon",
+  "tray-icon",
-    "macos-private-api",
+  "macos-private-api",
-    "native-tls-vendored",
+  "native-tls-vendored",
-    "protocol-asset",
+  "protocol-asset",
 ] }
 tauri-plugin-clipboard-manager = "2.1.0-beta"
 tauri-plugin-dialog = "2.0.0-beta"

src-tauri/src/nostr/metadata.rs

@@ -3,45 +3,35 @@ use keyring::Entry;
 use nostr_sdk::prelude::*;
 use std::{str::FromStr, time::Duration};
 use tauri::State;
-use thiserror::Error;
 use url::Url;
 
-#[derive(Debug, Error)]
-enum Error {
-  #[error(transparent)]
-  Client(#[from] nostr_sdk::client::Error),
-  #[error(transparent)]
-  Key(#[from] nostr_sdk::key::Error),
-  #[error(transparent)]
-  Num(#[from] std::num::ParseIntError),
-}
-
-impl serde::Serialize for Error {
-  fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-  where
-    S: serde::ser::Serializer,
-  {
-    serializer.serialize_str(self.to_string().as_ref())
-  }
-}
-
 #[tauri::command]
 #[specta::specta]
 pub async fn get_activities(
   account: &str,
   kind: &str,
   state: State<'_, Nostr>,
-) -> Result<Vec<String>, Error> {
+) -> Result<Vec<String>, String> {
   let client = &state.client;
-  let public_key = PublicKey::from_str(account)?;
+
-  let kind = Kind::from_str(kind)?;
+  if let Ok(pubkey) = PublicKey::from_str(account) {
-  let filter = Filter::new()
+    if let Ok(kind) = Kind::from_str(kind) {
-    .pubkey(public_key)
+      let filter = Filter::new()
-    .kind(kind)
+        .pubkey(pubkey)
-    .limit(100)
+        .kind(kind)
-    .until(Timestamp::now());
+        .limit(100)
-  let events = client.get_events_of(vec![filter], None).await?;
+        .until(Timestamp::now());
-  Ok(events.into_iter().map(|ev| ev.as_json()).collect())
+
+      match client.get_events_of(vec![filter], None).await {
+        Ok(events) => Ok(events.into_iter().map(|ev| ev.as_json()).collect()),
+        Err(err) => Err(err.to_string()),
+      }
+    } else {
+      Err("Kind is not valid, please check again.".into())
+    }
+  } else {
+    Err("Public Key is not valid, please check again.".into())
+  }
 }
 
 #[tauri::command]