diff --git a/web/src/lib/api/api.ts b/web/src/lib/api/api.ts index bbe19710..c7cd6727 100644 --- a/web/src/lib/api/api.ts +++ b/web/src/lib/api/api.ts @@ -62,8 +62,8 @@ const request = async (url: string) => { filenameStyle: getSetting("save", "filenameStyle"), disableMetadata: getSetting("save", "disableMetadata"), - twitterGif: getSetting("save", "twitterGif"), - tiktokH265: getSetting("save", "tiktokH265"), + convertGif: getSetting("save", "convertGif"), + allowH265: getSetting("save", "allowH265"), alwaysProxy: getSetting("privacy", "alwaysProxy"), localProcessing: getSetting("advanced", "localProcessing"), diff --git a/web/src/lib/settings/defaults.ts b/web/src/lib/settings/defaults.ts index 88e64d58..1d18a3f6 100644 --- a/web/src/lib/settings/defaults.ts +++ b/web/src/lib/settings/defaults.ts @@ -21,9 +21,9 @@ const defaultSettings: CobaltSettings = { downloadMode: "auto", filenameStyle: "classic", savingMethod: "download", - tiktokH265: false, + allowH265: false, tiktokFullAudio: false, - twitterGif: true, + convertGif: true, videoQuality: "1080", youtubeVideoCodec: "h264", youtubeDubLang: "original", diff --git a/web/src/lib/settings/migrate.ts b/web/src/lib/settings/migrate.ts index 4054a0b4..12fc6fc4 100644 --- a/web/src/lib/settings/migrate.ts +++ b/web/src/lib/settings/migrate.ts @@ -1,9 +1,10 @@ import type { RecursivePartial } from "$lib/types/generic"; import type { + PartialSettings, AllPartialSettingsWithSchema, CobaltSettingsV3, CobaltSettingsV4, - PartialSettings, + CobaltSettingsV5, } from "$lib/types/settings"; import { getBrowserLanguage } from "$lib/settings/youtube-lang"; @@ -40,6 +41,24 @@ const migrations: Record = { return out as AllPartialSettingsWithSchema; }, + + [5]: (settings: AllPartialSettingsWithSchema) => { + const out = settings as RecursivePartial; + out.schemaVersion = 5; + + if (settings?.save) { + if ("tiktokH265" in settings.save) { + out.save!.allowH265 = settings.save.tiktokH265; + delete settings.save.tiktokH265; + } + if ("twitterGif" in settings.save) { + out.save!.convertGif = settings.save.twitterGif; + delete settings.save.twitterGif; + } + } + + return out as AllPartialSettingsWithSchema; + }, }; export const migrate = (settings: AllPartialSettingsWithSchema): PartialSettings => { diff --git a/web/src/lib/types/settings/v5.ts b/web/src/lib/types/settings/v5.ts index 2c50ef7d..184b1dbb 100644 --- a/web/src/lib/types/settings/v5.ts +++ b/web/src/lib/types/settings/v5.ts @@ -1,8 +1,12 @@ import { type CobaltSettingsV4 } from "$lib/types/settings/v4"; -export type CobaltSettingsV5 = Omit & { +export type CobaltSettingsV5 = Omit & { schemaVersion: 5, advanced: CobaltSettingsV4['advanced'] & { localProcessing: boolean; - }; + }, + save: Omit & { + allowH265: boolean; + convertGif: boolean; + }, }; diff --git a/web/src/routes/settings/video/+page.svelte b/web/src/routes/settings/video/+page.svelte index 88f9a5ca..233f0112 100644 --- a/web/src/routes/settings/video/+page.svelte +++ b/web/src/routes/settings/video/+page.svelte @@ -72,16 +72,16 @@ - +