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

I broked dms. i fixed.

Browse Source
This commit is contained in:
William Casarin
2023-07-11 12:28:06 -07:00
parent 495859e07f
commit d2374aa6ec
3 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
damus/Views/Events/Components/EventTop.swift
View File

@@ -10,17 +10,19 @@ import SwiftUI
struct EventTop: View { struct EventTop: View {
let state: DamusState let state: DamusState
let event: NostrEvent let event: NostrEvent
let pubkey: String
let is_anon: Bool let is_anon: Bool
init(state: DamusState, event: NostrEvent, is_anon: Bool) { init(state: DamusState, event: NostrEvent, pubkey: String, is_anon: Bool) {
self.state = state self.state = state
self.event = event self.event = event
self.pubkey = pubkey
self.is_anon = is_anon self.is_anon = is_anon
} }
func ProfileName(is_anon: Bool) -> some View { func ProfileName(is_anon: Bool) -> some View {
let profile = state.profiles.lookup(id: event.pubkey) let profile = state.profiles.lookup(id: self.pubkey)
let pk = is_anon ? "anon" : event.pubkey let pk = is_anon ? "anon" : self.pubkey
return EventProfileName(pubkey: pk, profile: profile, damus: state, size: .normal) return EventProfileName(pubkey: pk, profile: profile, damus: state, size: .normal)
} }
@@ -39,6 +41,6 @@ struct EventTop: View {
struct EventTop_Previews: PreviewProvider { struct EventTop_Previews: PreviewProvider {
static var previews: some View { static var previews: some View {
EventTop(state: test_damus_state(), event: test_event, is_anon: false) EventTop(state: test_damus_state(), event: test_event, pubkey: test_event.pubkey, is_anon: false)
} }
} }

16
damus/Views/Events/EventShell.swift
View File

@@ -10,13 +10,23 @@ import SwiftUI
struct EventShell<Content: View>: View { struct EventShell<Content: View>: View {
let state: DamusState let state: DamusState
let event: NostrEvent let event: NostrEvent
let pubkey: String
let options: EventViewOptions let options: EventViewOptions
let content: Content let content: Content
init(state: DamusState, event: NostrEvent, pubkey: String, options: EventViewOptions, @ViewBuilder content: () -> Content) {
self.state = state
self.event = event
self.options = options
self.pubkey = pubkey
self.content = content()
}
init(state: DamusState, event: NostrEvent, options: EventViewOptions, @ViewBuilder content: () -> Content) { init(state: DamusState, event: NostrEvent, options: EventViewOptions, @ViewBuilder content: () -> Content) {
self.state = state self.state = state
self.event = event self.event = event
self.options = options self.options = options
self.pubkey = event.pubkey
self.content = content() self.content = content()
} }
@@ -42,7 +52,7 @@ struct EventShell<Content: View>: View {
} }
func Pfp(is_anon: Bool) -> some View { func Pfp(is_anon: Bool) -> some View {
return MaybeAnonPfpView(state: state, is_anon: is_anon, pubkey: event.pubkey, size: options.contains(.small_pfp) ? eventview_pfp_size(.small) : PFP_SIZE ) return MaybeAnonPfpView(state: state, is_anon: is_anon, pubkey: pubkey, size: options.contains(.small_pfp) ? eventview_pfp_size(.small) : PFP_SIZE )
} }
var Threaded: some View { var Threaded: some View {
@@ -56,7 +66,7 @@ struct EventShell<Content: View>: View {
} }
VStack(alignment: .leading) { VStack(alignment: .leading) {
EventTop(state: state, event: event, is_anon: is_anon) EventTop(state: state, event: event, pubkey: pubkey, is_anon: is_anon)
if !options.contains(.no_replying_to) { if !options.contains(.no_replying_to) {
ReplyPart(event: event, privkey: state.keypair.privkey, profiles: state.profiles) ReplyPart(event: event, privkey: state.keypair.privkey, profiles: state.profiles)
@@ -84,7 +94,7 @@ struct EventShell<Content: View>: View {
Pfp(is_anon: is_anon) Pfp(is_anon: is_anon)
VStack { VStack {
EventTop(state: state, event: event, is_anon: is_anon) EventTop(state: state, event: event, pubkey: pubkey, is_anon: is_anon)
ReplyPart(event: event, privkey: state.keypair.privkey, profiles: state.profiles) ReplyPart(event: event, privkey: state.keypair.privkey, profiles: state.profiles)
} }
} }

2
damus/Views/Events/TextEvent.swift
View File

@@ -39,7 +39,7 @@ struct TextEvent: View {
} }
var body: some View { var body: some View {
EventShell(state: damus, event: event, options: options) { EventShell(state: damus, event: event, pubkey: pubkey, options: options) {
EvBody(options: options) EvBody(options: options)
} }
} }