fix: update user interface with new userattributes

wanderer-moe · Aug 3, 2023 · 32fc660 · 32fc660
1 parent 1354624
commit 32fc660
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 12 deletions.
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
@@ -135,19 +135,20 @@ model Assets {
 }
 
 model SavedOCGenerators {
-    id         Int    @id @default(autoincrement())
+    id         Int      @id @default(autoincrement())
     game       String
     data       String
-    user       User   @relation(fields: [user_id], references: [id], onDelete: Cascade)
+    user       User     @relation(fields: [user_id], references: [id], onDelete: Cascade)
     user_id    String
-    saved_date String
+    saved_date DateTime
 
     @@index([id])
     @@index([game])
     @@index([user_id])
     @@map("saved_oc_generators")
 }
 
+// tags enums
 enum AssetTagsName {
     OFFICIAL
     FANMADE

diff --git a/src/lib/types/user.ts b/src/lib/types/user.ts
@@ -1,12 +1,15 @@
 export interface User {
     id: string;
+    username: string;
+    username_colour: string | null;
     avatar_url: string | null;
     banner_url: string | null;
-    username: string;
-    username_colour: string;
-    bio: string | null;
+    email: string;
+    email_verified: number;
     pronouns: string | null;
     verified: number;
-    date_joined: string;
-    role: string;
+    bio: string | null;
+    role_flags: number;
+    self_assignable_role_flags: number;
+    date_joined: Date;
 }
diff --git a/src/lucia.d.ts b/src/lucia.d.ts
@@ -12,7 +12,7 @@ declare namespace Lucia {
         verified: number;
         bio: string | null;
         role_flags: number;
-        self_assignable_role_flags: number;
+        self_assignable_role_flags: number | null;
         date_joined: Date;
     };
     // type DatabaseSessionAttributes = {}

diff --git a/src/routes/auth/signup.ts b/src/routes/auth/signup.ts
@@ -34,7 +34,8 @@ export const signup = async (request: Request): Promise<Response> => {
             email_verified: 0,
             date_joined: new Date(),
             verified: 0,
-            role: "USER",
+            role_flags: 0,
+            self_assignable_role_flags: null,
             username_colour: null,
             avatar_url: null,
             banner_url: null,

diff --git a/src/routes/user/getUserByUsername.ts b/src/routes/user/getUserByUsername.ts
@@ -34,7 +34,8 @@ export const getUserByUsername = async (
         pronouns: row.pronouns || null,
         verified: row.verified,
         date_joined: row.date_joined,
-        roles: row.role,
+        role_flags: row.role_flags,
+        self_assignable_role_flags: row.self_assignable_role_flags || null,
     };
 
     const uploadedAssets = await db

diff --git a/src/routes/user/getUsersBySearch.ts b/src/routes/user/getUsersBySearch.ts
@@ -36,7 +36,7 @@ export const getUserBySearch = async (
             pronouns: user.pronouns || null,
             verified: user.verified,
             date_joined: user.date_joined,
-            roles: user.role,
+            role_flags: user.role_flags,
         };
     });