fix tl behavior

HanaMisskey · Aug 15, 2024 · f6fa88d · f6fa88d
1 parent bccd3dc
commit f6fa88d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/packages/frontend/src/pages/timeline.vue b/packages/frontend/src/pages/timeline.vue
@@ -34,7 +34,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { computed, watch, provide, shallowRef, ref } from 'vue';
+import { computed, watch, provide, shallowRef, ref, onActivated, onMounted } from 'vue';
 import type { Tab } from '@/components/global/MkPageHeader.tabs.vue';
 import MkTimeline from '@/components/MkTimeline.vue';
 import MkInfo from '@/components/MkInfo.vue';
@@ -236,6 +236,22 @@ function closeTutorial(): void {
 	defaultStore.set('timelineTutorials', before);
 }
 
+function switchTlIfNeeded() {
+	function isNotInList(src: 'hanami' | 'home' | 'local' | 'social' | 'global' | `list:${string}`): src is Exclude<typeof src, `list:${string}`> {
+		return !src.startsWith('list:');
+	}
+	if (isNotInList(src.value) && !availableBasicTimelines().includes(src.value)) {
+		src.value = availableBasicTimelines()[0];
+	}
+}
+
+onMounted(() => {
+	switchTlIfNeeded();
+});
+onActivated(() => {
+	switchTlIfNeeded();
+});
+
 const headerActions = computed(() => {
 	const tmp = [
 		{

diff --git a/packages/frontend/src/timelines.ts b/packages/frontend/src/timelines.ts
@@ -7,8 +7,8 @@ import { $i } from '@/account.js';
 import { instance } from '@/instance.js';
 
 export const basicTimelineTypes = [
-	'hanami',
 	'home',
+	'hanami',
 	'local',
 	'social',
 	'global',
@@ -40,9 +40,9 @@ export function isAvailableBasicTimeline(timeline: BasicTimelineType | undefined
 		case 'home':
 			return $i != null;
 		case 'hanami':
-			return $i != null && $i.policies.hanamiTlAvailable;
+			return $i != null && $i.policies.hanamiTlAvailable && $i.isInHanaMode === true;
 		case 'local':
-			return ($i == null && instance.policies.ltlAvailable) || ($i != null && $i.policies.ltlAvailable);
+			return ($i == null && instance.policies.ltlAvailable) || ($i != null && $i.policies.ltlAvailable && !$i.isInHanaMode);
 		case 'social':
 			return $i != null && $i.policies.ltlAvailable;
 		case 'global':