From d9cc8cc7c2e2164b20aac9cbcddc12cefd431af4 Mon Sep 17 00:00:00 2001 From: "P. Reis" Date: Fri, 15 Nov 2024 11:20:10 -0300 Subject: [PATCH] refactor(updateInstanceController): move async function out of callback --- src/controllers/api/ditto.ts | 5 +++-- src/utils/api.ts | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/controllers/api/ditto.ts b/src/controllers/api/ditto.ts index e756ffa8..708e6ece 100644 --- a/src/controllers/api/ditto.ts +++ b/src/controllers/api/ditto.ts @@ -311,10 +311,11 @@ export const updateInstanceController: AppController = async (c) => { return c.json(result.error, 422); } + const meta = await getInstanceMetadata(await Storages.db(), c.req.raw.signal); + await updateAdminEvent( { kinds: [0], authors: [pubkey], limit: 1 }, - async (_) => { - const meta = await getInstanceMetadata(await Storages.db(), c.req.raw.signal); + (_) => { const { title, description, diff --git a/src/utils/api.ts b/src/utils/api.ts index 7d1e2122..e7766979 100644 --- a/src/utils/api.ts +++ b/src/utils/api.ts @@ -111,12 +111,12 @@ function updateListAdminEvent( /** Fetch existing event, update it, then publish the new admin event. */ async function updateAdminEvent( filter: UpdateEventFilter, - fn: (prev: NostrEvent | undefined) => E | Promise, + fn: (prev: NostrEvent | undefined) => E, c: AppContext, ): Promise { const store = await Storages.db(); const [prev] = await store.query([filter], { limit: 1, signal: c.req.raw.signal }); - return createAdminEvent(await fn(prev), c); + return createAdminEvent(fn(prev), c); } function updateUser(pubkey: string, n: Record, c: AppContext): Promise {