From 86ac338ca3d6b28ac8a60c72b0227c93f6fe68e0 Mon Sep 17 00:00:00 2001
From: Aira Sakuranomiya <aira@aira.cafe>
Date: Thu, 2 Nov 2023 00:13:51 +0800
Subject: [PATCH] :art: Use navigateTo

---
 layouts/settings.vue  |  2 +-
 layouts/user-page.vue |  2 +-
 utils/router.ts       | 12 ------------
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/layouts/settings.vue b/layouts/settings.vue
index e88022cd..8f697606 100755
--- a/layouts/settings.vue
+++ b/layouts/settings.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 	const currentSetting = computed({
 		get: () => currentSettingsPage(),
-		set: async id => { await forceNavigate(`/settings/${id}`, () => currentSetting.value === id); },
+		set: async id => { await navigateTo(`/settings/${id}`); },
 	});
 	const search = ref("");
 	const main = ref<HTMLElement>();
diff --git a/layouts/user-page.vue b/layouts/user-page.vue
index b03dba62..28b2c078 100644
--- a/layouts/user-page.vue
+++ b/layouts/user-page.vue
@@ -46,7 +46,7 @@
 	});
 	const currentTab = computed({
 		get: () => currentUserTab(),
-		set: async id => { await forceNavigate(`/user/${uid}/${id}`, () => currentTab.value === id); },
+		set: async id => { await navigateTo(`/user/${uid}/${id}`); },
 	});
 
 	useHead({ title: user.value?.username ? t.user_page.title_affix(user.value.username) : undefined });
diff --git a/utils/router.ts b/utils/router.ts
index 3e4b4966..c04d04df 100755
--- a/utils/router.ts
+++ b/utils/router.ts
@@ -74,18 +74,6 @@ export function navigate(path: string) {
 	useRouter().push(useLocalePath()(path));
 }
 
-/**
- * 强制导航到页面，如果没有导航到该页面，则再次发起请求，直到导航到该页面为止。
- * @param path - 路由地址。
- * @param until - 确认已导航到该页面？
- */
-export async function forceNavigate(path: string, until: () => boolean) {
-	while (!until()) {
-		navigate(path);
-		await delay(50); // 解决有可能会跳转失败的问题。
-	}
-}
-
 /**
  * 切换语言。
  * @param lang - 语言代码。