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

determine highlight from reply map

Browse Source 
Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
William Casarin
2022-04-18 14:53:10 -07:00
parent b3588b9d61
commit f2265153fa
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
damus/Views/EventDetailView.swift
View File

@@ -261,8 +261,17 @@ func make_reply_map(active: NostrEvent, events: [NostrEvent]) -> [String: ()]
return is_reply return is_reply
} }
func determine_highlight(current: NostrEvent, active: NostrEvent) -> Highlight func determine_highlight(reply_map: [String: ()], current: NostrEvent, active: NostrEvent) -> Highlight
{ {
if current.id == active.id {
return .main
} else if reply_map[current.id] != nil {
return .reply
} else {
return .none
}
/*
if current.id == active.id { if current.id == active.id {
return .main return .main
} }
@@ -281,35 +290,31 @@ func determine_highlight(current: NostrEvent, active: NostrEvent) -> Highlight
} }
return .none return .none
*/
} }
func calculated_collapsed_events(collapsed: Bool, active: NostrEvent, events: [NostrEvent]) -> [CollapsedEvent] { func calculated_collapsed_events(collapsed: Bool, active: NostrEvent, events: [NostrEvent]) -> [CollapsedEvent] {
var count: Int = 0 var count: Int = 0
let reply_map = make_reply_map(active: active, events: events)
if !collapsed { if !collapsed {
return events.reduce(into: []) { acc, ev in return events.reduce(into: []) { acc, ev in
let highlight = determine_highlight(current: ev, active: active) let highlight = determine_highlight(reply_map: reply_map, current: ev, active: active)
return acc.append(.event(ev, highlight)) return acc.append(.event(ev, highlight))
} }
} }
let reply_map = make_reply_map(active: active, events: events)
let nevents = events.count let nevents = events.count
var start: Int = 0 var start: Int = 0
var i: Int = 0 var i: Int = 0
return events.reduce(into: []) { (acc, ev) in return events.reduce(into: []) { (acc, ev) in
var highlight: Highlight = .none let highlight = determine_highlight(reply_map: reply_map, current: ev, active: active)
if ev.id == active.id {
highlight = .main
} else if reply_map[ev.id] != nil {
highlight = .reply
}
switch highlight { switch highlight {
case .none: case .none:
if (i == 0) { if i == 0 {
start = 1 start = 1
} }
count += 1 count += 1