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

reply bug fixes

Browse Source 
still need to revamp this logic for mentions

Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
William Casarin
2022-04-18 17:31:39 -07:00
parent fd4aa2bb3d
commit 5bb46c5d10
3 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
damus/Views/EventDetailView.swift
View File

@@ -120,6 +120,7 @@ struct EventDetailView: View {
scroll_to_event(scroller: proxy, id: ev.id, delay: 0.5, animate: true)
}
.onTapGesture {
print_event(ev)
let any = any_collapsed(collapsed_events)
if (collapsed && any) || (!collapsed && !any) {
toggle_collapse_thread(scroller: proxy, id: ev.id)
@@ -129,6 +130,7 @@ struct EventDetailView: View {
if !(self.collapsed && highlight.is_none) {
EventView(event: ev, highlight: collapsed ? .none : highlight, has_action_bar: true)
.onTapGesture {
print_event(ev)
if !collapsed {
toggle_collapse_thread(scroller: proxy, id: ev.id)
}
@@ -354,3 +356,8 @@ func any_collapsed(_ evs: [CollapsedEvent]) -> Bool {
}
return false
}
func print_event(_ ev: NostrEvent) {
print(ev.description)
}

15
damus/Views/EventView.swift
View File

@@ -103,12 +103,19 @@ func reply_desc(profiles: Profiles, event: NostrEvent) -> String {
}
if names.count == 2 {
if n > 2 {
let and_other = reply_others_desc(n: n, n_pubkeys: pubkeys.count)
return "Replying to \(names[0]), \(names[1])\(and_other)"
}
return "Replying to \(names[0]) & \(names[1])"
}
let other = n - pubkeys.count
let plural = other == 1 ? "" : "s"
let and_other = n > 1 ? " & \(other) other\(plural)" : ""
let and_other = reply_others_desc(n: n, n_pubkeys: pubkeys.count)
return "Replying to \(names[0])\(and_other)"
}
func reply_others_desc(n: Int, n_pubkeys: Int) -> String {
let other = n - n_pubkeys
let plural = other == 1 ? "" : "s"
return n > 1 ? " & \(other) other\(plural)" : ""
}