Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/parser/dms.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@ pub async fn parse_dm_events(events: Events, pubkey: &Keys) -> Vec<(Message, u64
nostr_sdk::Kind::GiftWrap => {
let unwrapped_gift = match nip59::extract_rumor(pubkey, dm).await {
Ok(u) => u,
Err(_) => {
println!("Error unwrapping gift");
Err(e) => {
eprintln!("Warning: Could not decrypt gift wrap (event {}): {}", dm.id, e);
continue;
}
};
let (message, _): (Message, Option<String>) =
match serde_json::from_str(&unwrapped_gift.rumor.content) {
Ok(msg) => msg,
Err(_) => {
println!("Error parsing gift wrap content");
Err(e) => {
eprintln!("Warning: Could not parse message content (event {}): {}", dm.id, e);
continue;
}
};
Expand Down
3 changes: 2 additions & 1 deletion src/util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,8 @@ pub async fn fetch_events_list(
Ok(orders.into_iter().map(Event::SmallOrder).collect())
}
ListKind::DirectMessagesAdmin => {
let filters = create_filter(list_kind, ctx.mostro_pubkey, None)?;
// Fetch gift wraps sent TO the admin's public key (not Mostro's)
let filters = create_filter(list_kind, ctx.context_keys.public_key(), None)?;
let fetched_events = ctx
.client
.fetch_events(filters, FETCH_EVENTS_TIMEOUT)
Expand Down