feat: add nstore

src-tauri/capabilities/main.json

@@ -59,6 +59,9 @@
       "allow": [
         {
           "path": "$RESOURCE/locales/*"
+        },
+        {
+          "path": "$RESOURCE/resources/*"
         }
       ]
     }

src-tauri/gen/schemas/capabilities.json

@@ -1 +1 @@
-{"desktop-capability":{"identifier":"desktop-capability","description":"Capability for the desktop","local":true,"windows":["main","splash","settings","nwc","zap-*","event-*","user-*","editor-*","column-*"],"permissions":["path:default","event:default","window:default","app:default","resources:default","menu:default","tray:default","notification:allow-is-permission-granted","notification:allow-request-permission","notification:default","os:allow-locale","os:allow-platform","updater:allow-check","updater:default","window:allow-start-dragging","window:allow-create","window:allow-close","store:allow-get","clipboard-manager:allow-write","clipboard-manager:allow-read","webview:allow-create-webview-window","webview:allow-create-webview","webview:allow-set-webview-size","webview:allow-set-webview-position","webview:allow-webview-close","dialog:allow-open","fs:allow-read-file","shell:allow-open",{"identifier":"http:default","allow":[{"url":"http://**/"},{"url":"https://**/"}]},{"identifier":"fs:allow-read-text-file","allow":[{"path":"$RESOURCE/locales/*"}]}],"platforms":["linux","macOS","windows"]}}
+{"desktop-capability":{"identifier":"desktop-capability","description":"Capability for the desktop","local":true,"windows":["main","splash","settings","nwc","zap-*","event-*","user-*","editor-*","column-*"],"permissions":["path:default","event:default","window:default","app:default","resources:default","menu:default","tray:default","notification:allow-is-permission-granted","notification:allow-request-permission","notification:default","os:allow-locale","os:allow-platform","updater:allow-check","updater:default","window:allow-start-dragging","window:allow-create","window:allow-close","store:allow-get","clipboard-manager:allow-write","clipboard-manager:allow-read","webview:allow-create-webview-window","webview:allow-create-webview","webview:allow-set-webview-size","webview:allow-set-webview-position","webview:allow-webview-close","dialog:allow-open","fs:allow-read-file","shell:allow-open",{"identifier":"http:default","allow":[{"url":"http://**/"},{"url":"https://**/"}]},{"identifier":"fs:allow-read-text-file","allow":[{"path":"$RESOURCE/locales/*"},{"path":"$RESOURCE/resources/*"}]}],"platforms":["linux","macOS","windows"]}}

src-tauri/resources/official_columns.json

@@ -0,0 +1,52 @@
+[
+  {
+    "label": "rRtguZwIpd5G8Wt54OTb7",
+    "name": "For you",
+    "content": "/foryou",
+    "logo": "",
+    "cover": "/foryou.png",
+    "coverRetina": "/foryou@2x.png",
+    "author": "Lume",
+    "description": "Keep up to date with content based on your interests."
+  },
+  {
+    "label": "fve9fk2fVyFWORPBkjd79",
+    "name": "Group Feeds",
+    "content": "/group",
+    "logo": "",
+    "cover": "/group.png",
+    "coverRetina": "/group@2x.png",
+    "author": "Lume",
+    "description": "Collective of people you're interested in."
+  },
+  {
+    "label": "sDbO6XxAGnW5XuUZEgZMn",
+    "name": "Antenas",
+    "content": "/antenas",
+    "logo": "",
+    "cover": "/antenas.png",
+    "coverRetina": "/antenas@2x.png",
+    "author": "Lume",
+    "description": "Keep track to specific content."
+  },
+  {
+    "label": "gxtcIbgD8YNPbeI5o92I8",
+    "name": "Trending",
+    "content": "/trending",
+    "logo": "",
+    "cover": "/trending.png",
+    "coverRetina": "/trending@2x.png",
+    "author": "Lume",
+    "description": "What is trending on Nostr?."
+  },
+  {
+    "label": "GLFm44za8rhJDP04LMr3M",
+    "name": "Global",
+    "content": "/global",
+    "logo": "",
+    "cover": "/global.png",
+    "coverRetina": "/global@2x.png",
+    "author": "Lume",
+    "description": "All events from connected relays."
+  }
+]

src-tauri/resources/system_columns.json

@@ -0,0 +1,9 @@
+[
+  { "label": "newsfeed", "name": "Newsfeed", "content": "/newsfeed" },
+  { "label": "open", "name": "Open", "content": "/open" },
+  {
+    "label": "store",
+    "name": "Store",
+    "content": "/store/official"
+  }
+]

src-tauri/src/main.rs

@@ -115,10 +115,8 @@ fn main() {
       nostr::metadata::create_profile,
       nostr::metadata::follow,
       nostr::metadata::unfollow,
-      nostr::metadata::set_interest,
-      nostr::metadata::get_interest,
-      nostr::metadata::set_settings,
-      nostr::metadata::get_settings,
+      nostr::metadata::get_nstore,
+      nostr::metadata::set_nstore,
       nostr::metadata::set_nwc,
       nostr::metadata::load_nwc,
       nostr::metadata::get_balance,

src-tauri/src/nostr/metadata.rs

@@ -179,38 +179,34 @@ pub async fn unfollow(id: &str, state: State<'_, Nostr>) -> Result<EventId, Stri
 }
 
 #[tauri::command]
-pub async fn set_interest(content: &str, state: State<'_, Nostr>) -> Result<EventId, String> {
+pub async fn set_nstore(
+  key: &str,
+  content: &str,
+  state: State<'_, Nostr>,
+) -> Result<EventId, String> {
   let client = &state.client;
-  let tag = Tag::Identifier("lume_user_interest".into());
+  let tag = Tag::Identifier(key.into());
   let builder = EventBuilder::new(Kind::ApplicationSpecificData, content, vec![tag]);
 
   if let Ok(event_id) = client.send_event_builder(builder).await {
+    println!("set nstore: {}", event_id);
     Ok(event_id)
   } else {
-    Err("Set interest failed".into())
+    Err("Event has been published failled".into())
   }
 }
 
 #[tauri::command]
-pub async fn get_interest(id: &str, state: State<'_, Nostr>) -> Result<String, String> {
+pub async fn get_nstore(key: &str, state: State<'_, Nostr>) -> Result<String, String> {
   let client = &state.client;
-  let public_key: Option<PublicKey> = match Nip19::from_bech32(id) {
-    Ok(val) => match val {
-      Nip19::Pubkey(pubkey) => Some(pubkey),
-      Nip19::Profile(profile) => Some(profile.public_key),
-      _ => None,
-    },
-    Err(_) => match PublicKey::from_str(id) {
-      Ok(val) => Some(val),
-      Err(_) => None,
-    },
-  };
+  let signer = client.signer().await.unwrap();
+  let public_key = signer.public_key().await;
 
-  if let Some(author) = public_key {
+  if let Ok(author) = public_key {
     let filter = Filter::new()
       .author(author)
       .kind(Kind::ApplicationSpecificData)
-      .identifier("lume_user_interest")
+      .identifier(key)
       .limit(1);
 
     let query = client
@@ -219,68 +215,17 @@ pub async fn get_interest(id: &str, state: State<'_, Nostr>) -> Result<String, S
 
     if let Ok(events) = query {
       if let Some(event) = events.first() {
+        println!("get nstore key: {} - received: {}", key, event.id);
         Ok(event.content.to_string())
       } else {
-        Err("User interest not found".into())
+        println!("get nstore key: {}", key);
+        Err("Value not found".into())
       }
     } else {
-      Err("User interest not found".into())
+      Err("Query nstore event failed".into())
     }
   } else {
-    Err("Get interest failed".into())
-  }
-}
-
-#[tauri::command]
-pub async fn set_settings(content: &str, state: State<'_, Nostr>) -> Result<EventId, String> {
-  let client = &state.client;
-  let tag = Tag::Identifier("lume_user_settings".into());
-  let builder = EventBuilder::new(Kind::ApplicationSpecificData, content, vec![tag]);
-
-  if let Ok(event_id) = client.send_event_builder(builder).await {
-    Ok(event_id)
-  } else {
-    Err("Set settings failed".into())
-  }
-}
-
-#[tauri::command]
-pub async fn get_settings(id: &str, state: State<'_, Nostr>) -> Result<String, String> {
-  let client = &state.client;
-  let public_key: Option<PublicKey> = match Nip19::from_bech32(id) {
-    Ok(val) => match val {
-      Nip19::Pubkey(pubkey) => Some(pubkey),
-      Nip19::Profile(profile) => Some(profile.public_key),
-      _ => None,
-    },
-    Err(_) => match PublicKey::from_str(id) {
-      Ok(val) => Some(val),
-      Err(_) => None,
-    },
-  };
-
-  if let Some(author) = public_key {
-    let filter = Filter::new()
-      .author(author)
-      .kind(Kind::ApplicationSpecificData)
-      .identifier("lume_user_settings")
-      .limit(1);
-
-    let query = client
-      .get_events_of(vec![filter], Some(Duration::from_secs(10)))
-      .await;
-
-    if let Ok(events) = query {
-      if let Some(event) = events.first() {
-        Ok(event.content.to_string())
-      } else {
-        Err("User settings not found".into())
-      }
-    } else {
-      Err("User settings not found".into())
-    }
-  } else {
-    Err("Get settings failed".into())
+    Err("Something is wrong".into())
   }
 }
 

src-tauri/tauri.conf.json

@@ -44,7 +44,7 @@
     "targets": "all",
     "active": true,
     "category": "SocialNetworking",
-    "resources": ["resources/*", "./locales/*"],
+    "resources": ["resources/*", "locales/*"],
     "icon": [
       "icons/32x32.png",
       "icons/128x128.png",