From baebeed488b94be5ec93eaeadb7b8e4d03b691ea Mon Sep 17 00:00:00 2001
From: wukko <me@wukko.me>
Date: Sat, 23 Nov 2024 19:08:24 +0600
Subject: [PATCH] web/settings/v4: add api key settings, remove override
 settings

---
 web/src/lib/settings/defaults.ts |  6 +++---
 web/src/lib/types/settings.ts    | 14 ++++++++------
 web/src/lib/types/settings/v3.ts |  2 +-
 web/src/lib/types/settings/v4.ts |  9 +++++++++
 4 files changed, 21 insertions(+), 10 deletions(-)
 create mode 100644 web/src/lib/types/settings/v4.ts

diff --git a/web/src/lib/settings/defaults.ts b/web/src/lib/settings/defaults.ts
index e629a306..a4448aaa 100644
--- a/web/src/lib/settings/defaults.ts
+++ b/web/src/lib/settings/defaults.ts
@@ -2,7 +2,7 @@ import { defaultLocale } from "$lib/i18n/translations";
 import type { CobaltSettings } from "$lib/types/settings";
 
 const defaultSettings: CobaltSettings = {
-    schemaVersion: 3,
+    schemaVersion: 4,
     advanced: {
         debug: false,
     },
@@ -33,10 +33,10 @@ const defaultSettings: CobaltSettings = {
         disableAnalytics: false,
     },
     processing: {
-        allowDefaultOverride: false,
         customInstanceURL: "",
+        customApiKey: "",
         enableCustomInstances: false,
-        seenOverrideWarning: false,
+        enableCustomApiKey: false,
         seenCustomWarning: false,
     }
 }
diff --git a/web/src/lib/types/settings.ts b/web/src/lib/types/settings.ts
index fd9f31a5..93958e88 100644
--- a/web/src/lib/types/settings.ts
+++ b/web/src/lib/types/settings.ts
@@ -1,13 +1,15 @@
 import type { RecursivePartial } from "$lib/types/generic";
-import type { CobaltSettingsV2 } from "./settings/v2";
-import type { CobaltSettingsV3 } from "./settings/v3";
+import type { CobaltSettingsV2 } from "$lib/types/settings/v2";
+import type { CobaltSettingsV3 } from "$lib/types/settings/v3";
+import type { CobaltSettingsV4 } from "$lib/types/settings/v4";
 
-export * from "./settings/v2";
-export * from "./settings/v3";
+export * from "$lib/types/settings/v2";
+export * from "$lib/types/settings/v3";
+export * from "$lib/types/settings/v4";
 
-export type CobaltSettings = CobaltSettingsV3;
+export type CobaltSettings = CobaltSettingsV4;
 
-export type AnyCobaltSettings = CobaltSettingsV2 | CobaltSettings;
+export type AnyCobaltSettings = CobaltSettingsV3 | CobaltSettingsV2 | CobaltSettings;
 
 export type PartialSettings = RecursivePartial<CobaltSettings>;
 
diff --git a/web/src/lib/types/settings/v3.ts b/web/src/lib/types/settings/v3.ts
index fb376d8e..7d02f2da 100644
--- a/web/src/lib/types/settings/v3.ts
+++ b/web/src/lib/types/settings/v3.ts
@@ -1,5 +1,5 @@
 import type { YoutubeLang } from "$lib/settings/youtube-lang";
-import { type CobaltSettingsV2 } from "./v2";
+import { type CobaltSettingsV2 } from "$lib/types/settings/v2";
 
 export type CobaltSettingsV3 = Omit<CobaltSettingsV2, 'schemaVersion' | 'save'> & {
     schemaVersion: 3,
diff --git a/web/src/lib/types/settings/v4.ts b/web/src/lib/types/settings/v4.ts
new file mode 100644
index 00000000..cf27a0f2
--- /dev/null
+++ b/web/src/lib/types/settings/v4.ts
@@ -0,0 +1,9 @@
+import { type CobaltSettingsV3 } from "$lib/types/settings/v3";
+
+export type CobaltSettingsV4 = Omit<CobaltSettingsV3, 'schemaVersion' | 'processing'> & {
+    schemaVersion: 4,
+    processing: Omit<CobaltSettingsV3['processing'], 'allowDefaultOverride' | 'seenOverrideWarning'> & {
+        customApiKey: string;
+        enableCustomApiKey: boolean;
+    };
+};