From df4d040f1e382bdf094e93dabe5e207bedc20226 Mon Sep 17 00:00:00 2001
From: mattyatea <mattyacocacora0@gmail.com>
Date: Sat, 23 Sep 2023 09:31:01 +0900
Subject: [PATCH] 2023.9.0-beta.11-prismisskey.3

---
 packages/frontend/src/components/MkFollowButton.vue | 12 ++++++------
 packages/frontend/src/pages/settings/general.vue    |  2 ++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/frontend/src/components/MkFollowButton.vue b/packages/frontend/src/components/MkFollowButton.vue
index f64e0da737..4a81e8a7c7 100644
--- a/packages/frontend/src/components/MkFollowButton.vue
+++ b/packages/frontend/src/components/MkFollowButton.vue
@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 <template>
   <button
       class="_button"
-      :class="[$style.root, ,{ [$style.wait]: wait, [$style.active]: isFollowing || hasPendingFollowRequestFromYou,[$style.gamingDark]: gaming === 'dark' || isFollowing || hasPendingFollowRequestFromYou,[$style.gamingLight]: gaming === 'light' || isFollowing || hasPendingFollowRequestFromYou
+      :class="[$style.root, { [$style.wait]: wait, [$style.active]: isFollowing || hasPendingFollowRequestFromYou,[$style.gamingDark]: gaming === 'dark' && isFollowing || gaming === 'dark' && hasPendingFollowRequestFromYou,[$style.gamingLight]: gaming === 'light' && isFollowing || gaming === 'light' && hasPendingFollowRequestFromYou
 , [$style.full]: full, [$style.large]: large }]"
       :disabled="wait"
       @click="onClick"
@@ -13,33 +13,33 @@ SPDX-License-Identifier: AGPL-3.0-only
     <template v-if="!wait">
       <template v-if="hasPendingFollowRequestFromYou && user.isLocked">
         <span v-if="full"
-              :class="$style.text,{[$style.gamingDark]: gaming === 'dark',[$style.gamingLight]: gaming === 'light'} ">{{
+              :class="[$style.text,{[$style.gamingDark]: gaming === 'dark',[$style.gamingLight]: gaming === 'light',}]">{{
             i18n.ts.followRequestPending
           }}</span><i class="ti ti-hourglass-empty"></i>
       </template>
       <template v-else-if="hasPendingFollowRequestFromYou && !user.isLocked">
         <!-- つまりリモートフォローの場合。 -->
         <span v-if="full"
-              :class="$style.text,{[$style.gamingDark]: gaming === 'dark' ,[$style.gamingLight]: gaming === 'light'} ">{{
+              :class="[$style.text,{[$style.gamingDark]: gaming === 'dark',[$style.gamingLight]: gaming === 'light' }] ">{{
             i18n.ts.processing
           }}</span>
         <MkLoading :em="true" :colored="false"/>
       </template>
       <template v-else-if="isFollowing">
         <span v-if="full"
-              :class="$style.text,{[$style.gamingDark]: gaming === 'dark',[$style.gamingLight]: gaming === 'light' } ">{{
+              :class="[$style.text,{[$style.gamingDark]: gaming === 'dark',[$style.gamingLight]: gaming === 'light' }] ">{{
             i18n.ts.unfollow
           }}</span><i class="ti ti-minus"></i>
       </template>
       <template v-else-if="!isFollowing && user.isLocked">
         <span v-if="full"
-              :class="$style.text,{[$style.gamingDark]: gaming === 'dark' ,[$style.gamingLight]: gaming === 'light'} ">{{
+              :class="[$style.text,{[$style.gamingDark]: gaming === 'dark',[$style.gamingLight]: gaming === 'light' }]">{{
             i18n.ts.followRequest
           }}</span><i class="ti ti-plus"></i>
       </template>
       <template v-else-if="!isFollowing && !user.isLocked">
         <span v-if="full"
-              :class="$style.text,{[$style.gamingDark]: gaming === 'dark' ,[$style.gamingLight]: gaming === 'light'} ">{{
+              :class="[$style.text,{[$style.gamingDark]: gaming === 'dark',[$style.gamingLight]: gaming === 'light' }]">{{
             i18n.ts.follow
           }}</span><i class="ti ti-plus"></i>
       </template>
diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue
index 7644daa34b..1fbc31b15c 100644
--- a/packages/frontend/src/pages/settings/general.vue
+++ b/packages/frontend/src/pages/settings/general.vue
@@ -297,6 +297,8 @@ watch([
 	reactionsDisplaySize,
 	highlightSensitiveMedia,
 	keepScreenOn,
+	showMediaTimeline,
+	enableGamingMode
 ], async () => {
 	await reloadAsk();
 });