reya/lume
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: handle unwrap err (#210)

Browse Source
This commit is contained in:
XIAO YU
2024-06-16 10:11:48 +09:00
committed by GitHub
parent 71be59b2e9
commit 7c99ed39e4
1 changed files with 81 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

129
src-tauri/src/nostr/metadata.rs
View File

@@ -9,29 +9,38 @@ use tauri::State;
#[specta::specta] #[specta::specta]
pub async fn get_current_user_profile(state: State<'_, Nostr>) -> Result<String, String> { pub async fn get_current_user_profile(state: State<'_, Nostr>) -> Result<String, String> {
let client = &state.client; let client = &state.client;
let signer = client.signer().await.unwrap();
let public_key = signer.public_key().await.unwrap(); let signer = match client.signer().await {
Ok(signer) => signer,
Err(err) => return Err(format!("Failed to get signer: {}", err)),
};
let public_key = match signer.public_key().await {
Ok(pk) => pk,
Err(err) => return Err(format!("Failed to get public key: {}", err)),
};
let filter = Filter::new() let filter = Filter::new()
.author(public_key) .author(public_key)
.kind(Kind::Metadata) .kind(Kind::Metadata)
.limit(1); .limit(1);
match client let events_result = client
.get_events_of(vec![filter], Some(Duration::from_secs(10))) .get_events_of(vec![filter], Some(Duration::from_secs(10)))
.await .await;
{
match events_result {
Ok(events) => { Ok(events) => {
if let Some(event) = get_latest_event(&events) { if let Some(event) = get_latest_event(&events) {
if let Ok(metadata) = Metadata::from_json(&event.content) { match Metadata::from_json(&event.content) {
Ok(metadata.as_json()) Ok(metadata) => Ok(metadata.as_json()),
} else { Err(_) => Err("Failed to parse metadata.".into()),
Err("Parse metadata failed".into())
} }
} else { } else {
Err("Not found".into()) Err("No matching events found.".into())
} }
} }
Err(_) => Err("Not found".into()), Err(err) => Err(format!("Failed to get events: {}", err)),
} }
} }
@@ -89,7 +98,10 @@ pub async fn set_contact_list(pubkeys: Vec<&str>, state: State<'_, Nostr>) -> Re
let client = &state.client; let client = &state.client;
let contact_list: Vec<Contact> = pubkeys let contact_list: Vec<Contact> = pubkeys
.into_iter() .into_iter()
.map(|p| Contact::new(PublicKey::from_hex(p).unwrap(), None, Some(""))) .filter_map(|p| match PublicKey::from_hex(p) {
Ok(pk) => Some(Contact::new(pk, None, Some(""))),
Err(_) => None,
})
.collect(); .collect();
match client.set_contact_list(contact_list).await { match client.set_contact_list(contact_list).await {
@@ -168,11 +180,14 @@ pub async fn follow(
state: State<'_, Nostr>, state: State<'_, Nostr>,
) -> Result<String, String> { ) -> Result<String, String> {
let client = &state.client; let client = &state.client;
let public_key = PublicKey::from_str(id).unwrap(); let public_key = match PublicKey::from_str(id) {
let contact = Contact::new(public_key, None, alias); // #TODO: Add relay_url Ok(pk) => pk,
let contact_list = client.get_contact_list(Some(Duration::from_secs(10))).await; Err(_) => return Err("Invalid public key.".into()),
};
let contact = Contact::new(public_key, None, alias); // TODO: Add relay_url
let contact_list_result = client.get_contact_list(Some(Duration::from_secs(10))).await;
match contact_list { match contact_list_result {
Ok(mut old_list) => { Ok(mut old_list) => {
old_list.push(contact); old_list.push(contact);
let new_list = old_list.into_iter(); let new_list = old_list.into_iter();
@@ -190,20 +205,21 @@ pub async fn follow(
#[specta::specta] #[specta::specta]
pub async fn unfollow(id: &str, state: State<'_, Nostr>) -> Result<String, String> { pub async fn unfollow(id: &str, state: State<'_, Nostr>) -> Result<String, String> {
let client = &state.client; let client = &state.client;
let public_key = PublicKey::from_str(id).unwrap(); let public_key = match PublicKey::from_str(id) {
let contact_list = client.get_contact_list(Some(Duration::from_secs(10))).await; Ok(pk) => pk,
Err(_) => return Err("Invalid public key.".into()),
};
match contact_list { let contact_list_result = client.get_contact_list(Some(Duration::from_secs(10))).await;
Ok(mut old_list) => {
let index = old_list
.iter()
.position(|x| x.public_key == public_key)
.unwrap();
old_list.remove(index);
let new_list = old_list.into_iter(); match contact_list_result {
Ok(old_list) => {
let contacts: Vec<Contact> = old_list
.into_iter()
.filter(|contact| contact.public_key != public_key)
.collect();
match client.set_contact_list(new_list).await { match client.set_contact_list(contacts).await {
Ok(event_id) => Ok(event_id.to_string()), Ok(event_id) => Ok(event_id.to_string()),
Err(err) => Err(err.to_string()), Err(err) => Err(err.to_string()),
} }
@@ -223,8 +239,15 @@ pub async fn set_nstore(
match client.signer().await { match client.signer().await {
Ok(signer) => { Ok(signer) => {
let public_key = signer.public_key().await.unwrap(); let public_key = match signer.public_key().await {
let encrypted = signer.nip44_encrypt(public_key, content).await.unwrap(); Ok(pk) => pk,
Err(err) => return Err(format!("Failed to get public key: {}", err)),
};
let encrypted = match signer.nip44_encrypt(public_key, content).await {
Ok(enc) => enc,
Err(err) => return Err(format!("Encryption failed: {}", err)),
};
let tag = Tag::identifier(key); let tag = Tag::identifier(key);
let builder = EventBuilder::new(Kind::ApplicationSpecificData, encrypted, vec![tag]); let builder = EventBuilder::new(Kind::ApplicationSpecificData, encrypted, vec![tag]);
@@ -244,7 +267,11 @@ pub async fn get_nstore(key: &str, state: State<'_, Nostr>) -> Result<String, St
let client = &state.client; let client = &state.client;
if let Ok(signer) = client.signer().await { if let Ok(signer) = client.signer().await {
let public_key = signer.public_key().await.unwrap(); let public_key = match signer.public_key().await {
Ok(pk) => pk,
Err(err) => return Err(format!("Failed to get public key: {}", err)),
};
let filter = Filter::new() let filter = Filter::new()
.author(public_key) .author(public_key)
.kind(Kind::ApplicationSpecificData) .kind(Kind::ApplicationSpecificData)
@@ -280,9 +307,9 @@ pub async fn set_nwc(uri: &str, state: State<'_, Nostr>) -> Result<bool, String>
if let Ok(nwc_uri) = NostrWalletConnectURI::from_str(uri) { if let Ok(nwc_uri) = NostrWalletConnectURI::from_str(uri) {
let nwc = NWC::new(nwc_uri); let nwc = NWC::new(nwc_uri);
let keyring = Entry::new("Lume Secret Storage", "NWC").unwrap(); let keyring = Entry::new("Lume Secret Storage", "NWC").map_err(|e| e.to_string())?;
let _ = keyring.set_password(uri); keyring.set_password(uri).map_err(|e| e.to_string())?;
let _ = client.set_zapper(nwc).await; client.set_zapper(nwc).await;
Ok(true) Ok(true)
} else { } else {
@@ -294,11 +321,11 @@ pub async fn set_nwc(uri: &str, state: State<'_, Nostr>) -> Result<bool, String>
#[specta::specta] #[specta::specta]
pub async fn load_nwc(state: State<'_, Nostr>) -> Result<bool, String> { pub async fn load_nwc(state: State<'_, Nostr>) -> Result<bool, String> {
let client = &state.client; let client = &state.client;
let keyring = Entry::new("Lume Secret Storage", "NWC").unwrap(); let keyring = Entry::new("Lume Secret Storage", "NWC").map_err(|e| e.to_string())?;
match keyring.get_password() { match keyring.get_password() {
Ok(val) => { Ok(val) => {
let uri = NostrWalletConnectURI::from_str(&val).unwrap(); let uri = NostrWalletConnectURI::from_str(&val).map_err(|e| e.to_string())?;
let nwc = NWC::new(uri); let nwc = NWC::new(uri);
client.set_zapper(nwc).await; client.set_zapper(nwc).await;
@@ -311,17 +338,17 @@ pub async fn load_nwc(state: State<'_, Nostr>) -> Result<bool, String> {
#[tauri::command] #[tauri::command]
#[specta::specta] #[specta::specta]
pub async fn get_balance() -> Result<String, String> { pub async fn get_balance() -> Result<String, String> {
let keyring = Entry::new("Lume Secret Storage", "NWC").unwrap(); let keyring = Entry::new("Lume Secret Storage", "NWC").map_err(|e| e.to_string())?;
match keyring.get_password() { match keyring.get_password() {
Ok(val) => { Ok(val) => {
let uri = NostrWalletConnectURI::from_str(&val).unwrap(); let uri = NostrWalletConnectURI::from_str(&val).map_err(|e| e.to_string())?;
let nwc = NWC::new(uri); let nwc = NWC::new(uri);
if let Ok(balance) = nwc.get_balance().await { nwc
Ok(balance.to_string()) .get_balance()
} else { .await
Err("Get balance failed".into()) .map(|balance| balance.to_string())
} .map_err(|_| "Get balance failed".into())
} }
Err(_) => Err("Something wrong".into()), Err(_) => Err("Something wrong".into()),
} }
@@ -350,9 +377,12 @@ pub async fn zap_profile(
if let Some(recipient) = public_key { if let Some(recipient) = public_key {
let details = ZapDetails::new(ZapType::Public).message(message); let details = ZapDetails::new(ZapType::Public).message(message);
let num = amount.parse::<u64>().unwrap(); let num = match amount.parse::<u64>() {
Ok(val) => val,
Err(_) => return Err("Invalid amount.".into()),
};
if (client.zap(recipient, num, Some(details)).await).is_ok() { if client.zap(recipient, num, Some(details)).await.is_ok() {
Ok(true) Ok(true)
} else { } else {
Err("Zap profile failed".into()) Err("Zap profile failed".into())
@@ -385,15 +415,18 @@ pub async fn zap_event(
if let Some(recipient) = event_id { if let Some(recipient) = event_id {
let details = ZapDetails::new(ZapType::Public).message(message); let details = ZapDetails::new(ZapType::Public).message(message);
let num = amount.parse::<u64>().unwrap(); let num = match amount.parse::<u64>() {
Ok(val) => val,
Err(_) => return Err("Invalid amount.".into()),
};
if (client.zap(recipient, num, Some(details)).await).is_ok() { if client.zap(recipient, num, Some(details)).await.is_ok() {
Ok(true) Ok(true)
} else { } else {
Err("Zap event failed".into()) Err("Zap event failed".into())
} }
} else { } else {
Err("Parse public key failed".into()) Err("Parse event ID failed".into())
} }
} }
@@ -492,7 +525,7 @@ pub async fn get_followers(
.map(|event| event.author().to_hex()) .map(|event| event.author().to_hex())
.collect(); .collect();
Ok(ret) Ok(ret)
//todo: get more than 500 events // TODO: get more than 500 events
} }
#[tauri::command] #[tauri::command]