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

prisma/migrations/20240309180643_add_singlefile_archive_format/migration.sql

@@ -0,0 +1,8 @@
+-- AlterEnum
+ALTER TYPE "LinksRouteTo" ADD VALUE 'SINGLEFILE';
+
+-- AlterTable
+ALTER TABLE "User" ADD COLUMN     "archiveAsSinglefile" BOOLEAN NOT NULL DEFAULT false;
+
+-- AlterTable
+ALTER TABLE "Link" ADD COLUMN     "singlefile" text;

prisma/migrations/20240515084924_add_unverified_new_email_field_to_user_table/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "User" ADD COLUMN     "unverifiedNewEmail" TEXT;

prisma/migrations/20240518161814_added_password_reset_token_table/migration.sql

@@ -0,0 +1,11 @@
+-- CreateTable
+CREATE TABLE "PasswordResetToken" (
+    "identifier" TEXT NOT NULL,
+    "token" TEXT NOT NULL,
+    "expires" TIMESTAMP(3) NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "PasswordResetToken_token_key" ON "PasswordResetToken"("token");

prisma/migrations/20240525002215_add_default_value_to_link_name/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Link" ALTER COLUMN "name" SET DEFAULT '';

prisma/migrations/20240528194553_added_locale_field_for_users/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "User" ADD COLUMN     "locale" TEXT NOT NULL DEFAULT 'en';

prisma/migrations/20240626225737_add_new_field_to_access_tokens/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "AccessToken" ADD COLUMN     "isSession" BOOLEAN NOT NULL DEFAULT false;

prisma/migrations/20240628013747_rename_fields/migration.sql

@@ -0,0 +1,21 @@
+/*
+  Warnings:
+
+  - The values [SINGLEFILE] on the enum `LinksRouteTo` will be removed. If these variants are still used in the database, this will fail.
+  - You are about to drop the column `archiveAsSinglefile` on the `User` table. All the data in the column will be lost.
+
+*/
+-- AlterEnum
+BEGIN;
+CREATE TYPE "LinksRouteTo_new" AS ENUM ('ORIGINAL', 'PDF', 'READABLE', 'MONOLITH', 'SCREENSHOT');
+ALTER TABLE "User" ALTER COLUMN "linksRouteTo" DROP DEFAULT;
+ALTER TABLE "User" ALTER COLUMN "linksRouteTo" TYPE "LinksRouteTo_new" USING ("linksRouteTo"::text::"LinksRouteTo_new");
+ALTER TYPE "LinksRouteTo" RENAME TO "LinksRouteTo_old";
+ALTER TYPE "LinksRouteTo_new" RENAME TO "LinksRouteTo";
+DROP TYPE "LinksRouteTo_old";
+ALTER TABLE "User" ALTER COLUMN "linksRouteTo" SET DEFAULT 'ORIGINAL';
+COMMIT;
+
+-- AlterTable
+ALTER TABLE "User" DROP COLUMN "archiveAsSinglefile",
+ADD COLUMN     "archiveAsMonolith" BOOLEAN NOT NULL DEFAULT true;

prisma/migrations/20240628014129_rename_field/migration.sql

@@ -0,0 +1,9 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `singlefile` on the `Link` table. All the data in the column will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE "Link" DROP COLUMN "singlefile",
+ADD COLUMN     "monolith" TEXT;

prisma/migrations/20240819003838_add_icon_related_fields_to_link_and_collection_model/migration.sql

@@ -0,0 +1,8 @@
+-- AlterTable
+ALTER TABLE "Collection" ADD COLUMN     "icon" TEXT,
+ADD COLUMN     "iconWeight" TEXT;
+
+-- AlterTable
+ALTER TABLE "Link" ADD COLUMN     "color" TEXT,
+ADD COLUMN     "icon" TEXT,
+ADD COLUMN     "iconWeight" TEXT;

prisma/migrations/20240819005010_remove_collection_model_default_color/migration.sql

@@ -0,0 +1,3 @@
+-- AlterTable
+ALTER TABLE "Collection" ALTER COLUMN "color" DROP NOT NULL,
+ALTER COLUMN "color" DROP DEFAULT;

prisma/migrations/20240820230618_add_default_value_for_collection_color/migration.sql

@@ -0,0 +1,9 @@
+/*
+  Warnings:
+
+  - Made the column `color` on table `Collection` required. This step will fail if there are existing NULL values in that column.
+
+*/
+-- AlterTable
+ALTER TABLE "Collection" ALTER COLUMN "color" SET NOT NULL,
+ALTER COLUMN "color" SET DEFAULT '#0ea5e9';

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())