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

send_filters refactor

Browse Source 
Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
William Casarin
2022-05-14 15:35:34 -07:00
parent 040ffdf9f5
commit 8da251dc88
11 changed files with 129 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
damus/Views/ChatView.swift
View File

@@ -113,7 +113,7 @@ struct ChatView: View {
NoteContentView(event: event, profiles: damus.profiles, content: event.content)
if is_active || next_ev == nil || next_ev!.pubkey != event.pubkey {
let bar = make_actionbar_model(ev: event, like_counter: damus.likes, boost_counter: damus.boosts)
let bar = make_actionbar_model(ev: event, damus: damus)
EventActionBar(event: event,
our_pubkey: damus.pubkey,
profiles: damus.profiles,

19
damus/Views/EventActionBar.swift
View File

@@ -37,7 +37,7 @@ struct EventActionBar: View {
EventActionButton(img: "bubble.left", col: nil) {
notify(.reply, event)
}
.padding([.trailing], 40)
.padding([.trailing], 20)
HStack(alignment: .bottom) {
Text("\(bar.likes > 0 ? "\(bar.likes)" : "")")
@@ -52,7 +52,7 @@ struct EventActionBar: View {
}
}
}
.padding([.trailing], 40)
.padding([.trailing], 20)
HStack(alignment: .bottom) {
Text("\(bar.boosts > 0 ? "\(bar.boosts)" : "")")
@@ -67,6 +67,21 @@ struct EventActionBar: View {
}
}
}
.padding([.trailing], 20)
HStack(alignment: .bottom) {
Text("\(bar.tips > 0 ? "\(bar.tips)" : "")")
.font(.footnote)
.foregroundColor(bar.tipped ? Color.orange : Color.gray)
EventActionButton(img: bar.tipped ? "bitcoinsign.circle.fill" : "bitcoinsign.circle", col: bar.tipped ? Color.orange : nil) {
if bar.tipped {
notify(.delete, bar.our_tip)
} else {
notify(.boost, event)
}
}
}
}
.onReceive(handle_notify(.liked)) { n in

22
damus/Views/EventView.swift
View File

@@ -99,7 +99,7 @@ struct EventView: View {
Spacer()
if has_action_bar {
let bar = make_actionbar_model(ev: event, like_counter: damus.likes, boost_counter: damus.boosts)
let bar = make_actionbar_model(ev: event, damus: damus)
EventActionBar(event: event, our_pubkey: damus.pubkey, profiles: damus.profiles, bar: bar)
}
@@ -180,11 +180,19 @@ func reply_others_desc(n: Int, n_pubkeys: Int) -> String {
func make_actionbar_model(ev: NostrEvent, like_counter: EventCounter, boost_counter: EventCounter) -> ActionBarModel {
let likes = like_counter.counts[ev.id]
let boosts = boost_counter.counts[ev.id]
let our_like = like_counter.our_events[ev.id]
let our_boost = boost_counter.our_events[ev.id]
func make_actionbar_model(ev: NostrEvent, damus: DamusState) -> ActionBarModel {
let likes = damus.likes.counts[ev.id]
let boosts = damus.boosts.counts[ev.id]
let tips = damus.tips.tips[ev.id]
let our_like = damus.likes.our_events[ev.id]
let our_boost = damus.boosts.our_events[ev.id]
let our_tip = damus.tips.our_tips[ev.id]
return ActionBarModel(likes: likes ?? 0, boosts: boosts ?? 0, our_like: our_like, our_boost: our_boost)
return ActionBarModel(likes: likes ?? 0,
boosts: boosts ?? 0,
tips: tips ?? 0,
our_like: our_like,
our_boost: our_boost,
our_tip: our_tip
)
}