nostr/gossip
1
0
Fork 0
mirror of https://github.com/mikedilger/gossip.git synced 2024-09-29 16:31:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

cargo fmt

Browse Source
This commit is contained in:
Mike Dilger 2023-11-16 09:30:59 +13:00
parent afc2973036
commit d51f4852e1
2 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
gossip-bin/src/ui/feed/note/mod.rs
View File

@ -722,31 +722,28 @@ fn render_note_inner(
{ {
app.draft_data.draft.push(' '); app.draft_data.draft.push(' ');
} }
let nostr_url: NostrUrl = if note let nostr_url: NostrUrl =
.event if note.event.kind.is_replaceable() {
.kind let param = match note.event.parameter() {
.is_replaceable() Some(p) => p,
{ None => "".to_owned(),
let param = match note.event.parameter() { };
Some(p) => p, let event_addr = EventAddr {
None => "".to_owned(), d: param,
relays: relays.clone(),
kind: note.event.kind,
author: note.event.pubkey,
};
event_addr.into()
} else {
let event_pointer = EventPointer {
id: note.event.id,
relays: relays.clone(),
author: None,
kind: None,
};
event_pointer.into()
}; };
let event_addr = EventAddr {
d: param,
relays: relays.clone(),
kind: note.event.kind,
author: note.event.pubkey,
};
event_addr.into()
} else {
let event_pointer = EventPointer {
id: note.event.id,
relays: relays.clone(),
author: None,
kind: None,
};
event_pointer.into()
};
app.draft_data app.draft_data
.draft .draft
.push_str(&format!("{}", nostr_url)); .push_str(&format!("{}", nostr_url));

19
gossip-lib/src/storage/mod.rs
View File

@ -487,9 +487,9 @@ impl Storage {
let txn = self.env.read_txn()?; let txn = self.env.read_txn()?;
Ok(self Ok(self
.general .general
.get(&txn, b"migration_level")? .get(&txn, b"migration_level")?
.map(|bytes| u32::from_be_bytes(bytes[..4].try_into().unwrap()))) .map(|bytes| u32::from_be_bytes(bytes[..4].try_into().unwrap())))
} }
/// Write the user's encrypted private key /// Write the user's encrypted private key
@ -1218,12 +1218,15 @@ impl Storage {
&[event.kind], &[event.kind],
&[event.pubkey], &[event.pubkey],
None, None,
|e| if event.kind.is_parameterized_replaceable() { |e| {
e.parameter() == event.parameter() if event.kind.is_parameterized_replaceable() {
} else { e.parameter() == event.parameter()
true } else {
true
}
}, },
false)?; false,
)?;
let mut found_newer = false; let mut found_newer = false;
for old in existing { for old in existing {