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

misc refactors

Browse Source
This commit is contained in:
William Casarin
2023-01-02 18:57:51 -08:00
parent ba03be5b91
commit aaa21bf1bf
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
damus/Models/ThreadModel.swift
View File

@@ -115,7 +115,7 @@ class ThreadModel: ObservableObject {
ref_events.referenced_ids = ev.referenced_ids.map { $0.ref_id } ref_events.referenced_ids = ev.referenced_ids.map { $0.ref_id }
ref_events.referenced_ids?.append(ev.id) ref_events.referenced_ids?.append(ev.id)
ref_events.limit = 50 ref_events.limit = 50
events_filter.ids = ref_events.referenced_ids! events_filter.ids = ref_events.referenced_ids ?? []
events_filter.limit = 100 events_filter.limit = 100
events_filter.ids?.append(ev.id) events_filter.ids?.append(ev.id)
case .event_id(let evid): case .event_id(let evid):

11
damus/Views/EventView.swift
View File

@@ -103,12 +103,13 @@ struct BuilderEventView: View {
var body: some View { var body: some View {
VStack { VStack {
if event == nil { if let event = event {
ProgressView().padding() let ev = event.inner_event ?? event
} else { NavigationLink(destination: BuildThreadV2View(damus: damus, event_id: ev.id)) {
NavigationLink(destination: BuildThreadV2View(damus: damus, event_id: event!.id)) { EventView(damus: damus, event: event, show_friend_icon: true, size: .small)
EventView(damus: damus, event: event!, show_friend_icon: true, size: .small)
}.buttonStyle(.plain) }.buttonStyle(.plain)
} else {
ProgressView().padding()
} }
} }
.frame(minWidth: 0, maxWidth: .infinity) .frame(minWidth: 0, maxWidth: .infinity)