matt/flotilla
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Avoid decrypt errors

Browse source
This commit is contained in:
Jon Staab 2025-10-01 10:06:21 -07:00
parent 483fa81b74
commit b4058389ec
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/app/components/LogInBunker.svelte
View file

@ -32,9 +32,10 @@
onNostrConnect: async (response: Nip46ResponseWithResult) => { onNostrConnect: async (response: Nip46ResponseWithResult) => {
const pubkey = await controller.broker.getPublicKey() const pubkey = await controller.broker.getPublicKey()
loginWithNip46(pubkey, controller.clientSecret, response.event.pubkey, SIGNER_RELAYS)
await loadUserData(pubkey) await loadUserData(pubkey)
loginWithNip46(pubkey, controller.clientSecret, response.event.pubkey, SIGNER_RELAYS)
setChecked("*") setChecked("*")
clearModals() clearModals()
}, },

16
src/app/core/state.ts
View file

@ -395,9 +395,13 @@ export const alerts = withGetter(
filters: [{kinds: [ALERT_EMAIL, ALERT_WEB, ALERT_IOS, ALERT_ANDROID]}], filters: [{kinds: [ALERT_EMAIL, ALERT_WEB, ALERT_IOS, ALERT_ANDROID]}],
itemToEvent: item => item.event, itemToEvent: item => item.event,
eventToItem: async event => { eventToItem: async event => {
const tags = parseJson(await decrypt(signer.get(), NOTIFIER_PUBKEY, event.content)) const $signer = signer.get()
return {event, tags} if ($signer) {
const tags = parseJson(await decrypt($signer, NOTIFIER_PUBKEY, event.content))
return {event, tags}
}
}, },
}), }),
) )
@ -425,9 +429,13 @@ export const alertStatuses = withGetter(
filters: [{kinds: [ALERT_STATUS]}], filters: [{kinds: [ALERT_STATUS]}],
itemToEvent: item => item.event, itemToEvent: item => item.event,
eventToItem: async event => { eventToItem: async event => {
const tags = parseJson(await decrypt(signer.get(), NOTIFIER_PUBKEY, event.content)) const $signer = signer.get()
return {event, tags} if ($signer) {
const tags = parseJson(await decrypt($signer, NOTIFIER_PUBKEY, event.content))
return {event, tags}
}
}, },
}), }),
) )