Merge remote-tracking branch 'upstream/dev' into tags-in-public-collection

prisma/schema.prisma

@@ -31,20 +31,23 @@ model User {
   username                String?               @unique
   email                   String?               @unique
   emailVerified           DateTime?
+  unverifiedNewEmail      String?
   image                   String?
-  accounts                Account[]
   password                String?
+  locale                  String                @default("en")
+  accounts                Account[]
   collections             Collection[]
   tags                    Tag[]
   pinnedLinks             Link[]
   collectionsJoined       UsersAndCollections[]
-  collectionOrder         Int[]                @default([])
+  collectionOrder         Int[]                 @default([])
   whitelistedUsers        WhitelistedUser[]
   accessTokens            AccessToken[]
   subscriptions           Subscription?
   linksRouteTo            LinksRouteTo          @default(ORIGINAL)
   preventDuplicateLinks   Boolean               @default(false)
   archiveAsScreenshot     Boolean               @default(true)
+  archiveAsMonolith       Boolean               @default(true)
   archiveAsPDF            Boolean               @default(true)
   archiveAsWaybackMachine Boolean               @default(false)
   isPrivate               Boolean               @default(false)
@@ -56,6 +59,7 @@ enum LinksRouteTo {
   ORIGINAL
   PDF
   READABLE
+  MONOLITH
   SCREENSHOT
 }
 
@@ -78,10 +82,20 @@ model VerificationToken {
   @@unique([identifier, token])
 }
 
+model PasswordResetToken {
+  identifier String
+  token      String   @unique
+  expires    DateTime
+  createdAt  DateTime @default(now())
+  updatedAt  DateTime @default(now()) @updatedAt
+}
+
 model Collection {
   id              Int                   @id @default(autoincrement())
   name            String
   description     String                @default("")
+  icon            String?
+  iconWeight      String?
   color           String                @default("#0ea5e9")
   parentId        Int?
   parent          Collection?           @relation("SubCollections", fields: [parentId], references: [id])
@@ -115,19 +129,23 @@ model UsersAndCollections {
 
 model Link {
   id            Int        @id @default(autoincrement())
-  name          String
+  name          String     @default("")
   type          String     @default("url")
   description   String     @default("")
   pinnedBy      User[]
   collection    Collection @relation(fields: [collectionId], references: [id])
   collectionId  Int
   tags          Tag[]
+  icon          String?
+  iconWeight    String?
+  color         String?
   url           String?
   textContent   String?
   preview       String?
   image         String?
   pdf           String?
   readable      String?
+  monolith      String?
   lastPreserved DateTime?
   importDate    DateTime?
   createdAt     DateTime   @default(now())
@@ -166,6 +184,7 @@ model AccessToken {
   userId     Int
   token      String    @unique
   revoked    Boolean   @default(false)
+  isSession  Boolean   @default(false)
   expires    DateTime
   lastUsedAt DateTime?
   createdAt  DateTime  @default(now())