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

refactor: ensure make_metadata_event has full keypair

Browse Source
This commit is contained in:
William Casarin
2023-05-10 11:41:17 -07:00
parent f068833c5e
commit baed6adf49
4 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
damus/ContentView.swift
View File

@@ -434,20 +434,15 @@ struct ContentView: View {
let hide = notif.object as! Bool let hide = notif.object as! Bool
home.filter_events() home.filter_events()
guard let damus_state else { guard let damus_state,
return let profile = damus_state.profiles.lookup(id: damus_state.pubkey),
} let keypair = damus_state.keypair.to_full()
else {
guard let profile = damus_state.profiles.lookup(id: damus_state.pubkey) else {
return return
} }
profile.reactions = !hide profile.reactions = !hide
let profile_ev = make_metadata_event(keypair: keypair, metadata: profile)
guard let profile_ev = make_metadata_event(keypair: damus_state.keypair, metadata: profile) else {
return
}
damus_state.postbox.send(profile_ev) damus_state.postbox.send(profile_ev)
} }
.alert(NSLocalizedString("Deleted Account", comment: "Alert message to indicate this is a deleted account"), isPresented: $is_deleted_account) { .alert(NSLocalizedString("Deleted Account", comment: "Alert message to indicate this is a deleted account"), isPresented: $is_deleted_account) {

8
damus/Nostr/NostrEvent.swift
View File

@@ -468,11 +468,7 @@ func make_first_contact_event(keypair: Keypair) -> NostrEvent? {
return ev return ev
} }
func make_metadata_event(keypair: Keypair, metadata: Profile) -> NostrEvent? { func make_metadata_event(keypair: FullKeypair, metadata: Profile) -> NostrEvent {
guard let privkey = keypair.privkey else {
return nil
}
let metadata_json = encode_json(metadata)! let metadata_json = encode_json(metadata)!
let ev = NostrEvent(content: metadata_json, let ev = NostrEvent(content: metadata_json,
pubkey: keypair.pubkey, pubkey: keypair.pubkey,
@@ -480,7 +476,7 @@ func make_metadata_event(keypair: Keypair, metadata: Profile) -> NostrEvent? {
tags: []) tags: [])
ev.calculate_id() ev.calculate_id()
ev.sign(privkey: privkey) ev.sign(privkey: keypair.privkey)
return ev return ev
} }

3
damus/Views/Profile/EditMetadataView.swift
View File

@@ -60,9 +60,10 @@ struct EditMetadataView: View {
func save() { func save() {
let profile = to_profile() let profile = to_profile()
guard let metadata_ev = make_metadata_event(keypair: damus_state.keypair, metadata: profile) else { guard let keypair = damus_state.keypair.to_full() else {
return return
} }
let metadata_ev = make_metadata_event(keypair: keypair, metadata: profile)
damus_state.postbox.send(metadata_ev) damus_state.postbox.send(metadata_ev)
} }

5
damus/Views/SaveKeysView.swift
View File

@@ -112,12 +112,13 @@ struct SaveKeysView: View {
switch wsev { switch wsev {
case .connected: case .connected:
let metadata = create_account_to_metadata(account) let metadata = create_account_to_metadata(account)
let metadata_ev = make_metadata_event(keypair: account.keypair, metadata: metadata)
let contacts_ev = make_first_contact_event(keypair: account.keypair) let contacts_ev = make_first_contact_event(keypair: account.keypair)
if let metadata_ev { if let keypair = account.keypair.to_full() {
let metadata_ev = make_metadata_event(keypair: keypair, metadata: metadata)
self.pool.send(.event(metadata_ev)) self.pool.send(.event(metadata_ev))
} }
if let contacts_ev { if let contacts_ev {
self.pool.send(.event(contacts_ev)) self.pool.send(.event(contacts_ev))
} }