From 326bc52f277c3e12f311c27b36f2956d6d283de7 Mon Sep 17 00:00:00 2001
From: jj <log@riseup.net>
Date: Sat, 23 Nov 2024 14:37:23 +0000
Subject: [PATCH] web: fix turnstile/server-info circular dependency

---
 web/src/components/misc/Turnstile.svelte         | 2 +-
 web/src/components/save/SupportedServices.svelte | 3 ++-
 web/src/lib/api/api.ts                           | 3 ++-
 web/src/lib/api/server-info.ts                   | 6 ++----
 web/src/lib/state/server-info.ts                 | 4 ++++
 web/src/lib/state/turnstile.ts                   | 2 +-
 6 files changed, 12 insertions(+), 8 deletions(-)
 create mode 100644 web/src/lib/state/server-info.ts

diff --git a/web/src/components/misc/Turnstile.svelte b/web/src/components/misc/Turnstile.svelte
index adedb0ee..96daf18e 100644
--- a/web/src/components/misc/Turnstile.svelte
+++ b/web/src/components/misc/Turnstile.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     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 turnstile from "$lib/api/turnstile";
diff --git a/web/src/components/save/SupportedServices.svelte b/web/src/components/save/SupportedServices.svelte
index 099fefa6..32129f20 100644
--- a/web/src/components/save/SupportedServices.svelte
+++ b/web/src/components/save/SupportedServices.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
     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 IconPlus from "@tabler/icons-svelte/IconPlus.svelte";
diff --git a/web/src/lib/api/api.ts b/web/src/lib/api/api.ts
index 0f2d5b9f..d8424a00 100644
--- a/web/src/lib/api/api.ts
+++ b/web/src/lib/api/api.ts
@@ -6,7 +6,8 @@ import lazySettingGetter from "$lib/settings/lazy-get";
 import { getSession } from "$lib/api/session";
 import { currentApiURL } from "$lib/api/api-url";
 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 { CobaltAPIResponse, CobaltErrorResponse } from "$lib/types/api";
diff --git a/web/src/lib/api/server-info.ts b/web/src/lib/api/server-info.ts
index c0ceee31..0b905fc3 100644
--- a/web/src/lib/api/server-info.ts
+++ b/web/src/lib/api/server-info.ts
@@ -1,9 +1,9 @@
 import { browser } from "$app/environment";
 
-import { get, writable } from "svelte/store";
+import { get } from "svelte/store";
 import { currentApiURL } from "$lib/api/api-url";
 import { turnstileCreated, turnstileEnabled, turnstileSolved } from "$lib/state/turnstile";
-
+import cachedInfo from "$lib/state/server-info";
 import type { CobaltServerInfoResponse, CobaltErrorResponse, CobaltServerInfo } from "$lib/types/api";
 
 export type CobaltServerInfoCache = {
@@ -11,8 +11,6 @@ export type CobaltServerInfoCache = {
     origin: string,
 }
 
-export const cachedInfo = writable<CobaltServerInfoCache | undefined>();
-
 const request = async () => {
     const apiEndpoint = `${currentApiURL()}/`;
 
diff --git a/web/src/lib/state/server-info.ts b/web/src/lib/state/server-info.ts
new file mode 100644
index 00000000..821d1433
--- /dev/null
+++ b/web/src/lib/state/server-info.ts
@@ -0,0 +1,4 @@
+import { writable } from "svelte/store";
+import * as ServerInfo from "$lib/api/server-info";
+
+export default writable<ServerInfo.CobaltServerInfoCache | undefined>();
diff --git a/web/src/lib/state/turnstile.ts b/web/src/lib/state/turnstile.ts
index fffd90da..9024247d 100644
--- a/web/src/lib/state/turnstile.ts
+++ b/web/src/lib/state/turnstile.ts
@@ -1,5 +1,5 @@
 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";
 
 export const turnstileSolved = writable(false);