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

Show other people's zaps

Browse Source 
Changelog-Fixed: Fix a bug where zaps on other people's posts weren't showing
This commit is contained in:
William Casarin
2023-02-13 17:50:50 -08:00
parent 98c7bf5afc
commit 49cf56f4c2
11 changed files with 73 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
damus/Views/Events/BuilderEventView.swift
View File

@@ -53,8 +53,7 @@ struct BuilderEventView: View {
NostrFilter(ids: [self.event_id], limit: 1),
NostrFilter(
kinds: [NostrKind.zap.rawValue],
referenced_ids: [self.event_id],
limit: 500
referenced_ids: [self.event_id]
)
])
}

24
damus/Views/Events/SelectedEventView.swift
View File

@@ -15,6 +15,14 @@ struct SelectedEventView: View {
event.pubkey
}
@StateObject var bar: ActionBarModel
init(damus: DamusState, event: NostrEvent) {
self.damus = damus
self.event = event
self._bar = StateObject(wrappedValue: make_actionbar_model(ev: event.id, damus: damus))
}
var body: some View {
HStack(alignment: .top) {
let profile = damus.profiles.lookup(id: pubkey)
@@ -35,19 +43,27 @@ struct SelectedEventView: View {
Divider()
.padding([.bottom], 4)
let bar = make_actionbar_model(ev: event, damus: damus)
if !bar.is_empty {
EventDetailBar(state: damus, target: event.id, target_pk: event.pubkey, bar: bar)
EventDetailBar(state: damus, target: event.id, target_pk: event.pubkey)
Divider()
}
EventActionBar(damus_state: damus, event: event, bar: bar)
EventActionBar(damus_state: damus, event: event)
.padding([.top], 4)
Divider()
.padding([.top], 4)
}
.onReceive(handle_notify(.new_zap)) { n in
let zap = n.object as! Zap
guard case .note(let note_target) = zap.target else {
return
}
guard note_target.note_id == self.event.id else {
return
}
self.bar.update(damus: self.damus, evid: self.event.id)
}
.padding([.leading], 2)
.event_context_menu(event, keypair: damus.keypair, target_pubkey: event.pubkey)
}

4
damus/Views/Events/TextEvent.swift
View File

@@ -48,9 +48,7 @@ struct TextEvent: View {
if has_action_bar {
Rectangle().frame(height: 2).opacity(0)
let bar = make_actionbar_model(ev: event, damus: damus)
EventActionBar(damus_state: damus, event: event, bar: bar)
EventActionBar(damus_state: damus, event: event)
.padding([.top], 4)
}
}