chore: do not make nostr pubkey unique

getAlby · Dec 24, 2024 · 8eebd41 · 8eebd41
1 parent 11c67a4
commit 8eebd41
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 21 deletions.
diff --git a/drizzle.config.ts b/drizzle.config.ts
@@ -1,5 +1,11 @@
 import { defineConfig } from "drizzle-kit";
-import { DATABASE_URL } from "./src/constants.ts";
+const DATABASE_URL = Deno.env.get("DATABASE_URL");
+
+if (!DATABASE_URL) {
+  console.log("no DATABASE_URL provided, exiting");
+  Deno.exit(1);
+}
+
 export default defineConfig({
   dialect: "postgresql",
   schema: "./src/db/schema.ts",

diff --git a/drizzle/0002_cloudy_nitro.sql b/drizzle/0002_cloudy_nitro.sql
@@ -0,0 +1 @@
+ALTER TABLE "users" ADD COLUMN "nostr_pubkey" text;
diff --git a/drizzle/0002_crazy_sauron.sql b/drizzle/0002_crazy_sauron.sql
diff --git a/drizzle/meta/0002_snapshot.json b/drizzle/meta/0002_snapshot.json
@@ -1,5 +1,5 @@
 {
-  "id": "0158a5e2-5076-4051-8e8d-2d382552344d",
+  "id": "b434562b-7a93-4c5f-992b-480f1ca2ed98",
   "prevId": "52607bd8-7a1a-4a34-ad27-91b78733e85c",
   "version": "7",
   "dialect": "postgresql",
@@ -187,13 +187,6 @@
           "columns": [
             "username"
           ]
-        },
-        "users_nostr_pubkey_unique": {
-          "name": "users_nostr_pubkey_unique",
-          "nullsNotDistinct": false,
-          "columns": [
-            "nostr_pubkey"
-          ]
         }
       }
     }

diff --git a/drizzle/meta/_journal.json b/drizzle/meta/_journal.json
@@ -19,8 +19,8 @@
     {
       "idx": 2,
       "version": "7",
-      "when": 1734078845730,
-      "tag": "0002_crazy_sauron",
+      "when": 1735019256440,
+      "tag": "0002_cloudy_nitro",
       "breakpoints": true
     }
   ]

diff --git a/src/db/schema.ts b/src/db/schema.ts
@@ -4,7 +4,7 @@ export const users = pgTable("users", {
   id: serial("id").primaryKey(),
   encryptedConnectionSecret: text("connection_secret").notNull(),
   username: text("username").unique().notNull(),
-  nostrPubkey: text("nostr_pubkey").unique(),
+  nostrPubkey: text("nostr_pubkey"),
   createdAt: timestamp("created_at").notNull().defaultNow(),
 });
 

diff --git a/src/users.ts b/src/users.ts
@@ -14,7 +14,7 @@ export function createUsersApp(db: DB, nwcPool: NWCPool) {
     try {
       logger.debug("create user", {});
 
-      const createUserRequest: { connectionSecret: string; username?: string, nostrPubkey?: string } =
+      const createUserRequest: { connectionSecret: string; username?: string, nostrPubkey: string } =
         await c.req.json();
 
       if (!createUserRequest.connectionSecret) {
@@ -49,12 +49,8 @@ export function createUsersApp(db: DB, nwcPool: NWCPool) {
       });
     } catch (error) {
       let reason = "" + error
-      if (error instanceof postgres.PostgresError) {
-        if (error.constraint_name === "users_username_unique") {
-          reason = "Username has already been taken"
-        } else if (error.constraint_name === "users_nostr_pubkey_unique") {
-          reason = "Nostr pubkey has already been taken"
-        }
+      if (error instanceof postgres.PostgresError && error.constraint_name === "users_username_unique") {
+        reason = "Username has already been taken"
       }
       return c.json({ status: "ERROR", reason });
     }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ALTER TABLE "users" ADD COLUMN "nostr_pubkey" text;