ok, got something done

d3rpp-dev · Nov 7, 2024 · a0be2f9 · a0be2f9
1 parent f0b68c5
commit a0be2f9
Show file tree

Hide file tree

Showing 36 changed files with 849 additions and 1,023 deletions.
diff --git a/bun.lockb b/bun.lockb
diff --git a/drizzle/0000_quiet_iron_man.sql → drizzle/0000_salty_red_shift.sql b/drizzle/0000_quiet_iron_man.sql → drizzle/0000_salty_red_shift.sql
@@ -6,6 +6,7 @@ CREATE TABLE `email_addresses` (
 	FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON UPDATE no action ON DELETE cascade
 );
 --> statement-breakpoint
+CREATE UNIQUE INDEX `email_addresses_email_address_unique` ON `email_addresses` (`email_address`);--> statement-breakpoint
 CREATE TABLE `encrypted_blobs` (
 	`kid` text PRIMARY KEY NOT NULL,
 	`iv` blob NOT NULL,
@@ -17,15 +18,10 @@ CREATE TABLE `oauth_connections` (
 	`type` text NOT NULL,
 	`oauth_identifier` text NOT NULL,
 	`user_id` text NOT NULL,
+	`connection_user_name` text NOT NULL,
 	FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON UPDATE no action ON DELETE no action
 );
 --> statement-breakpoint
-CREATE TABLE `passwords` (
-	`user_id` text PRIMARY KEY NOT NULL,
-	`password_hash` text NOT NULL,
-	FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON UPDATE no action ON DELETE cascade
-);
---> statement-breakpoint
 CREATE TABLE `public_assets` (
 	`file_name` text PRIMARY KEY NOT NULL,
 	`type` text NOT NULL,
@@ -34,11 +30,19 @@ CREATE TABLE `public_assets` (
 --> statement-breakpoint
 CREATE TABLE `public_keys` (
 	`kid` text PRIMARY KEY NOT NULL,
+	`name` text NOT NULL,
 	`key` blob NOT NULL,
 	`key_owner` text NOT NULL,
 	FOREIGN KEY (`key_owner`) REFERENCES `users`(`id`) ON UPDATE no action ON DELETE cascade
 );
 --> statement-breakpoint
+CREATE UNIQUE INDEX `public_keys_key_unique` ON `public_keys` (`key`);--> statement-breakpoint
+CREATE TABLE `reserved_kids` (
+	`kid` text PRIMARY KEY NOT NULL,
+	`user` text NOT NULL,
+	FOREIGN KEY (`user`) REFERENCES `users`(`id`) ON UPDATE no action ON DELETE cascade
+);
+--> statement-breakpoint
 CREATE TABLE `sessions` (
 	`id` text NOT NULL,
 	`user_id` text NOT NULL,
@@ -57,6 +61,7 @@ CREATE TABLE `user_aliases` (
 	`id` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
 	`user_ref` text NOT NULL,
 	`alias_name` text NOT NULL,
+	`alias_timestamp` integer NOT NULL,
 	FOREIGN KEY (`user_ref`) REFERENCES `users`(`id`) ON UPDATE no action ON DELETE cascade
 );
 --> statement-breakpoint
@@ -68,6 +73,4 @@ CREATE TABLE `users` (
 	FOREIGN KEY (`profile_picture`) REFERENCES `public_assets`(`file_name`) ON UPDATE no action ON DELETE no action
 );
 --> statement-breakpoint
-CREATE UNIQUE INDEX `email_addresses_email_address_unique` ON `email_addresses` (`email_address`);--> statement-breakpoint
-CREATE UNIQUE INDEX `public_keys_key_unique` ON `public_keys` (`key`);--> statement-breakpoint
 CREATE UNIQUE INDEX `users_username_unique` ON `users` (`username`);
diff --git a/drizzle/0001_noisy_lady_deathstrike.sql b/drizzle/0001_noisy_lady_deathstrike.sql
diff --git a/drizzle/meta/0000_snapshot.json b/drizzle/meta/0000_snapshot.json
@@ -1,7 +1,7 @@
 {
 	"version": "6",
 	"dialect": "sqlite",
-	"id": "818c640b-29b0-4c20-8eb8-191759e45ae4",
+	"id": "50492699-bfc7-4f37-ac2f-b2bdb3cb7e8d",
 	"prevId": "00000000-0000-0000-0000-000000000000",
 	"tables": {
 		"email_addresses": {
@@ -56,7 +56,8 @@
 				}
 			},
 			"compositePrimaryKeys": {},
-			"uniqueConstraints": {}
+			"uniqueConstraints": {},
+			"checkConstraints": {}
 		},
 		"encrypted_blobs": {
 			"name": "encrypted_blobs",
@@ -96,7 +97,8 @@
 				}
 			},
 			"compositePrimaryKeys": {},
-			"uniqueConstraints": {}
+			"uniqueConstraints": {},
+			"checkConstraints": {}
 		},
 		"oauth_connections": {
 			"name": "oauth_connections",
@@ -121,35 +123,9 @@
 					"primaryKey": false,
 					"notNull": true,
 					"autoincrement": false
-				}
-			},
-			"indexes": {},
-			"foreignKeys": {
-				"oauth_connections_user_id_users_id_fk": {
-					"name": "oauth_connections_user_id_users_id_fk",
-					"tableFrom": "oauth_connections",
-					"tableTo": "users",
-					"columnsFrom": ["user_id"],
-					"columnsTo": ["id"],
-					"onDelete": "no action",
-					"onUpdate": "no action"
-				}
-			},
-			"compositePrimaryKeys": {},
-			"uniqueConstraints": {}
-		},
-		"passwords": {
-			"name": "passwords",
-			"columns": {
-				"user_id": {
-					"name": "user_id",
-					"type": "text",
-					"primaryKey": true,
-					"notNull": true,
-					"autoincrement": false
 				},
-				"password_hash": {
-					"name": "password_hash",
+				"connection_user_name": {
+					"name": "connection_user_name",
 					"type": "text",
 					"primaryKey": false,
 					"notNull": true,
@@ -158,18 +134,19 @@
 			},
 			"indexes": {},
 			"foreignKeys": {
-				"passwords_user_id_users_id_fk": {
-					"name": "passwords_user_id_users_id_fk",
-					"tableFrom": "passwords",
+				"oauth_connections_user_id_users_id_fk": {
+					"name": "oauth_connections_user_id_users_id_fk",
+					"tableFrom": "oauth_connections",
 					"tableTo": "users",
 					"columnsFrom": ["user_id"],
 					"columnsTo": ["id"],
-					"onDelete": "cascade",
+					"onDelete": "no action",
 					"onUpdate": "no action"
 				}
 			},
 			"compositePrimaryKeys": {},
-			"uniqueConstraints": {}
+			"uniqueConstraints": {},
+			"checkConstraints": {}
 		},
 		"public_assets": {
 			"name": "public_assets",
@@ -199,7 +176,8 @@
 			"indexes": {},
 			"foreignKeys": {},
 			"compositePrimaryKeys": {},
-			"uniqueConstraints": {}
+			"uniqueConstraints": {},
+			"checkConstraints": {}
 		},
 		"public_keys": {
 			"name": "public_keys",
@@ -211,6 +189,13 @@
 					"notNull": true,
 					"autoincrement": false
 				},
+				"name": {
+					"name": "name",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				},
 				"key": {
 					"name": "key",
 					"type": "blob",
@@ -245,7 +230,42 @@
 				}
 			},
 			"compositePrimaryKeys": {},
-			"uniqueConstraints": {}
+			"uniqueConstraints": {},
+			"checkConstraints": {}
+		},
+		"reserved_kids": {
+			"name": "reserved_kids",
+			"columns": {
+				"kid": {
+					"name": "kid",
+					"type": "text",
+					"primaryKey": true,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"user": {
+					"name": "user",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				}
+			},
+			"indexes": {},
+			"foreignKeys": {
+				"reserved_kids_user_users_id_fk": {
+					"name": "reserved_kids_user_users_id_fk",
+					"tableFrom": "reserved_kids",
+					"tableTo": "users",
+					"columnsFrom": ["user"],
+					"columnsTo": ["id"],
+					"onDelete": "cascade",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {},
+			"uniqueConstraints": {},
+			"checkConstraints": {}
 		},
 		"sessions": {
 			"name": "sessions",
@@ -285,7 +305,8 @@
 				}
 			},
 			"compositePrimaryKeys": {},
-			"uniqueConstraints": {}
+			"uniqueConstraints": {},
+			"checkConstraints": {}
 		},
 		"symmetric_keys": {
 			"name": "symmetric_keys",
@@ -325,7 +346,8 @@
 				}
 			},
 			"compositePrimaryKeys": {},
-			"uniqueConstraints": {}
+			"uniqueConstraints": {},
+			"checkConstraints": {}
 		},
 		"user_aliases": {
 			"name": "user_aliases",
@@ -350,6 +372,13 @@
 					"primaryKey": false,
 					"notNull": true,
 					"autoincrement": false
+				},
+				"alias_timestamp": {
+					"name": "alias_timestamp",
+					"type": "integer",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
 				}
 			},
 			"indexes": {},
@@ -365,7 +394,8 @@
 				}
 			},
 			"compositePrimaryKeys": {},
-			"uniqueConstraints": {}
+			"uniqueConstraints": {},
+			"checkConstraints": {}
 		},
 		"users": {
 			"name": "users",
@@ -418,9 +448,11 @@
 				}
 			},
 			"compositePrimaryKeys": {},
-			"uniqueConstraints": {}
+			"uniqueConstraints": {},
+			"checkConstraints": {}
 		}
 	},
+	"views": {},
 	"enums": {},
 	"_meta": {
 		"schemas": {},