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

Merge pull request #726 from bu5hm4nn/fix/show-error-message-on-unparsable-embedded-event

Browse Source 
Show error on unparseable embedded note content
This commit is contained in:
Michael Dilger 2024-04-20 13:19:00 +12:00 committed by GitHub
commit 6328f254e9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
gossip-bin/src/ui/feed/notedata.rs
View File

@ -123,33 +123,43 @@ impl NoteData {
mentions
};
let embedded_event = {
let (embedded_event, embedded_event_error) = {
if event.kind == EventKind::Repost || event.kind == EventKind::GenericRepost {
if !event.content.trim().is_empty() {
if let Ok(embedded_event) = serde_json::from_str::<Event>(&event.content) {
if event.kind == EventKind::Repost
|| (event.kind == EventKind::GenericRepost
&& embedded_event.kind.is_feed_displayable())
{
Some(embedded_event)
let result = serde_json::from_str::<Event>(&event.content);
if let Ok(embedded_event) = result {
if embedded_event.kind.is_feed_displayable() {
(Some(embedded_event), None)
} else {
None
(None, {
let kind_number: u32 = embedded_event.kind.into();
Some(format!(
"ERROR EMBEDDED EVENT UNSUPPORTED KIND : {}",
kind_number
))
})
}
} else {
None
(
None,
Some(format!(
"ERROR PARSING EMBEDDED EVENT: '{}'",
result.err().unwrap().to_string()
)),
)
}
} else {
None
(None, None)
}
} else {
None
(None, None)
}
};
// Compute the content to our needs
let (display_content, error_content) = match event.kind {
EventKind::TextNote => (event.content.trim().to_string(), None),
EventKind::Repost => ("".to_owned(), None),
EventKind::Repost => ("".to_owned(), embedded_event_error),
EventKind::GenericRepost => ("".to_owned(), None),
EventKind::EncryptedDirectMessage => {
match GLOBALS.identity.decrypt_event_contents(&event) {