diff --git a/src/controllers/api/pleroma.ts b/src/controllers/api/pleroma.ts index 6960323..6e4c026 100644 --- a/src/controllers/api/pleroma.ts +++ b/src/controllers/api/pleroma.ts @@ -18,7 +18,7 @@ const frontendConfigController: AppController = async (c) => { }], { signal }); const configs = jsonSchema.pipe(z.array(configSchema)).catch([]).parse( - event?.content ? await new AdminSigner().nip04.decrypt(Conf.pubkey, event.content) : '', + event?.content ? await new AdminSigner().nip44.decrypt(Conf.pubkey, event.content) : '', ); const frontendConfig = configs.find(({ group, key }) => group === ':pleroma' && key === ':frontend_configurations'); @@ -47,7 +47,7 @@ const configController: AppController = async (c) => { }], { signal }); const configs = jsonSchema.pipe(z.array(configSchema)).catch([]).parse( - event?.content ? await new AdminSigner().nip04.decrypt(pubkey, event.content) : '', + event?.content ? await new AdminSigner().nip44.decrypt(pubkey, event.content) : '', ); return c.json({ configs, need_reboot: false }); @@ -66,7 +66,7 @@ const updateConfigController: AppController = async (c) => { }], { signal }); const configs = jsonSchema.pipe(z.array(configSchema)).catch([]).parse( - event?.content ? await await new AdminSigner().nip04.decrypt(pubkey, event.content) : '', + event?.content ? await await new AdminSigner().nip44.decrypt(pubkey, event.content) : '', ); const { configs: newConfigs } = z.object({ configs: z.array(configSchema) }).parse(await c.req.json()); @@ -82,7 +82,7 @@ const updateConfigController: AppController = async (c) => { await createAdminEvent({ kind: 30078, - content: await new AdminSigner().nip04.encrypt(pubkey, JSON.stringify(configs)), + content: await new AdminSigner().nip44.encrypt(pubkey, JSON.stringify(configs)), tags: [['d', 'pub.ditto.pleroma.config']], }, c); diff --git a/src/deps.ts b/src/deps.ts index 3e0cf0a..e543695 100644 --- a/src/deps.ts +++ b/src/deps.ts @@ -93,6 +93,6 @@ export { NSet, type NStore, type NStoreOpts, -} from 'https://gitlab.com/soapbox-pub/NSpec/-/raw/v0.1.0/mod.ts'; +} from 'https://gitlab.com/soapbox-pub/NSpec/-/raw/v0.3.0/mod.ts'; export type * as TypeFest from 'npm:type-fest@^4.3.0'; diff --git a/src/pipeline.ts b/src/pipeline.ts index ead0044..7186c21 100644 --- a/src/pipeline.ts +++ b/src/pipeline.ts @@ -197,7 +197,7 @@ async function payZap(event: DittoEvent, signal: AbortSignal) { const nwcRequestEvent = await signer.signEvent({ kind: 23194, - content: await signer.nip04.encrypt( + content: await signer.nip44.encrypt( event.pubkey, JSON.stringify({ method: 'pay_invoice', params: { invoice: pr } }), ), diff --git a/src/signers/APISigner.ts b/src/signers/APISigner.ts index cc4cde3..71af099 100644 --- a/src/signers/APISigner.ts +++ b/src/signers/APISigner.ts @@ -63,7 +63,7 @@ export class APISigner implements NostrSigner { createAdminEvent({ kind: 24133, - content: await new AdminSigner().nip04.encrypt( + content: await new AdminSigner().nip44.encrypt( pubkey, JSON.stringify({ id: messageId, @@ -93,7 +93,7 @@ export class APISigner implements NostrSigner { this.#c.req.raw.signal.addEventListener('abort', close); for await (const event of sub) { - const decrypted = await new AdminSigner().nip04.decrypt(event.pubkey, event.content); + const decrypted = await new AdminSigner().nip44.decrypt(event.pubkey, event.content); const result = jsonSchema .pipe(connectResponseSchema)