feat: update commands

src-tauri/src/commands/account.rs

@@ -224,18 +224,25 @@ pub async fn login(
 
 		client
 			.handle_notifications(|notification| async {
-				if let RelayPoolNotification::Event { event, .. } = notification {
-					if event.kind == Kind::GiftWrap {
-						if let Ok(UnwrappedGift { rumor, sender }) =
-							client.unwrap_gift_wrap(&event).await
-						{
-							window
-								.emit(
-									"event",
-									Payload { event: rumor.as_json(), sender: sender.to_hex() },
-								)
-								.unwrap();
+				if let RelayPoolNotification::Message { message, relay_url } = notification {
+					if let RelayMessage::Event { event, .. } = message {
+						if event.kind == Kind::GiftWrap {
+							match client.unwrap_gift_wrap(&event).await {
+								Ok(UnwrappedGift { rumor, sender }) => {
+									let payload =
+										Payload { event: rumor.as_json(), sender: sender.to_hex() };
+
+									if window.emit("event", payload).is_err() {
+										println!("Failed")
+									}
+								}
+								Err(e) => {
+									println!("Unwrapped Error: {} from {}", e, relay_url)
+								}
+							}
 						}
+					} else {
+						println!("message: {}", message.as_json())
 					}
 				}
 				Ok(false)

src-tauri/src/commands/chat.rs

@@ -46,16 +46,13 @@ pub async fn get_chats(state: State<'_, Nostr>) -> Result<Vec<String>, String> {
 
 #[tauri::command]
 #[specta::specta]
-pub async fn get_chat_messages(
-	sender: String,
-	state: State<'_, Nostr>,
-) -> Result<Vec<String>, String> {
+pub async fn get_chat_messages(id: String, state: State<'_, Nostr>) -> Result<Vec<String>, String> {
 	let client = &state.client;
 	let signer = client.signer().await.map_err(|e| e.to_string())?;
 	let receiver_pk = signer.public_key().await.map_err(|e| e.to_string())?;
-	let sender_pk = PublicKey::parse(sender).map_err(|e| e.to_string())?;
+	let sender_pk = PublicKey::parse(id).map_err(|e| e.to_string())?;
 
-	let filter = Filter::new().kind(Kind::GiftWrap).pubkeys(vec![receiver_pk, sender_pk]);
+	let filter = Filter::new().kind(Kind::GiftWrap).pubkeys(vec![sender_pk, receiver_pk]);
 
 	match client.get_events_of(vec![filter], None).await {
 		Ok(events) => {
@@ -63,15 +60,17 @@ pub async fn get_chat_messages(
 				.filter_map(|ev| async move {
 					if let Ok(UnwrappedGift { rumor, sender }) = client.unwrap_gift_wrap(&ev).await
 					{
-						if rumor.kind == Kind::PrivateDirectMessage
-							&& (sender == sender_pk || is_target(&sender_pk, &rumor.tags))
-						{
-							return Some(rumor);
+						let is_target = is_target(&sender_pk, &rumor.tags);
+						let is_member = sender == sender_pk;
+						if rumor.kind == Kind::PrivateDirectMessage && (is_member || is_target) {
+							Some(rumor.as_json())
+						} else {
+							None
 						}
+					} else {
+						None
 					}
-					None
 				})
-				.map(|ev| ev.as_json())
 				.collect::<Vec<_>>()
 				.await;
 
@@ -152,7 +151,10 @@ pub async fn send_message(
 	let receiver = PublicKey::parse(&to).map_err(|e| e.to_string())?;
 
 	match client.send_private_msg_to(relays, receiver, message, None).await {
-		Ok(_) => Ok(()),
+		Ok(output) => {
+			println!("send to: {}", output.success.iter().join(", "));
+			Ok(())
+		}
 		Err(e) => Err(e.to_string()),
 	}
 }

src-tauri/src/main.rs

@@ -53,6 +53,10 @@ fn main() {
 			#[cfg(not(target_os = "linux"))]
 			let main_window = app.get_webview_window("main").unwrap();
 
+			// Open devtools
+			#[cfg(debug_assertions)]
+			main_window.open_devtools();
+
 			// Set custom decoration
 			#[cfg(target_os = "windows")]
 			main_window.create_overlay_titlebar().unwrap();