From 4e3aacc113327c591c5979d133b0d50d1045b6d2 Mon Sep 17 00:00:00 2001
From: mattyatea <mattyacocacora0@gmail.com>
Date: Sun, 19 Nov 2023 17:55:34 +0900
Subject: [PATCH] bug fix

---
 packages/frontend/src/components/MkMenu.vue     |  4 ++--
 packages/frontend/src/components/MkSwitch.vue   |  8 +++++---
 packages/frontend/src/components/MkTimeline.vue | 13 +++++++------
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/packages/frontend/src/components/MkMenu.vue b/packages/frontend/src/components/MkMenu.vue
index 7cbe98d830..96e6d34be1 100644
--- a/packages/frontend/src/components/MkMenu.vue
+++ b/packages/frontend/src/components/MkMenu.vue
@@ -36,7 +36,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<span v-if="item.indicate" :class="$style.indicator"><i class="_indicatorCircle"></i></span>
 			</button>
 			<button v-else-if="item.type === 'switch'" role="menuitemcheckbox" :tabindex="i" class="_button" :class="[$style.item, $style.switch, { [$style.switchDisabled]: item.disabled } , {  [$style.gamingDark]: gamingType === 'dark',[$style.gamingLight]: gamingType === 'light' }]" @click="switchItem(item)" @mouseenter.passive="onItemMouseEnter(item)" @mouseleave.passive="onItemMouseLeave(item)">
-				<MkSwitchButton :class="$style.switchButton" :checked="item.ref" :disabled="item.disabled" @toggle="switchItem(item)"/>
+                <MkSwitchButton :class="$style.switchButton" :checked="item.ref" :disabled="item.disabled" @toggle="switchItem(item)" model-value/>
 				<span :class="$style.switchText">{{ item.text }}</span>
 			</button>
 			<button v-else-if="item.type === 'parent'" class="_button" role="menuitem" :tabindex="i" :class="[$style.item, $style.parent, { [$style.childShowing]: childShowingItem === item } , {  [$style.gamingDark]: gamingType === 'dark',[$style.gamingLight]: gamingType === 'light' }]" @mouseenter="preferClick ? null : showChildren(item, $event)" @click="!preferClick ? null : showChildren(item, $event)">
@@ -69,7 +69,7 @@ import * as os from '@/os.js';
 import { i18n } from '@/i18n.js';
 import { isTouchUsing } from '@/scripts/touch.js';
 import {defaultStore} from '@/store.js'
-
+import MkSwitchButton from '@/components/MkSwitch.button.vue';
 let gamingType = computed(defaultStore.makeGetterSetter('gamingType'));
 
 const childrenCache = new WeakMap<MenuParent, MenuItem[]>();
diff --git a/packages/frontend/src/components/MkSwitch.vue b/packages/frontend/src/components/MkSwitch.vue
index db71f010e7..1ad6ac1040 100644
--- a/packages/frontend/src/components/MkSwitch.vue
+++ b/packages/frontend/src/components/MkSwitch.vue
@@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<div :class="[$style.root, { [$style.disabled]: disabled && gamingType === '', [$style.checked]: checked && gamingType === '' }]">
+<div :class="[$style.root, { [$style.disabled]: disabled , [$style.checked]: checked }]">
 	<input
 		ref="input"
 		type="checkbox"
@@ -13,7 +13,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		@keydown.enter="toggle"
 	>
 	<XButton :checked="checked" :disabled="disabled" @toggle="toggle"/>
-	<span :class="$style.body,{[$style.gamingDark]: gamingType === 'dark',[$style.gamingLight]: gamingType === 'light'}">
+	<span :class="[$style.body,{[$style.gamingDark]: gamingType === 'dark',[$style.gamingLight]: gamingType === 'light'}]">
 		<!-- TODO: 無名slotの方は廃止 -->
 		<span :class="$style.label">
 			<span @click="toggle">
@@ -30,7 +30,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 import {toRefs, Ref, ref, computed, watch} from 'vue';
 import XButton from '@/components/MkSwitch.button.vue';
 import {defaultStore} from "@/store.js";
-let gamingType = computed(defaultStore.makeGetterSetter('gamingType'));
+const gamingType = computed(defaultStore.makeGetterSetter('gamingType'));
+
+console.log(gamingType.value)
 
 const props = defineProps<{
 	modelValue: boolean | Ref<boolean>;
diff --git a/packages/frontend/src/components/MkTimeline.vue b/packages/frontend/src/components/MkTimeline.vue
index e45cf2f34f..34089096d9 100644
--- a/packages/frontend/src/components/MkTimeline.vue
+++ b/packages/frontend/src/components/MkTimeline.vue
@@ -107,12 +107,6 @@ function connectChannel() {
 			withFiles: props.onlyFiles ? true : undefined,
 		});
 	} else if (props.src === 'media') {
-		endpoint = 'notes/hybrid-timeline';
-		query = {
-			withFiles: true,
-			withRenotes: props.withRenotes,
-			withReplies: props.withReplies,
-		};
 		connection = stream.useChannel('hybridTimeline', {
 			withFiles: true,
 			withRenotes: props.withRenotes,
@@ -198,6 +192,13 @@ function updatePaginationQuery() {
 			withRenotes: props.withRenotes,
 			withFiles: props.onlyFiles ? true : undefined,
 		};
+	}else if(props.src === 'media'){
+		endpoint = 'notes/hybrid-timeline';
+		query = {
+			withFiles: true,
+			withRenotes: props.withRenotes,
+			withReplies: props.withReplies,
+		};
 	} else if (props.src === 'mentions') {
 		endpoint = 'notes/mentions';
 		query = null;