From 2c649e0fa61c727934dc540edac477c628294963 Mon Sep 17 00:00:00 2001 From: Siddharth Singh Date: Sat, 8 Jun 2024 00:26:36 +0530 Subject: [PATCH 1/3] support npubs in admin:role script --- scripts/admin-role.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/admin-role.ts b/scripts/admin-role.ts index 6e7bfc66..2a300a5d 100644 --- a/scripts/admin-role.ts +++ b/scripts/admin-role.ts @@ -5,11 +5,14 @@ import { Conf } from '@/config.ts'; import { AdminSigner } from '@/signers/AdminSigner.ts'; import { EventsDB } from '@/storages/EventsDB.ts'; import { nostrNow } from '@/utils.ts'; +import { nip19 } from 'nostr-tools'; const kysely = await DittoDB.getInstance(); const eventsDB = new EventsDB(kysely); -const [pubkey, role] = Deno.args; +const [pubkeyOrNpub, role] = Deno.args; +const pubkey = pubkeyOrNpub.startsWith('npub') ? + nip19.decode(pubkeyOrNpub).data as string : pubkeyOrNpub; if (!NSchema.id().safeParse(pubkey).success) { console.error('Invalid pubkey'); From 2380234deb7ff08a1eff8df056a95cb28cd35c8b Mon Sep 17 00:00:00 2001 From: Siddharth Singh Date: Sat, 8 Jun 2024 00:30:22 +0530 Subject: [PATCH 2/3] fmt --- .vscode/settings.json | 5 ++++- scripts/admin-role.ts | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 23baa765..7644e548 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,5 +2,8 @@ "deno.enable": true, "deno.lint": true, "editor.defaultFormatter": "denoland.vscode-deno", - "path-intellisense.extensionOnImport": true + "path-intellisense.extensionOnImport": true, + "[typescript]": { + "editor.defaultFormatter": "denoland.vscode-deno" + } } \ No newline at end of file diff --git a/scripts/admin-role.ts b/scripts/admin-role.ts index 2a300a5d..d4feda32 100644 --- a/scripts/admin-role.ts +++ b/scripts/admin-role.ts @@ -11,8 +11,7 @@ const kysely = await DittoDB.getInstance(); const eventsDB = new EventsDB(kysely); const [pubkeyOrNpub, role] = Deno.args; -const pubkey = pubkeyOrNpub.startsWith('npub') ? - nip19.decode(pubkeyOrNpub).data as string : pubkeyOrNpub; +const pubkey = pubkeyOrNpub.startsWith('npub') ? nip19.decode(pubkeyOrNpub).data as string : pubkeyOrNpub; if (!NSchema.id().safeParse(pubkey).success) { console.error('Invalid pubkey'); From cc14f2a54993a4d794ce9c1083cff127fcfb81bf Mon Sep 17 00:00:00 2001 From: Siddharth Singh Date: Fri, 14 Jun 2024 21:02:40 +0530 Subject: [PATCH 3/3] fix accidental vscode changes --- .vscode/settings.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 7644e548..23baa765 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,8 +2,5 @@ "deno.enable": true, "deno.lint": true, "editor.defaultFormatter": "denoland.vscode-deno", - "path-intellisense.extensionOnImport": true, - "[typescript]": { - "editor.defaultFormatter": "denoland.vscode-deno" - } + "path-intellisense.extensionOnImport": true } \ No newline at end of file