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

nozaps: don't show top zaps or zap replies

Browse Source 
We can't associate zaps with notes anymore
This commit is contained in:
William Casarin
2023-06-22 10:20:57 +02:00
parent 216029410b
commit 601fa49a6e
1 changed files with 26 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
damus/Views/ThreadView.swift
View File

@@ -11,17 +11,8 @@ struct ThreadView: View {
let state: DamusState let state: DamusState
@ObservedObject var thread: ThreadModel @ObservedObject var thread: ThreadModel
@ObservedObject var zaps: ZapsDataModel
@Environment(\.dismiss) var dismiss @Environment(\.dismiss) var dismiss
init(state: DamusState, thread: ThreadModel) {
self.state = state
self._thread = ObservedObject(wrappedValue: thread)
let zaps = state.events.get_cache_data(thread.event.id).zaps_model
self._zaps = ObservedObject(wrappedValue: zaps)
}
var parent_events: [NostrEvent] { var parent_events: [NostrEvent] {
state.events.parent_events(event: thread.event) state.events.parent_events(event: thread.event)
} }
@@ -31,28 +22,26 @@ struct ThreadView: View {
} }
var body: some View { var body: some View {
let top_zap = get_top_zap(events: state.events, evid: thread.event.id) //let top_zap = get_top_zap(events: state.events, evid: thread.event.id)
ScrollViewReader { reader in ScrollViewReader { reader in
ScrollView { ScrollView {
LazyVStack { LazyVStack {
// MARK: - Parents events view // MARK: - Parents events view
ForEach(parent_events, id: \.id) { parent_event in ForEach(parent_events, id: \.id) { parent_event in
if top_zap?.event?.id != parent_event.id {
MutedEventView(damus_state: state, MutedEventView(damus_state: state,
event: parent_event, event: parent_event,
selected: false) selected: false)
.padding(.horizontal) .padding(.horizontal)
.onTapGesture { .onTapGesture {
thread.set_active_event(parent_event) thread.set_active_event(parent_event)
scroll_to_event(scroller: reader, id: parent_event.id, delay: 0.1, animate: false) scroll_to_event(scroller: reader, id: parent_event.id, delay: 0.1, animate: false)
}
Divider()
.padding(.top, 4)
.padding(.leading, 25 * 2)
} }
Divider()
.padding(.top, 4)
.padding(.leading, 25 * 2)
}.background(GeometryReader { geometry in }.background(GeometryReader { geometry in
// get the height and width of the EventView view // get the height and width of the EventView view
let eventHeight = geometry.frame(in: .global).height let eventHeight = geometry.frame(in: .global).height
@@ -73,27 +62,27 @@ struct ThreadView: View {
) )
.id(self.thread.event.id) .id(self.thread.event.id)
/*
if let top_zap { if let top_zap {
ZapEvent(damus: state, zap: top_zap, is_top_zap: true) ZapEvent(damus: state, zap: top_zap, is_top_zap: true)
.padding(.horizontal) .padding(.horizontal)
} }
*/
ForEach(child_events, id: \.id) { child_event in ForEach(child_events, id: \.id) { child_event in
if top_zap?.event?.id != child_event.id { MutedEventView(
MutedEventView( damus_state: state,
damus_state: state, event: child_event,
event: child_event, selected: false
selected: false )
) .padding(.horizontal)
.padding(.horizontal) .onTapGesture {
.onTapGesture { thread.set_active_event(child_event)
thread.set_active_event(child_event) scroll_to_event(scroller: reader, id: child_event.id, delay: 0.1, animate: false)
scroll_to_event(scroller: reader, id: child_event.id, delay: 0.1, animate: false)
}
Divider()
.padding([.top], 4)
} }
Divider()
.padding([.top], 4)
} }
} }
}.navigationBarTitle(NSLocalizedString("Thread", comment: "Navigation bar title for note thread.")) }.navigationBarTitle(NSLocalizedString("Thread", comment: "Navigation bar title for note thread."))