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

DMs: copy decrypted text instead of raw content

Browse Source 
Changelog-Fixed: Copying text in DMs will now copy the decrypted text
Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
William Casarin
2022-07-21 15:51:44 -07:00
parent f2338dd646
commit 24c4d99f78
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
damus/Views/ChatroomView.swift
View File

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

2
damus/Views/DMChatView.swift
View File

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

6
damus/Views/EventView.swift
View File

@@ -143,15 +143,15 @@ struct EventView: View {
.id(event.id) .id(event.id)
.frame(minHeight: PFP_SIZE) .frame(minHeight: PFP_SIZE)
.padding([.bottom], 4) .padding([.bottom], 4)
.event_context_menu(event) .event_context_menu(event, privkey: damus.keypair.privkey)
} }
} }
extension View { extension View {
func event_context_menu(_ event: NostrEvent) -> some View { func event_context_menu(_ event: NostrEvent, privkey: String?) -> some View {
return self.contextMenu { return self.contextMenu {
Button { Button {
UIPasteboard.general.string = event.content UIPasteboard.general.string = event.get_content(privkey)
} label: { } label: {
Label("Copy Text", systemImage: "doc.on.doc") Label("Copy Text", systemImage: "doc.on.doc")
} }