Skip to content

best way to save what you love

merge: 10.9 from main

wukko06bc51db54f6
diff --cc web/src/lib/api/api.ts
index e199f3e9,07829480..1eab6e24
--- a/web/src/lib/api/api.ts
+++ b/web/src/lib/api/api.ts
@@@ -1,8 -1,9 +1,8 @@@
import { get } from "svelte/store";
import settings from "$lib/state/settings";
-import lazySettingGetter from "$lib/settings/lazy-get";
- import { getSession } from "$lib/api/session";
+ import { getSession, resetSession } from "$lib/api/session";
import { currentApiURL } from "$lib/api/api-url";
import { turnstileEnabled, turnstileSolved } from "$lib/state/turnstile";
import cachedInfo from "$lib/state/server-info";
@@@ -42,7 -43,31 +42,7 @@@ const getAuthorization = async () =>
}
}
- const request = async (request: CobaltSaveRequestBody) => {
-const request = async (url: string, justRetried = false) => {
- const getSetting = lazySettingGetter(get(settings));
-
- const requestBody = {
- url,
-
- downloadMode: getSetting("save", "downloadMode"),
- audioBitrate: getSetting("save", "audioBitrate"),
- audioFormat: getSetting("save", "audioFormat"),
- tiktokFullAudio: getSetting("save", "tiktokFullAudio"),
- youtubeDubLang: getSetting("save", "youtubeDubLang"),
-
- youtubeVideoCodec: getSetting("save", "youtubeVideoCodec"),
- videoQuality: getSetting("save", "videoQuality"),
- youtubeHLS: getSetting("save", "youtubeHLS"),
-
- filenameStyle: getSetting("save", "filenameStyle"),
- disableMetadata: getSetting("save", "disableMetadata"),
-
- twitterGif: getSetting("save", "twitterGif"),
- tiktokH265: getSetting("save", "tiktokH265"),
-
- alwaysProxy: getSetting("privacy", "alwaysProxy"),
- }
-
++const request = async (requestBody: CobaltSaveRequestBody, justRetried = false) => {
await getServerInfo();
const getCachedInfo = get(cachedInfo);
@@@ -94,6 -119,16 +94,16 @@@
}
});
+ if (
+ response?.status === 'error'
+ && response?.error.code === 'error.api.auth.jwt.invalid'
+ && !justRetried
+ ) {
+ resetSession();
+ await waitForTurnstile().catch(() => {});
- return request(url, true);
++ return request(requestBody, true);
+ }
+
return response;
}