From d876a473f6c5099688555f5eb4fe31f85366784e Mon Sep 17 00:00:00 2001 From: Siddharth Singh Date: Sat, 31 Aug 2024 19:23:44 +0530 Subject: [PATCH] move headless stuff to tribes/ dir --- deno.json | 4 ++-- {scripts/headless => tribes}/setup.ts | 0 {scripts/headless => tribes}/uploader-config.ts | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) rename {scripts/headless => tribes}/setup.ts (100%) rename {scripts/headless => tribes}/uploader-config.ts (96%) diff --git a/deno.json b/deno.json index e7f75f63..4db64560 100644 --- a/deno.json +++ b/deno.json @@ -8,8 +8,8 @@ "db:export": "deno run -A scripts/db-export.ts", "db:import": "deno run -A scripts/db-import.ts", "db:migrate": "deno run -A scripts/db-migrate.ts", - "headless:setup": "deno run -A scripts/headless/setup.ts", - "headless:uploader-config": "deno run -A scripts/headless/uploader-config.ts", + "headless:setup": "deno run -A tribes/setup.ts", + "headless:uploader-config": "deno run -A tribes/uploader-config.ts", "nostr:pull": "deno run -A scripts/nostr-pull.ts", "debug": "deno run -A --inspect src/server.ts", "test": "deno test -A --junit-path=./deno-test.xml", diff --git a/scripts/headless/setup.ts b/tribes/setup.ts similarity index 100% rename from scripts/headless/setup.ts rename to tribes/setup.ts diff --git a/scripts/headless/uploader-config.ts b/tribes/uploader-config.ts similarity index 96% rename from scripts/headless/uploader-config.ts rename to tribes/uploader-config.ts index 080e7bf1..91921fa7 100644 --- a/scripts/headless/uploader-config.ts +++ b/tribes/uploader-config.ts @@ -63,11 +63,15 @@ export function parseUploaderConfig(cfg: string) { if (import.meta.main) { const vars: Record = {}; - const domain = await question('input', 'Instance domain? (eg ditto.pub)'); + const [domain] = Deno.args; if (!domain) { throw new Error('Domain is required!'); } + if (!domain.match(/^(https?):\/\/.+/)) { + throw new Error('Domain must begin with http(s)!'); + } + vars.DITTO_UPLOADER = await question('list', 'How do you want to upload files?', [ 'nostrbuild', 'blossom',