Merge branch 'master' into faster-heads

2 files changed, 6 insertions, 6 deletions

diff --git a/src/routes/profile/index.svelte b/src/routes/profile/index.svelte
index 477d359..4da4a8f 100644
--- a/src/routes/profile/index.svelte
+++ b/src/routes/profile/index.svelte
@@ -1,6 +1,6 @@
 <script lang="ts" context="module">
 	import type { Load } from '@sveltejs/kit'
-	import { API_URL } from '$lib/api'
+	import { fetchApi } from '$lib/api'
 	import type { AccountCustomization, AccountSchema, CleanUser, SessionSchema } from '$lib/APITypes'
 	import Head from '$lib/Head.svelte'
 	import Header from '$lib/Header.svelte'
@@ -9,7 +9,7 @@
 
 	export const load: Load = async ({ fetch, session }) => {
 		const sessionResponse: { session: SessionSchema | null; account: AccountSchema | null } | null =
-			await fetch(`${API_URL}accounts/session`, {
+			await fetchApi(`accounts/session`, fetch, {
 				method: 'POST',
 				headers: {
 					'Content-Type': 'application/json',
@@ -20,7 +20,7 @@
 			}).then(r => r.json())
 
 		const playerResponse = sessionResponse?.account
-			? await fetch(`${API_URL}player/${sessionResponse.account.minecraftUuid}`).then(r => r.json())
+			? await fetchApi(`player/${sessionResponse.account.minecraftUuid}`, fetch).then(r => r.json())
 			: null
 
 		// redirect to /login if the user is not logged in
diff --git a/src/routes/profile/update.ts b/src/routes/profile/update.ts
index 7946597..168cba8 100644
--- a/src/routes/profile/update.ts
+++ b/src/routes/profile/update.ts
@@ -1,4 +1,4 @@
-import { API_URL } from '$lib/api'
+import { fetchApi } from '$lib/api'
 import type { AccountSchema, SessionSchema } from '$lib/APITypes'
 import type { RequestHandler } from '@sveltejs/kit'
 import backgroundFileNames from '../../_backgrounds.json'
@@ -31,7 +31,7 @@ export const patch: RequestHandler = async ({ request, locals, platform }) => {
 	}
 	const data = await request.json()
 
-	const sessionResponse: { session: SessionSchema | null, account: AccountSchema | null } = await fetch(`${API_URL}accounts/session`, {
+	const sessionResponse: { session: SessionSchema | null, account: AccountSchema | null } = await fetchApi(`accounts/session`, fetch, {
 		method: 'POST',
 		headers: {
 			'Content-Type': 'application/json',
@@ -110,7 +110,7 @@ export const patch: RequestHandler = async ({ request, locals, platform }) => {
 		},
 	}
 
-	const response = await fetch(`${API_URL}accounts/update`, {
+	const response = await fetchApi(`accounts/update`, fetch, {
 		method: 'POST',
 		headers: {
 			'Content-Type': 'application/json',