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

Fix bug with copying user pubkey

Browse Source 
Co-authored-by: William Casarin <jb55@jb55.com>
Changelog-Fixed: Fixed bug where copying pubkey from context menu only copied your own pubkey
Closes: #425
This commit is contained in:
Terry Yiu
2023-01-28 22:22:26 -05:00
committed by William Casarin
parent 49f64e7f49
commit bb6a09179e
7 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
damus/Models/DamusState.swift
View File

@@ -22,7 +22,7 @@ struct DamusState {
var pubkey: String { var pubkey: String {
return keypair.pubkey return keypair.pubkey
} }
var is_privkey_user: Bool { var is_privkey_user: Bool {
keypair.privkey != nil keypair.privkey != nil
} }

2
damus/Views/ChatroomView.swift
View File

@@ -24,7 +24,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, keypair: damus.keypair) .event_context_menu(ev, privkey: damus.keypair.privkey, pubkey: ev.pubkey)
.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, keypair: damus_state.keypair) .event_context_menu(ev, privkey: damus_state.keypair.privkey, pubkey: ev.pubkey)
} }
EndBlock(height: 80) EndBlock(height: 80)
} }

6
damus/Views/EventView.swift
View File

@@ -129,7 +129,7 @@ struct EventView: View {
.id(event.id) .id(event.id)
.frame(maxWidth: .infinity, minHeight: PFP_SIZE) .frame(maxWidth: .infinity, minHeight: PFP_SIZE)
.padding([.bottom], 2) .padding([.bottom], 2)
.event_context_menu(event, keypair: damus.keypair) .event_context_menu(event, privkey: damus.keypair.privkey, pubkey: pubkey)
} }
} }
@@ -171,9 +171,9 @@ extension View {
} }
} }
func event_context_menu(_ event: NostrEvent, keypair: Keypair) -> some View { func event_context_menu(_ event: NostrEvent, privkey: String?, pubkey: String) -> some View {
return self.contextMenu { return self.contextMenu {
EventMenuContext(event: event, keypair: keypair) EventMenuContext(event: event, privkey: privkey, pubkey: pubkey)
} }
} }

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

@@ -23,7 +23,7 @@ struct EmbeddedEventView: View {
EventBody(damus_state: damus_state, event: event, size: .small) EventBody(damus_state: damus_state, event: event, size: .small)
} }
.event_context_menu(event, keypair: damus_state.keypair) .event_context_menu(event, privkey: damus_state.keypair.privkey, pubkey: pubkey)
} }
} }

9
damus/Views/Events/EventMenu.swift
View File

@@ -9,18 +9,19 @@ import SwiftUI
struct EventMenuContext: View { struct EventMenuContext: View {
let event: NostrEvent let event: NostrEvent
let keypair: Keypair let privkey: String?
let pubkey: String
var body: some View { var body: some View {
Button { Button {
UIPasteboard.general.string = event.get_content(keypair.privkey) UIPasteboard.general.string = event.get_content(privkey)
} label: { } label: {
Label(NSLocalizedString("Copy Text", comment: "Context menu option for copying the text from an note."), systemImage: "doc.on.doc") Label(NSLocalizedString("Copy Text", comment: "Context menu option for copying the text from an note."), systemImage: "doc.on.doc")
} }
Button { Button {
UIPasteboard.general.string = keypair.pubkey_bech32 UIPasteboard.general.string = bech32_pubkey(event.pubkey)
} label: { } label: {
Label(NSLocalizedString("Copy User Pubkey", comment: "Context menu option for copying the ID of the user who created the note."), systemImage: "person") Label(NSLocalizedString("Copy User Pubkey", comment: "Context menu option for copying the ID of the user who created the note."), systemImage: "person")
} }
@@ -44,7 +45,7 @@ struct EventMenuContext: View {
} }
// Only allow reporting if logged in with private key and the currently viewed profile is not the logged in profile. // Only allow reporting if logged in with private key and the currently viewed profile is not the logged in profile.
if keypair.pubkey != event.pubkey && keypair.privkey != nil { if pubkey != event.pubkey && privkey != nil {
Button(role: .destructive) { Button(role: .destructive) {
let target: ReportTarget = .note(ReportNoteTarget(pubkey: event.pubkey, note_id: event.id)) let target: ReportTarget = .note(ReportNoteTarget(pubkey: event.pubkey, note_id: event.id))
notify(.report, target) notify(.report, target)

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

@@ -49,7 +49,7 @@ struct SelectedEventView: View {
.padding([.top], 4) .padding([.top], 4)
} }
.padding([.leading], 2) .padding([.leading], 2)
.event_context_menu(event, keypair: damus.keypair) .event_context_menu(event, privkey: damus.keypair.privkey, pubkey: event.pubkey)
} }
} }
} }