From 1ca221ffc2320ad479e2fdb0cf86a2fa1212e705 Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Sat, 8 Apr 2023 17:35:29 +0200
Subject: [PATCH] fix stuff?

---
 packages/client/src/init.ts                    | 1 +
 packages/client/src/scripts/sound.ts           | 3 ++-
 packages/client/src/scripts/twemoji-base.ts    | 4 +++-
 packages/sw/src/scripts/create-notification.ts | 4 ++--
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/client/src/init.ts b/packages/client/src/init.ts
index 0f8d05ec52..a08b989758 100644
--- a/packages/client/src/init.ts
+++ b/packages/client/src/init.ts
@@ -24,6 +24,7 @@ const res = await Device.getInfo();
 		localStorage.setItem("lang", lang);
 		localStorage.setItem("locale", await lang_res.text());
 		localStorage.setItem("localeVersion", version);
+		document.location.href = '/';
 	}
 }
 
diff --git a/packages/client/src/scripts/sound.ts b/packages/client/src/scripts/sound.ts
index 84388b81ca..7558d7ea1a 100644
--- a/packages/client/src/scripts/sound.ts
+++ b/packages/client/src/scripts/sound.ts
@@ -1,3 +1,4 @@
+import { url } from "@/config";
 import { ColdDeviceStorage } from "@/store";
 
 const cache = new Map<string, HTMLAudioElement>();
@@ -7,7 +8,7 @@ export function getAudio(file: string, useCache = true): HTMLAudioElement {
 	if (useCache && cache.has(file)) {
 		audio = cache.get(file);
 	} else {
-		audio = new Audio(`/static-assets/sounds/${file}.mp3`);
+		audio = new Audio(`${url}+/static-assets/sounds/${file}.mp3`);
 		if (useCache) cache.set(file, audio);
 	}
 	return audio;
diff --git a/packages/client/src/scripts/twemoji-base.ts b/packages/client/src/scripts/twemoji-base.ts
index 0e45a527e2..599767c57a 100644
--- a/packages/client/src/scripts/twemoji-base.ts
+++ b/packages/client/src/scripts/twemoji-base.ts
@@ -1,4 +1,6 @@
-export const twemojiSvgBase = "/twemoji";
+import { url } from "@/config";
+
+export const twemojiSvgBase = `${url}/twemoji`;
 
 export function char2fileName(char: string): string {
 	let codes = Array.from(char).map((x) => x.codePointAt(0)?.toString(16));
diff --git a/packages/sw/src/scripts/create-notification.ts b/packages/sw/src/scripts/create-notification.ts
index 01b9ab5888..ee0e42735c 100644
--- a/packages/sw/src/scripts/create-notification.ts
+++ b/packages/sw/src/scripts/create-notification.ts
@@ -10,7 +10,7 @@ import getUserName from "@/scripts/get-user-name";
 import { I18n } from "@/scripts/i18n";
 import { getAccountFromId } from "@/scripts/get-account-from-id";
 import { char2fileName } from "@/scripts/twemoji-base";
-import * as url from "@/scripts/url";
+import * as urlObject from "@/scripts/url";
 
 const iconUrl = (name: string) =>
 	`/static-assets/notification-badges/${name}.png`;
@@ -178,7 +178,7 @@ async function composeNotification<K extends keyof pushNotificationDataMap>(
 								badge = u.href;
 							} else {
 								const dummy = `${u.host}${u.pathname}`; // 拡張子がないとキャッシュしてくれないCDNがあるので
-								badge = `${origin}/proxy/${dummy}?${url.query({
+								badge = `${origin}/proxy/${dummy}?${urlObject.query({
 									url: u.href,
 									badge: "1",
 								})}`;