Mirrors/cobalt
1
0
Fork 0
mirror of https://github.com/wukko/cobalt.git synced 2025-02-02 08:26:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

web: fix turnstile/server-info circular dependency

Browse source
This commit is contained in:
jj 2024-11-23 14:37:23 +00:00
parent d4044e3350
commit 326bc52f27
No known key found for this signature in database
6 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
web/src/components/misc/Turnstile.svelte
View file

@ -1,7 +1,7 @@
<script lang="ts"> <script lang="ts">
import { onMount } from "svelte"; import { onMount } from "svelte";
import { cachedInfo } from "$lib/api/server-info"; import cachedInfo from "$lib/state/server-info";
import { turnstileSolved, turnstileCreated } from "$lib/state/turnstile"; import { turnstileSolved, turnstileCreated } from "$lib/state/turnstile";
import turnstile from "$lib/api/turnstile"; import turnstile from "$lib/api/turnstile";

3
web/src/components/save/SupportedServices.svelte
View file

@ -1,6 +1,7 @@
<script lang="ts"> <script lang="ts">
import { t } from "$lib/i18n/translations"; import { t } from "$lib/i18n/translations";
import { getServerInfo, cachedInfo } from "$lib/api/server-info"; import { getServerInfo } from "$lib/api/server-info";
import cachedInfo from "$lib/state/server-info";
import Skeleton from "$components/misc/Skeleton.svelte"; import Skeleton from "$components/misc/Skeleton.svelte";
import IconPlus from "@tabler/icons-svelte/IconPlus.svelte"; import IconPlus from "@tabler/icons-svelte/IconPlus.svelte";

3
web/src/lib/api/api.ts
View file

@ -6,7 +6,8 @@ import lazySettingGetter from "$lib/settings/lazy-get";
import { getSession } from "$lib/api/session"; import { getSession } from "$lib/api/session";
import { currentApiURL } from "$lib/api/api-url"; import { currentApiURL } from "$lib/api/api-url";
import { turnstileEnabled, turnstileSolved } from "$lib/state/turnstile"; import { turnstileEnabled, turnstileSolved } from "$lib/state/turnstile";
import { cachedInfo, getServerInfo } from "$lib/api/server-info"; import cachedInfo from "$lib/state/server-info";
import { getServerInfo } from "$lib/api/server-info";
import type { Optional } from "$lib/types/generic"; import type { Optional } from "$lib/types/generic";
import type { CobaltAPIResponse, CobaltErrorResponse } from "$lib/types/api"; import type { CobaltAPIResponse, CobaltErrorResponse } from "$lib/types/api";

6
web/src/lib/api/server-info.ts
View file

@ -1,9 +1,9 @@
import { browser } from "$app/environment"; import { browser } from "$app/environment";
import { get, writable } from "svelte/store"; import { get } from "svelte/store";
import { currentApiURL } from "$lib/api/api-url"; import { currentApiURL } from "$lib/api/api-url";
import { turnstileCreated, turnstileEnabled, turnstileSolved } from "$lib/state/turnstile"; import { turnstileCreated, turnstileEnabled, turnstileSolved } from "$lib/state/turnstile";
import cachedInfo from "$lib/state/server-info";
import type { CobaltServerInfoResponse, CobaltErrorResponse, CobaltServerInfo } from "$lib/types/api"; import type { CobaltServerInfoResponse, CobaltErrorResponse, CobaltServerInfo } from "$lib/types/api";
export type CobaltServerInfoCache = { export type CobaltServerInfoCache = {
@ -11,8 +11,6 @@ export type CobaltServerInfoCache = {
origin: string, origin: string,
} }
export const cachedInfo = writable<CobaltServerInfoCache | undefined>();
const request = async () => { const request = async () => {
const apiEndpoint = `${currentApiURL()}/`; const apiEndpoint = `${currentApiURL()}/`;

4
web/src/lib/state/server-info.ts Normal file
View file

@ -0,0 +1,4 @@
import { writable } from "svelte/store";
import * as ServerInfo from "$lib/api/server-info";
export default writable<ServerInfo.CobaltServerInfoCache | undefined>();

2
web/src/lib/state/turnstile.ts
View file

@ -1,5 +1,5 @@
import settings from "$lib/state/settings"; import settings from "$lib/state/settings";
import { cachedInfo } from "$lib/api/server-info"; import cachedInfo from "$lib/state/server-info";
import { derived, writable } from "svelte/store"; import { derived, writable } from "svelte/store";
export const turnstileSolved = writable(false); export const turnstileSolved = writable(false);