tyiu/damus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add first_eref_mention helper to refactor embedded builder

Browse Source
This commit is contained in:
William Casarin
2023-01-21 10:27:44 -08:00
parent 0258ef792f
commit e14cd99c85
2 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
damus/Nostr/NostrEvent.swift
View File

@@ -789,3 +789,29 @@ func inner_event_or_self(ev: NostrEvent) -> NostrEvent {
return inner_ev
}
func first_eref_mention(ev: NostrEvent, privkey: String?) -> Mention? {
let blocks = ev.blocks(privkey).filter { block in
guard case .mention(let mention) = block else {
return false
}
guard case .event = mention.type else {
return false
}
if mention.ref.key != "e" {
return false
}
return true
}
/// MARK: - Preview
if let firstBlock = blocks.first, case .mention(let mention) = firstBlock, mention.ref.key == "e" {
return mention
}
return nil
}

24
damus/Views/EventView.swift
View File

@@ -245,30 +245,10 @@ struct EventView: View {
.allowsHitTesting(!embedded)
if !embedded {
let blocks = event.blocks(damus.keypair.privkey).filter { block in
guard case .mention(let mention) = block else {
return false
}
guard case .event = mention.type else {
return false
}
if mention.ref.key != "e" {
return false
}
return true
}
/// MARK: - Preview
if let firstBlock = blocks.first, case .mention(let mention) = firstBlock, mention.ref.key == "e" {
if let mention = first_eref_mention(ev: event, privkey: damus.keypair.privkey) {
BuilderEventView(damus: damus, event_id: mention.ref.id)
}
}
if !embedded {
if has_action_bar {
if size == .selected {
Text("\(format_date(event.created_at))")