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

Merge branch 'damus-io:master' into sidebar

Browse Source
This commit is contained in:
Ben Weeks
2023-01-07 22:15:11 +00:00
committed by GitHub
parent c6ca0a058e c10fcc52e3
commit 30151e14fa
5 changed files with 44 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
damus/Views/ChatroomView.swift
View File

@@ -24,7 +24,7 @@ struct ChatroomView: View {
next_ev: ind == count-1 ? nil : thread.events[ind+1],
damus_state: damus
)
.event_context_menu(ev, privkey: damus.keypair.privkey)
.event_context_menu(ev, pubkey: ev.pubkey, privkey: damus.keypair.privkey)
.onTapGesture {
if thread.initial_event.id == ev.id {
//dismiss()

2
damus/Views/DMChatView.swift
View File

@@ -19,7 +19,7 @@ struct DMChatView: View {
VStack(alignment: .leading) {
ForEach(Array(zip(dms.events, dms.events.indices)), id: \.0.id) { (ev, ind) in
DMView(event: dms.events[ind], damus_state: damus_state)
.event_context_menu(ev, privkey: damus_state.keypair.privkey)
.event_context_menu(ev, pubkey: ev.pubkey, privkey: damus_state.keypair.privkey)
}
EndBlock(height: 80)
}

6
damus/Views/EventView.swift
View File

@@ -274,7 +274,7 @@ struct EventView: View {
.id(event.id)
.frame(maxWidth: .infinity, minHeight: PFP_SIZE)
.padding([.bottom], 2)
.event_context_menu(event, privkey: damus.keypair.privkey)
.event_context_menu(event, pubkey: pubkey, privkey: damus.keypair.privkey)
}
}
@@ -313,7 +313,7 @@ extension View {
}
}
func event_context_menu(_ event: NostrEvent, privkey: String?) -> some View {
func event_context_menu(_ event: NostrEvent, pubkey: String, privkey: String?) -> some View {
return self.contextMenu {
Button {
UIPasteboard.general.string = event.get_content(privkey)
@@ -322,7 +322,7 @@ extension View {
}
Button {
UIPasteboard.general.string = bech32_pubkey(event.pubkey) ?? event.pubkey
UIPasteboard.general.string = bech32_pubkey(pubkey) ?? pubkey
} label: {
Label("Copy User ID", systemImage: "tag")
}