From 1c21cb4d82147c505385fa7f45d77cd8dda8f48e Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Mon, 18 Jul 2022 05:08:13 +0900
Subject: [PATCH 01/13] lint fix

---
 packages/client/src/pages/registry.value.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/pages/registry.value.vue b/packages/client/src/pages/registry.value.vue
index 34253cc93b..9deb31e4a4 100644
--- a/packages/client/src/pages/registry.value.vue
+++ b/packages/client/src/pages/registry.value.vue
@@ -74,7 +74,7 @@ function fetchValue() {
 async function save() {
 	try {
 		JSON5.parse(valueForEditor);
-	} catch (e) {
+	} catch (err) {
 		os.alert({
 			type: 'error',
 			text: i18n.ts.invalidValue,

From b3b0a960afb69d72246b56748fffc1a39363a9c6 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Mon, 18 Jul 2022 18:41:07 +0900
Subject: [PATCH 02/13] update vite

---
 packages/client/package.json |  4 ++--
 packages/client/yarn.lock    | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/client/package.json b/packages/client/package.json
index 94f6688dd2..31c7604891 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -15,7 +15,7 @@
 		"@rollup/plugin-alias": "3.1.9",
 		"@rollup/plugin-json": "4.1.0",
 		"@syuilo/aiscript": "0.11.1",
-		"@vitejs/plugin-vue": "3.0.0",
+		"@vitejs/plugin-vue": "3.0.1",
 		"@vue/compiler-sfc": "3.2.37",
 		"abort-controller": "3.0.0",
 		"autobind-decorator": "2.4.0",
@@ -73,7 +73,7 @@
 		"uuid": "8.3.2",
 		"v-debounce": "0.1.2",
 		"vanilla-tilt": "1.7.2",
-		"vite": "3.0.0",
+		"vite": "3.0.1",
 		"vue": "3.2.37",
 		"vue-prism-editor": "2.0.0-alpha.2",
 		"vuedraggable": "4.0.1",
diff --git a/packages/client/yarn.lock b/packages/client/yarn.lock
index 3cef5b87cc..0be2fa3103 100644
--- a/packages/client/yarn.lock
+++ b/packages/client/yarn.lock
@@ -600,10 +600,10 @@
   resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44"
   integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==
 
-"@vitejs/plugin-vue@3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-3.0.0.tgz#7081e2b3fbe04e291bb85107b9fb57a1fa5e6aeb"
-  integrity sha512-yWP34ArFh/jAeNUDkkLz/kVRLjf5ppJiq4L36f64Cp6dIrMQeYZGDP9xxdemlXfZR9ylN9JgHUl3GzfqOtgYDg==
+"@vitejs/plugin-vue@3.0.1":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-3.0.1.tgz#b6af8f782485374bbb5fe09edf067a845bf4caae"
+  integrity sha512-Ll9JgxG7ONIz/XZv3dssfoMUDu9qAnlJ+km+pBA0teYSXzwPCIzS/e1bmwNYl5dcQGs677D21amgfYAnzMl17A==
 
 "@vue/compiler-core@3.2.37":
   version "3.2.37"
@@ -4222,10 +4222,10 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-vite@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-3.0.0.tgz#b4675cb9ab83ec0803b9c952ffa6519bcce033a7"
-  integrity sha512-M7phQhY3+fRZa0H+1WzI6N+/onruwPTBTMvaj7TzgZ0v2TE+N2sdLKxJOfOv9CckDWt5C4HmyQP81xB4dwRKzA==
+vite@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-3.0.1.tgz#9c30c9662ec24455b8834d0b831c9f3c5a9139ca"
+  integrity sha512-nefKSglkoEsDpYUkBuT2++L04ktcP8fz8dxLtmZdDdMyhubFSOLFw6BTh/46Fc6tIX/cibs/NVYWNrsqn0k6pQ==
   dependencies:
     esbuild "^0.14.47"
     postcss "^8.4.14"

From 369660ac79aefa753817e885eaa660af76deb10e Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Mon, 18 Jul 2022 18:41:17 +0900
Subject: [PATCH 03/13] chore(client): tweak style

---
 packages/client/src/ui/_common_/navbar.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/ui/_common_/navbar.vue b/packages/client/src/ui/_common_/navbar.vue
index 7e6065c305..30837ed287 100644
--- a/packages/client/src/ui/_common_/navbar.vue
+++ b/packages/client/src/ui/_common_/navbar.vue
@@ -156,7 +156,7 @@ function more(ev: MouseEvent) {
 <style lang="scss" scoped>
 .mvcprjjd {
 	$nav-width: 250px;
-	$nav-icon-only-width: 86px;
+	$nav-icon-only-width: 80px;
 
 	flex: 0 0 $nav-width;
 	width: $nav-width;

From a675131b8072bbb7fd3cf14aff29de7801d7bb6c Mon Sep 17 00:00:00 2001
From: xianon <xianon@hotmail.co.jp>
Date: Mon, 18 Jul 2022 21:43:31 +0900
Subject: [PATCH 04/13] =?UTF-8?q?=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC?=
 =?UTF-8?q?=E6=83=85=E5=A0=B1=E3=81=AE=E5=8F=96=E5=BE=97=E3=81=AE=E5=86=8D?=
 =?UTF-8?q?=E8=A9=A6=E8=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3=E3=81=99=E3=82=8B?=
 =?UTF-8?q?=20(#9017)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/client/src/pages/user/followers.vue | 2 +-
 packages/client/src/pages/user/following.vue | 2 +-
 packages/client/src/pages/user/index.vue     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/pages/user/followers.vue b/packages/client/src/pages/user/followers.vue
index 296a4b7b4d..b61b48329a 100644
--- a/packages/client/src/pages/user/followers.vue
+++ b/packages/client/src/pages/user/followers.vue
@@ -6,7 +6,7 @@
 			<div v-if="user">
 				<XFollowList :user="user" type="followers"/>
 			</div>
-			<MkError v-else-if="error" @retry="fetch()"/>
+			<MkError v-else-if="error" @retry="fetchUser()"/>
 			<MkLoading v-else/>
 		</transition>
 	</MkSpacer>
diff --git a/packages/client/src/pages/user/following.vue b/packages/client/src/pages/user/following.vue
index d1753fe7d5..a23977b425 100644
--- a/packages/client/src/pages/user/following.vue
+++ b/packages/client/src/pages/user/following.vue
@@ -6,7 +6,7 @@
 			<div v-if="user">
 				<XFollowList :user="user" type="following"/>
 			</div>
-			<MkError v-else-if="error" @retry="fetch()"/>
+			<MkError v-else-if="error" @retry="fetchUser()"/>
 			<MkLoading v-else/>
 		</transition>
 	</MkSpacer>
diff --git a/packages/client/src/pages/user/index.vue b/packages/client/src/pages/user/index.vue
index 4b07beeb8e..7e635f8b2e 100644
--- a/packages/client/src/pages/user/index.vue
+++ b/packages/client/src/pages/user/index.vue
@@ -10,7 +10,7 @@
 				<XPages v-else-if="tab === 'pages'" :user="user"/>
 				<XGallery v-else-if="tab === 'gallery'" :user="user"/>
 			</div>
-			<MkError v-else-if="error" @retry="fetch()"/>
+			<MkError v-else-if="error" @retry="fetchUser()"/>
 			<MkLoading v-else/>
 		</transition>
 	</div>

From 264a6cda8e228de4669c4cdc134c6f6b6566f4e9 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 19 Jul 2022 01:20:36 +0900
Subject: [PATCH 05/13] fix(client): fix window default prop

---
 packages/client/src/components/ui/window.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/components/ui/window.vue b/packages/client/src/components/ui/window.vue
index e259ecdab3..460cf7d597 100644
--- a/packages/client/src/components/ui/window.vue
+++ b/packages/client/src/components/ui/window.vue
@@ -75,7 +75,7 @@ const props = withDefaults(defineProps<{
 	canResize: false,
 	closeButton: true,
 	mini: false,
-	front: true,
+	front: false,
 	contextmenu: null,
 	buttonsLeft: () => [],
 	buttonsRight: () => [],

From 6fc42629c8deeb7b2aac2bf91d0000b858ea676e Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 19 Jul 2022 13:23:36 +0900
Subject: [PATCH 06/13] Update CHANGELOG.md

---
 CHANGELOG.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69bb5ba89f..114481357a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,15 @@
 You should also include the user name that made the change.
 -->
 
+## 12.x.x (unreleased)
+
+### Improvements
+- Client: UIのブラッシュアップ @syuilo
+
+### Bugfixes
+- Client: リアクションピッカーがアプリ内ウィンドウの後ろに表示されてしまう問題を修正 @syuilo
+- Client: ユーザー情報の取得の再試行を修正する @xianonn
+
 ## 12.117.0 (2022/07/18)
 
 ### Improvements

From e35f599b6de7ddcb1c276fdf4979aff58592f05a Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 19 Jul 2022 13:25:23 +0900
Subject: [PATCH 07/13] update vite

---
 packages/client/package.json | 2 +-
 packages/client/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/client/package.json b/packages/client/package.json
index 31c7604891..eaebf69ed8 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -73,7 +73,7 @@
 		"uuid": "8.3.2",
 		"v-debounce": "0.1.2",
 		"vanilla-tilt": "1.7.2",
-		"vite": "3.0.1",
+		"vite": "3.0.2",
 		"vue": "3.2.37",
 		"vue-prism-editor": "2.0.0-alpha.2",
 		"vuedraggable": "4.0.1",
diff --git a/packages/client/yarn.lock b/packages/client/yarn.lock
index 0be2fa3103..af3af22fc9 100644
--- a/packages/client/yarn.lock
+++ b/packages/client/yarn.lock
@@ -4222,10 +4222,10 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-vite@3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-3.0.1.tgz#9c30c9662ec24455b8834d0b831c9f3c5a9139ca"
-  integrity sha512-nefKSglkoEsDpYUkBuT2++L04ktcP8fz8dxLtmZdDdMyhubFSOLFw6BTh/46Fc6tIX/cibs/NVYWNrsqn0k6pQ==
+vite@3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-3.0.2.tgz#2a7b4642c53ae066cf724e7e581d6c1fd24e2c32"
+  integrity sha512-TAqydxW/w0U5AoL5AsD9DApTvGb2iNbGs3sN4u2VdT1GFkQVUfgUldt+t08TZgi23uIauh1TUOQJALduo9GXqw==
   dependencies:
     esbuild "^0.14.47"
     postcss "^8.4.14"

From a3c2dbbfb59cf95f1f3972e0e08dde50a66b7829 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?=
 <root@acid-chicken.com>
Date: Tue, 19 Jul 2022 17:09:21 +0900
Subject: [PATCH 08/13] fix(server): make sure `getFileInfo` doesn't fail if
 `detectSensitivity` ever fails (#9020)

---
 packages/backend/src/misc/get-file-info.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/misc/get-file-info.ts b/packages/backend/src/misc/get-file-info.ts
index 42061fcf83..1c988b2487 100644
--- a/packages/backend/src/misc/get-file-info.ts
+++ b/packages/backend/src/misc/get-file-info.ts
@@ -101,13 +101,17 @@ export async function getFileInfo(path: string, opts: {
 	let porn = false;
 
 	if (!opts.skipSensitiveDetection) {
-		[sensitive, porn] = await detectSensitivity(
+		await detectSensitivity(
 			path,
 			type.mime,
 			opts.sensitiveThreshold ?? 0.5,
 			opts.sensitiveThresholdForPorn ?? 0.75,
 			opts.enableSensitiveMediaDetectionForVideos ?? false,
-		);
+		).then(value => {
+			[sensitive, porn] = value;
+		}, error => {
+			warnings.push(`detectSensitivity failed: ${error}`);
+		});
 	}
 
 	return {

From 7dd381bb5cddde6b83b2d7c1c8639503ff8965dc Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 19 Jul 2022 17:10:21 +0900
Subject: [PATCH 09/13] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 114481357a..c8926cb6d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ You should also include the user name that made the change.
 - Client: UIのブラッシュアップ @syuilo
 
 ### Bugfixes
+- Server: ファイルのアップロードに失敗することがある問題を修正 @acid-chicken
 - Client: リアクションピッカーがアプリ内ウィンドウの後ろに表示されてしまう問題を修正 @syuilo
 - Client: ユーザー情報の取得の再試行を修正する @xianonn
 

From 5b8d960b9fdfba46b707d768e9cf321270ae5c05 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 19 Jul 2022 17:13:24 +0900
Subject: [PATCH 10/13] fix(client): tweak mfm-cheat-sheet

---
 CHANGELOG.md                                  |   3 +-
 locales/ja-JP.yml                             |   2 +
 packages/client/src/pages/mfm-cheat-sheet.vue | 643 +++++++++---------
 3 files changed, 332 insertions(+), 316 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c8926cb6d5..0c6423149b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,7 +17,8 @@ You should also include the user name that made the change.
 ### Bugfixes
 - Server: ファイルのアップロードに失敗することがある問題を修正 @acid-chicken
 - Client: リアクションピッカーがアプリ内ウィンドウの後ろに表示されてしまう問題を修正 @syuilo
-- Client: ユーザー情報の取得の再試行を修正する @xianonn
+- Client: ユーザー情報の取得の再試行を修正 @xianonn
+- Client: MFMチートシートの挙動を修正 @syuilo
 
 ## 12.117.0 (2022/07/18)
 
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index e071b4bdab..0c4a7c7231 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1038,6 +1038,8 @@ _mfm:
   sparkleDescription: "キラキラしたパーティクルのエフェクトを追加します。"
   rotate: "回転"
   rotateDescription: "指定した角度で回転させます。"
+  plain: "プレーン"
+  plainDescription: "内側の構文を全て無効にします。"
 
 _instanceTicker:
   none: "表示しない"
diff --git a/packages/client/src/pages/mfm-cheat-sheet.vue b/packages/client/src/pages/mfm-cheat-sheet.vue
index 3315479abf..0b5dae996f 100644
--- a/packages/client/src/pages/mfm-cheat-sheet.vue
+++ b/packages/client/src/pages/mfm-cheat-sheet.vue
@@ -1,301 +1,313 @@
 <template>
 <MkStickyContainer>
 	<template #header><MkPageHeader/></template>
-	<div class="mwysmxbg">
-		<div>{{ $ts._mfm.intro }}</div>
+	<MkSpacer :content-max="800">
+		<div class="mwysmxbg">
+			<div>{{ $ts._mfm.intro }}</div>
+			<div class="section _block">
+				<div class="title">{{ $ts._mfm.mention }}</div>
+				<div class="content">
+					<p>{{ $ts._mfm.mentionDescription }}</p>
+					<div class="preview">
+						<Mfm :text="preview_mention"/>
+						<MkTextarea v-model="preview_mention"><template #label>MFM</template></MkTextarea>
+					</div>
+				</div>
+			</div>
+			<div class="section _block">
+				<div class="title">{{ $ts._mfm.hashtag }}</div>
+				<div class="content">
+					<p>{{ $ts._mfm.hashtagDescription }}</p>
+					<div class="preview">
+						<Mfm :text="preview_hashtag"/>
+						<MkTextarea v-model="preview_hashtag"><template #label>MFM</template></MkTextarea>
+					</div>
+				</div>
+			</div>
+			<div class="section _block">
+				<div class="title">{{ $ts._mfm.url }}</div>
+				<div class="content">
+					<p>{{ $ts._mfm.urlDescription }}</p>
+					<div class="preview">
+						<Mfm :text="preview_url"/>
+						<MkTextarea v-model="preview_url"><template #label>MFM</template></MkTextarea>
+					</div>
+				</div>
+			</div>
+			<div class="section _block">
+				<div class="title">{{ $ts._mfm.link }}</div>
+				<div class="content">
+					<p>{{ $ts._mfm.linkDescription }}</p>
+					<div class="preview">
+						<Mfm :text="preview_link"/>
+						<MkTextarea v-model="preview_link"><template #label>MFM</template></MkTextarea>
+					</div>
+				</div>
+			</div>
+			<div class="section _block">
+				<div class="title">{{ $ts._mfm.emoji }}</div>
+				<div class="content">
+					<p>{{ $ts._mfm.emojiDescription }}</p>
+					<div class="preview">
+						<Mfm :text="preview_emoji"/>
+						<MkTextarea v-model="preview_emoji"><template #label>MFM</template></MkTextarea>
+					</div>
+				</div>
+			</div>
+			<div class="section _block">
+				<div class="title">{{ $ts._mfm.bold }}</div>
+				<div class="content">
+					<p>{{ $ts._mfm.boldDescription }}</p>
+					<div class="preview">
+						<Mfm :text="preview_bold"/>
+						<MkTextarea v-model="preview_bold"><template #label>MFM</template></MkTextarea>
+					</div>
+				</div>
+			</div>
+			<div class="section _block">
+				<div class="title">{{ $ts._mfm.small }}</div>
+				<div class="content">
+					<p>{{ $ts._mfm.smallDescription }}</p>
+					<div class="preview">
+						<Mfm :text="preview_small"/>
+						<MkTextarea v-model="preview_small"><template #label>MFM</template></MkTextarea>
+					</div>
+				</div>
+			</div>
+			<div class="section _block">
+				<div class="title">{{ $ts._mfm.quote }}</div>
+				<div class="content">
+					<p>{{ $ts._mfm.quoteDescription }}</p>
+					<div class="preview">
+						<Mfm :text="preview_quote"/>
+						<MkTextarea v-model="preview_quote"><template #label>MFM</template></MkTextarea>
+					</div>
+				</div>
+			</div>
+			<div class="section _block">
+				<div class="title">{{ $ts._mfm.center }}</div>
+				<div class="content">
+					<p>{{ $ts._mfm.centerDescription }}</p>
+					<div class="preview">
+						<Mfm :text="preview_center"/>
+						<MkTextarea v-model="preview_center"><template #label>MFM</template></MkTextarea>
+					</div>
+				</div>
+			</div>
+			<div class="section _block">
+				<div class="title">{{ $ts._mfm.inlineCode }}</div>
+				<div class="content">
+					<p>{{ $ts._mfm.inlineCodeDescription }}</p>
+					<div class="preview">
+						<Mfm :text="preview_inlineCode"/>
+						<MkTextarea v-model="preview_inlineCode"><template #label>MFM</template></MkTextarea>
+					</div>
+				</div>
+			</div>
+			<div class="section _block">
+				<div class="title">{{ $ts._mfm.blockCode }}</div>
+				<div class="content">
+					<p>{{ $ts._mfm.blockCodeDescription }}</p>
+					<div class="preview">
+						<Mfm :text="preview_blockCode"/>
+						<MkTextarea v-model="preview_blockCode"><template #label>MFM</template></MkTextarea>
+					</div>
+				</div>
+			</div>
+			<div class="section _block">
+				<div class="title">{{ $ts._mfm.inlineMath }}</div>
+				<div class="content">
+					<p>{{ $ts._mfm.inlineMathDescription }}</p>
+					<div class="preview">
+						<Mfm :text="preview_inlineMath"/>
+						<MkTextarea v-model="preview_inlineMath"><template #label>MFM</template></MkTextarea>
+					</div>
+				</div>
+			</div>
+			<!-- deprecated
 		<div class="section _block">
-			<div class="title">{{ $ts._mfm.mention }}</div>
+			<div class="title">{{ $ts._mfm.search }}</div>
 			<div class="content">
-				<p>{{ $ts._mfm.mentionDescription }}</p>
+				<p>{{ $ts._mfm.searchDescription }}</p>
 				<div class="preview">
-					<Mfm :text="preview_mention"/>
-					<MkTextarea v-model="preview_mention"><template #label>MFM</template></MkTextarea>
+					<Mfm :text="preview_search"/>
+					<MkTextarea v-model="preview_search"><template #label>MFM</template></MkTextarea>
 				</div>
 			</div>
 		</div>
-		<div class="section _block">
-			<div class="title">{{ $ts._mfm.hashtag }}</div>
-			<div class="content">
-				<p>{{ $ts._mfm.hashtagDescription }}</p>
-				<div class="preview">
-					<Mfm :text="preview_hashtag"/>
-					<MkTextarea v-model="preview_hashtag"><template #label>MFM</template></MkTextarea>
+		-->
+			<div class="section _block">
+				<div class="title">{{ $ts._mfm.flip }}</div>
+				<div class="content">
+					<p>{{ $ts._mfm.flipDescription }}</p>
+					<div class="preview">
+						<Mfm :text="preview_flip"/>
+						<MkTextarea v-model="preview_flip"><template #label>MFM</template></MkTextarea>
+					</div>
+				</div>
+			</div>
+			<div class="section _block">
+				<div class="title">{{ $ts._mfm.font }}</div>
+				<div class="content">
+					<p>{{ $ts._mfm.fontDescription }}</p>
+					<div class="preview">
+						<Mfm :text="preview_font"/>
+						<MkTextarea v-model="preview_font"><template #label>MFM</template></MkTextarea>
+					</div>
+				</div>
+			</div>
+			<div class="section _block">
+				<div class="title">{{ $ts._mfm.x2 }}</div>
+				<div class="content">
+					<p>{{ $ts._mfm.x2Description }}</p>
+					<div class="preview">
+						<Mfm :text="preview_x2"/>
+						<MkTextarea v-model="preview_x2"><template #label>MFM</template></MkTextarea>
+					</div>
+				</div>
+			</div>
+			<div class="section _block">
+				<div class="title">{{ $ts._mfm.x3 }}</div>
+				<div class="content">
+					<p>{{ $ts._mfm.x3Description }}</p>
+					<div class="preview">
+						<Mfm :text="preview_x3"/>
+						<MkTextarea v-model="preview_x3"><template #label>MFM</template></MkTextarea>
+					</div>
+				</div>
+			</div>
+			<div class="section _block">
+				<div class="title">{{ $ts._mfm.x4 }}</div>
+				<div class="content">
+					<p>{{ $ts._mfm.x4Description }}</p>
+					<div class="preview">
+						<Mfm :text="preview_x4"/>
+						<MkTextarea v-model="preview_x4"><template #label>MFM</template></MkTextarea>
+					</div>
+				</div>
+			</div>
+			<div class="section _block">
+				<div class="title">{{ $ts._mfm.blur }}</div>
+				<div class="content">
+					<p>{{ $ts._mfm.blurDescription }}</p>
+					<div class="preview">
+						<Mfm :text="preview_blur"/>
+						<MkTextarea v-model="preview_blur"><template #label>MFM</template></MkTextarea>
+					</div>
+				</div>
+			</div>
+			<div class="section _block">
+				<div class="title">{{ $ts._mfm.jelly }}</div>
+				<div class="content">
+					<p>{{ $ts._mfm.jellyDescription }}</p>
+					<div class="preview">
+						<Mfm :text="preview_jelly"/>
+						<MkTextarea v-model="preview_jelly"><template #label>MFM</template></MkTextarea>
+					</div>
+				</div>
+			</div>
+			<div class="section _block">
+				<div class="title">{{ $ts._mfm.tada }}</div>
+				<div class="content">
+					<p>{{ $ts._mfm.tadaDescription }}</p>
+					<div class="preview">
+						<Mfm :text="preview_tada"/>
+						<MkTextarea v-model="preview_tada"><template #label>MFM</template></MkTextarea>
+					</div>
+				</div>
+			</div>
+			<div class="section _block">
+				<div class="title">{{ $ts._mfm.jump }}</div>
+				<div class="content">
+					<p>{{ $ts._mfm.jumpDescription }}</p>
+					<div class="preview">
+						<Mfm :text="preview_jump"/>
+						<MkTextarea v-model="preview_jump"><template #label>MFM</template></MkTextarea>
+					</div>
+				</div>
+			</div>
+			<div class="section _block">
+				<div class="title">{{ $ts._mfm.bounce }}</div>
+				<div class="content">
+					<p>{{ $ts._mfm.bounceDescription }}</p>
+					<div class="preview">
+						<Mfm :text="preview_bounce"/>
+						<MkTextarea v-model="preview_bounce"><template #label>MFM</template></MkTextarea>
+					</div>
+				</div>
+			</div>
+			<div class="section _block">
+				<div class="title">{{ $ts._mfm.spin }}</div>
+				<div class="content">
+					<p>{{ $ts._mfm.spinDescription }}</p>
+					<div class="preview">
+						<Mfm :text="preview_spin"/>
+						<MkTextarea v-model="preview_spin"><template #label>MFM</template></MkTextarea>
+					</div>
+				</div>
+			</div>
+			<div class="section _block">
+				<div class="title">{{ $ts._mfm.shake }}</div>
+				<div class="content">
+					<p>{{ $ts._mfm.shakeDescription }}</p>
+					<div class="preview">
+						<Mfm :text="preview_shake"/>
+						<MkTextarea v-model="preview_shake"><template #label>MFM</template></MkTextarea>
+					</div>
+				</div>
+			</div>
+			<div class="section _block">
+				<div class="title">{{ $ts._mfm.twitch }}</div>
+				<div class="content">
+					<p>{{ $ts._mfm.twitchDescription }}</p>
+					<div class="preview">
+						<Mfm :text="preview_twitch"/>
+						<MkTextarea v-model="preview_twitch"><template #label>MFM</template></MkTextarea>
+					</div>
+				</div>
+			</div>
+			<div class="section _block">
+				<div class="title">{{ $ts._mfm.rainbow }}</div>
+				<div class="content">
+					<p>{{ $ts._mfm.rainbowDescription }}</p>
+					<div class="preview">
+						<Mfm :text="preview_rainbow"/>
+						<MkTextarea v-model="preview_rainbow"><template #label>MFM</template></MkTextarea>
+					</div>
+				</div>
+			</div>
+			<div class="section _block">
+				<div class="title">{{ $ts._mfm.sparkle }}</div>
+				<div class="content">
+					<p>{{ $ts._mfm.sparkleDescription }}</p>
+					<div class="preview">
+						<Mfm :text="preview_sparkle"/>
+						<MkTextarea v-model="preview_sparkle"><span>MFM</span></MkTextarea>
+					</div>
+				</div>
+			</div>
+			<div class="section _block">
+				<div class="title">{{ $ts._mfm.rotate }}</div>
+				<div class="content">
+					<p>{{ $ts._mfm.rotateDescription }}</p>
+					<div class="preview">
+						<Mfm :text="preview_rotate"/>
+						<MkTextarea v-model="preview_rotate"><span>MFM</span></MkTextarea>
+					</div>
+				</div>
+			</div>
+			<div class="section _block">
+				<div class="title">{{ $ts._mfm.plain }}</div>
+				<div class="content">
+					<p>{{ $ts._mfm.plainDescription }}</p>
+					<div class="preview">
+						<Mfm :text="preview_plain"/>
+						<MkTextarea v-model="preview_plain"><span>MFM</span></MkTextarea>
+					</div>
 				</div>
 			</div>
 		</div>
-		<div class="section _block">
-			<div class="title">{{ $ts._mfm.url }}</div>
-			<div class="content">
-				<p>{{ $ts._mfm.urlDescription }}</p>
-				<div class="preview">
-					<Mfm :text="preview_url"/>
-					<MkTextarea v-model="preview_url"><template #label>MFM</template></MkTextarea>
-				</div>
-			</div>
-		</div>
-		<div class="section _block">
-			<div class="title">{{ $ts._mfm.link }}</div>
-			<div class="content">
-				<p>{{ $ts._mfm.linkDescription }}</p>
-				<div class="preview">
-					<Mfm :text="preview_link"/>
-					<MkTextarea v-model="preview_link"><template #label>MFM</template></MkTextarea>
-				</div>
-			</div>
-		</div>
-		<div class="section _block">
-			<div class="title">{{ $ts._mfm.emoji }}</div>
-			<div class="content">
-				<p>{{ $ts._mfm.emojiDescription }}</p>
-				<div class="preview">
-					<Mfm :text="preview_emoji"/>
-					<MkTextarea v-model="preview_emoji"><template #label>MFM</template></MkTextarea>
-				</div>
-			</div>
-		</div>
-		<div class="section _block">
-			<div class="title">{{ $ts._mfm.bold }}</div>
-			<div class="content">
-				<p>{{ $ts._mfm.boldDescription }}</p>
-				<div class="preview">
-					<Mfm :text="preview_bold"/>
-					<MkTextarea v-model="preview_bold"><template #label>MFM</template></MkTextarea>
-				</div>
-			</div>
-		</div>
-		<div class="section _block">
-			<div class="title">{{ $ts._mfm.small }}</div>
-			<div class="content">
-				<p>{{ $ts._mfm.smallDescription }}</p>
-				<div class="preview">
-					<Mfm :text="preview_small"/>
-					<MkTextarea v-model="preview_small"><template #label>MFM</template></MkTextarea>
-				</div>
-			</div>
-		</div>
-		<div class="section _block">
-			<div class="title">{{ $ts._mfm.quote }}</div>
-			<div class="content">
-				<p>{{ $ts._mfm.quoteDescription }}</p>
-				<div class="preview">
-					<Mfm :text="preview_quote"/>
-					<MkTextarea v-model="preview_quote"><template #label>MFM</template></MkTextarea>
-				</div>
-			</div>
-		</div>
-		<div class="section _block">
-			<div class="title">{{ $ts._mfm.center }}</div>
-			<div class="content">
-				<p>{{ $ts._mfm.centerDescription }}</p>
-				<div class="preview">
-					<Mfm :text="preview_center"/>
-					<MkTextarea v-model="preview_center"><template #label>MFM</template></MkTextarea>
-				</div>
-			</div>
-		</div>
-		<div class="section _block">
-			<div class="title">{{ $ts._mfm.inlineCode }}</div>
-			<div class="content">
-				<p>{{ $ts._mfm.inlineCodeDescription }}</p>
-				<div class="preview">
-					<Mfm :text="preview_inlineCode"/>
-					<MkTextarea v-model="preview_inlineCode"><template #label>MFM</template></MkTextarea>
-				</div>
-			</div>
-		</div>
-		<div class="section _block">
-			<div class="title">{{ $ts._mfm.blockCode }}</div>
-			<div class="content">
-				<p>{{ $ts._mfm.blockCodeDescription }}</p>
-				<div class="preview">
-					<Mfm :text="preview_blockCode"/>
-					<MkTextarea v-model="preview_blockCode"><template #label>MFM</template></MkTextarea>
-				</div>
-			</div>
-		</div>
-		<div class="section _block">
-			<div class="title">{{ $ts._mfm.inlineMath }}</div>
-			<div class="content">
-				<p>{{ $ts._mfm.inlineMathDescription }}</p>
-				<div class="preview">
-					<Mfm :text="preview_inlineMath"/>
-					<MkTextarea v-model="preview_inlineMath"><template #label>MFM</template></MkTextarea>
-				</div>
-			</div>
-		</div>
-		<!-- deprecated
-	<div class="section _block">
-		<div class="title">{{ $ts._mfm.search }}</div>
-		<div class="content">
-			<p>{{ $ts._mfm.searchDescription }}</p>
-			<div class="preview">
-				<Mfm :text="preview_search"/>
-				<MkTextarea v-model="preview_search"><template #label>MFM</template></MkTextarea>
-			</div>
-		</div>
-	</div>
-	-->
-		<div class="section _block">
-			<div class="title">{{ $ts._mfm.flip }}</div>
-			<div class="content">
-				<p>{{ $ts._mfm.flipDescription }}</p>
-				<div class="preview">
-					<Mfm :text="preview_flip"/>
-					<MkTextarea v-model="preview_flip"><template #label>MFM</template></MkTextarea>
-				</div>
-			</div>
-		</div>
-		<div class="section _block">
-			<div class="title">{{ $ts._mfm.font }}</div>
-			<div class="content">
-				<p>{{ $ts._mfm.fontDescription }}</p>
-				<div class="preview">
-					<Mfm :text="preview_font"/>
-					<MkTextarea v-model="preview_font"><template #label>MFM</template></MkTextarea>
-				</div>
-			</div>
-		</div>
-		<div class="section _block">
-			<div class="title">{{ $ts._mfm.x2 }}</div>
-			<div class="content">
-				<p>{{ $ts._mfm.x2Description }}</p>
-				<div class="preview">
-					<Mfm :text="preview_x2"/>
-					<MkTextarea v-model="preview_x2"><template #label>MFM</template></MkTextarea>
-				</div>
-			</div>
-		</div>
-		<div class="section _block">
-			<div class="title">{{ $ts._mfm.x3 }}</div>
-			<div class="content">
-				<p>{{ $ts._mfm.x3Description }}</p>
-				<div class="preview">
-					<Mfm :text="preview_x3"/>
-					<MkTextarea v-model="preview_x3"><template #label>MFM</template></MkTextarea>
-				</div>
-			</div>
-		</div>
-		<div class="section _block">
-			<div class="title">{{ $ts._mfm.x4 }}</div>
-			<div class="content">
-				<p>{{ $ts._mfm.x4Description }}</p>
-				<div class="preview">
-					<Mfm :text="preview_x4"/>
-					<MkTextarea v-model="preview_x4"><template #label>MFM</template></MkTextarea>
-				</div>
-			</div>
-		</div>
-		<div class="section _block">
-			<div class="title">{{ $ts._mfm.blur }}</div>
-			<div class="content">
-				<p>{{ $ts._mfm.blurDescription }}</p>
-				<div class="preview">
-					<Mfm :text="preview_blur"/>
-					<MkTextarea v-model="preview_blur"><template #label>MFM</template></MkTextarea>
-				</div>
-			</div>
-		</div>
-		<div class="section _block">
-			<div class="title">{{ $ts._mfm.jelly }}</div>
-			<div class="content">
-				<p>{{ $ts._mfm.jellyDescription }}</p>
-				<div class="preview">
-					<Mfm :text="preview_jelly"/>
-					<MkTextarea v-model="preview_jelly"><template #label>MFM</template></MkTextarea>
-				</div>
-			</div>
-		</div>
-		<div class="section _block">
-			<div class="title">{{ $ts._mfm.tada }}</div>
-			<div class="content">
-				<p>{{ $ts._mfm.tadaDescription }}</p>
-				<div class="preview">
-					<Mfm :text="preview_tada"/>
-					<MkTextarea v-model="preview_tada"><template #label>MFM</template></MkTextarea>
-				</div>
-			</div>
-		</div>
-		<div class="section _block">
-			<div class="title">{{ $ts._mfm.jump }}</div>
-			<div class="content">
-				<p>{{ $ts._mfm.jumpDescription }}</p>
-				<div class="preview">
-					<Mfm :text="preview_jump"/>
-					<MkTextarea v-model="preview_jump"><template #label>MFM</template></MkTextarea>
-				</div>
-			</div>
-		</div>
-		<div class="section _block">
-			<div class="title">{{ $ts._mfm.bounce }}</div>
-			<div class="content">
-				<p>{{ $ts._mfm.bounceDescription }}</p>
-				<div class="preview">
-					<Mfm :text="preview_bounce"/>
-					<MkTextarea v-model="preview_bounce"><template #label>MFM</template></MkTextarea>
-				</div>
-			</div>
-		</div>
-		<div class="section _block">
-			<div class="title">{{ $ts._mfm.spin }}</div>
-			<div class="content">
-				<p>{{ $ts._mfm.spinDescription }}</p>
-				<div class="preview">
-					<Mfm :text="preview_spin"/>
-					<MkTextarea v-model="preview_spin"><template #label>MFM</template></MkTextarea>
-				</div>
-			</div>
-		</div>
-		<div class="section _block">
-			<div class="title">{{ $ts._mfm.shake }}</div>
-			<div class="content">
-				<p>{{ $ts._mfm.shakeDescription }}</p>
-				<div class="preview">
-					<Mfm :text="preview_shake"/>
-					<MkTextarea v-model="preview_shake"><template #label>MFM</template></MkTextarea>
-				</div>
-			</div>
-		</div>
-		<div class="section _block">
-			<div class="title">{{ $ts._mfm.twitch }}</div>
-			<div class="content">
-				<p>{{ $ts._mfm.twitchDescription }}</p>
-				<div class="preview">
-					<Mfm :text="preview_twitch"/>
-					<MkTextarea v-model="preview_twitch"><template #label>MFM</template></MkTextarea>
-				</div>
-			</div>
-		</div>
-		<div class="section _block">
-			<div class="title">{{ $ts._mfm.rainbow }}</div>
-			<div class="content">
-				<p>{{ $ts._mfm.rainbowDescription }}</p>
-				<div class="preview">
-					<Mfm :text="preview_rainbow"/>
-					<MkTextarea v-model="preview_rainbow"><template #label>MFM</template></MkTextarea>
-				</div>
-			</div>
-		</div>
-		<div class="section _block">
-			<div class="title">{{ $ts._mfm.sparkle }}</div>
-			<div class="content">
-				<p>{{ $ts._mfm.sparkleDescription }}</p>
-				<div class="preview">
-					<Mfm :text="preview_sparkle"/>
-					<MkTextarea v-model="preview_sparkle"><span>MFM</span></MkTextarea>
-				</div>
-			</div>
-		</div>
-		<div class="section _block">
-			<div class="title">{{ $ts._mfm.rotate }}</div>
-			<div class="content">
-				<p>{{ $ts._mfm.rotateDescription }}</p>
-				<div class="preview">
-					<Mfm :text="preview_rotate"/>
-					<MkTextarea v-model="preview_rotate"><span>MFM</span></MkTextarea>
-				</div>
-			</div>
-		</div>
-	</div>
+	</MkSpacer>
 </MkStickyContainer>
 </template>
 
@@ -306,35 +318,36 @@ import { definePageMetadata } from '@/scripts/page-metadata';
 import { i18n } from '@/i18n';
 import { instance } from '@/instance';
 
-const preview_mention = '@example';
-const preview_hashtag = '#test';
-const preview_url = 'https://example.com';
-const preview_link = `[${i18n.ts._mfm.dummy}](https://example.com)`;
-const preview_emoji = instance.emojis.length ? `:${instance.emojis[0].name}:` : ':emojiname:';
-const preview_bold = `**${i18n.ts._mfm.dummy}**`;
-const preview_small = `<small>${i18n.ts._mfm.dummy}</small>`;
-const preview_center = `<center>${i18n.ts._mfm.dummy}</center>`;
-const preview_inlineCode = '`<: "Hello, world!"`';
-const preview_blockCode = '```\n~ (#i, 100) {\n\t<: ? ((i % 15) = 0) "FizzBuzz"\n\t\t.? ((i % 3) = 0) "Fizz"\n\t\t.? ((i % 5) = 0) "Buzz"\n\t\t. i\n}\n```';
-const preview_inlineMath = '\\(x= \\frac{-b\' \\pm \\sqrt{(b\')^2-ac}}{a}\\)';
-const preview_quote = `> ${i18n.ts._mfm.dummy}`;
-const preview_search = `${i18n.ts._mfm.dummy} 検索`;
-const preview_jelly = '$[jelly 🍮] $[jelly.speed=5s 🍮]';
-const preview_tada = '$[tada 🍮] $[tada.speed=5s 🍮]';
-const preview_jump = '$[jump 🍮] $[jump.speed=5s 🍮]';
-const preview_bounce = '$[bounce 🍮] $[bounce.speed=5s 🍮]';
-const preview_shake = '$[shake 🍮] $[shake.speed=5s 🍮]';
-const preview_twitch = '$[twitch 🍮] $[twitch.speed=5s 🍮]';
-const preview_spin = '$[spin 🍮] $[spin.left 🍮] $[spin.alternate 🍮]\n$[spin.x 🍮] $[spin.x,left 🍮] $[spin.x,alternate 🍮]\n$[spin.y 🍮] $[spin.y,left 🍮] $[spin.y,alternate 🍮]\n\n$[spin.speed=5s 🍮]';
-const preview_flip = `$[flip ${i18n.ts._mfm.dummy}]\n$[flip.v ${i18n.ts._mfm.dummy}]\n$[flip.h,v ${i18n.ts._mfm.dummy}]`;
-const preview_font = `$[font.serif ${i18n.ts._mfm.dummy}]\n$[font.monospace ${i18n.ts._mfm.dummy}]\n$[font.cursive ${i18n.ts._mfm.dummy}]\n$[font.fantasy ${i18n.ts._mfm.dummy}]`;
-const preview_x2 = '$[x2 🍮]';
-const preview_x3 = '$[x3 🍮]';
-const preview_x4 = '$[x4 🍮]';
-const preview_blur = `$[blur ${i18n.ts._mfm.dummy}]`;
-const preview_rainbow = '$[rainbow 🍮] $[rainbow.speed=5s 🍮]';
-const preview_sparkle = '$[sparkle 🍮]';
-const preview_rotate = '$[rotate 🍮]';
+let preview_mention = $ref('@example');
+let preview_hashtag = $ref('#test');
+let preview_url = $ref('https://example.com');
+let preview_link = $ref(`[${i18n.ts._mfm.dummy}](https://example.com)`);
+let preview_emoji = $ref(instance.emojis.length ? `:${instance.emojis[0].name}:` : ':emojiname:');
+let preview_bold = $ref(`**${i18n.ts._mfm.dummy}**`);
+let preview_small = $ref(`<small>${i18n.ts._mfm.dummy}</small>`);
+let preview_center = $ref(`<center>${i18n.ts._mfm.dummy}</center>`);
+let preview_inlineCode = $ref('`<: "Hello, world!"`');
+let preview_blockCode = $ref('```\n~ (#i, 100) {\n\t<: ? ((i % 15) = 0) "FizzBuzz"\n\t\t.? ((i % 3) = 0) "Fizz"\n\t\t.? ((i % 5) = 0) "Buzz"\n\t\t. i\n}\n```');
+let preview_inlineMath = $ref('\\(x= \\frac{-b\' \\pm \\sqrt{(b\')^2-ac}}{a}\\)');
+let preview_quote = $ref(`> ${i18n.ts._mfm.dummy}`);
+let preview_search = $ref(`${i18n.ts._mfm.dummy} 検索`);
+let preview_jelly = $ref('$[jelly 🍮] $[jelly.speed=5s 🍮]');
+let preview_tada = $ref('$[tada 🍮] $[tada.speed=5s 🍮]');
+let preview_jump = $ref('$[jump 🍮] $[jump.speed=5s 🍮]');
+let preview_bounce = $ref('$[bounce 🍮] $[bounce.speed=5s 🍮]');
+let preview_shake = $ref('$[shake 🍮] $[shake.speed=5s 🍮]');
+let preview_twitch = $ref('$[twitch 🍮] $[twitch.speed=5s 🍮]');
+let preview_spin = $ref('$[spin 🍮] $[spin.left 🍮] $[spin.alternate 🍮]\n$[spin.x 🍮] $[spin.x,left 🍮] $[spin.x,alternate 🍮]\n$[spin.y 🍮] $[spin.y,left 🍮] $[spin.y,alternate 🍮]\n\n$[spin.speed=5s 🍮]');
+let preview_flip = $ref(`$[flip ${i18n.ts._mfm.dummy}]\n$[flip.v ${i18n.ts._mfm.dummy}]\n$[flip.h,v ${i18n.ts._mfm.dummy}]`);
+let preview_font = $ref(`$[font.serif ${i18n.ts._mfm.dummy}]\n$[font.monospace ${i18n.ts._mfm.dummy}]\n$[font.cursive ${i18n.ts._mfm.dummy}]\n$[font.fantasy ${i18n.ts._mfm.dummy}]`);
+let preview_x2 = $ref('$[x2 🍮]');
+let preview_x3 = $ref('$[x3 🍮]');
+let preview_x4 = $ref('$[x4 🍮]');
+let preview_blur = $ref(`$[blur ${i18n.ts._mfm.dummy}]`);
+let preview_rainbow = $ref('$[rainbow 🍮] $[rainbow.speed=5s 🍮]');
+let preview_sparkle = $ref('$[sparkle 🍮]');
+let preview_rotate = $ref('$[rotate 🍮]');
+let preview_plain = $ref('<plain>**bold** @mention #hashtag `code` $[x2 🍮]</plain>');
 
 definePageMetadata({
 	title: i18n.ts._mfm.cheatSheet,

From 4769cd420b03703078417eaec8b7b7222a264d2d Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 19 Jul 2022 17:21:03 +0900
Subject: [PATCH 11/13] =?UTF-8?q?fix(client):=20=E3=80=8C=E3=82=A4?=
 =?UTF-8?q?=E3=83=B3=E3=82=B9=E3=82=BF=E3=83=B3=E3=82=B9=E3=81=8B=E3=82=89?=
 =?UTF-8?q?=E3=81=AE=E3=81=8A=E7=9F=A5=E3=82=89=E3=81=9B=E3=82=92=E5=8F=97?=
 =?UTF-8?q?=E3=81=91=E5=8F=96=E3=82=8B=E3=80=8D=E3=81=AE=E8=A8=AD=E5=AE=9A?=
 =?UTF-8?q?=E3=82=92=E5=A4=89=E6=9B=B4=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=84?=
 =?UTF-8?q?=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix #8474
---
 CHANGELOG.md                                 | 1 +
 packages/client/src/pages/settings/email.vue | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c6423149b..c337e13df6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ You should also include the user name that made the change.
 - Client: リアクションピッカーがアプリ内ウィンドウの後ろに表示されてしまう問題を修正 @syuilo
 - Client: ユーザー情報の取得の再試行を修正 @xianonn
 - Client: MFMチートシートの挙動を修正 @syuilo
+- Client: 「インスタンスからのお知らせを受け取る」の設定を変更できない問題を修正 @syuilo
 
 ## 12.117.0 (2022/07/18)
 
diff --git a/packages/client/src/pages/settings/email.vue b/packages/client/src/pages/settings/email.vue
index e575af6d6b..9d2afd6a6f 100644
--- a/packages/client/src/pages/settings/email.vue
+++ b/packages/client/src/pages/settings/email.vue
@@ -10,7 +10,7 @@
 	</FormSection>
 
 	<FormSection>
-		<FormSwitch :value="$i.receiveAnnouncementEmail" @update:modelValue="onChangeReceiveAnnouncementEmail">
+		<FormSwitch :model-value="$i.receiveAnnouncementEmail" @update:modelValue="onChangeReceiveAnnouncementEmail">
 			{{ $ts.receiveAnnouncementFromInstance }}
 		</FormSwitch>
 	</FormSection>

From c3c74c098d160d94af78bdf029b8f999432adc63 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 19 Jul 2022 17:21:30 +0900
Subject: [PATCH 12/13] New translations ja-JP.yml (Slovak) (#9014)

---
 locales/sk-SK.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/locales/sk-SK.yml b/locales/sk-SK.yml
index 2ac0a8566f..4fbdc1cb12 100644
--- a/locales/sk-SK.yml
+++ b/locales/sk-SK.yml
@@ -885,6 +885,7 @@ enableAutoSensitiveDescription: "Ak je zapnuté, príznak NSFW sa na médiách a
 activeEmailValidationDescription: "Dôkladnejšie overí e-mailovú adresu používateľa tým, že zistí, či ide o vyradenú e-mailovú adresu a či sa s ňou dá skutočne komunikovať. Ak nie je začiarknuté, e-mailová adresa sa kontroluje len ako text."
 navbar: "Navigačný panel"
 account: "Účty"
+move: "Pohyb"
 _sensitiveMediaDetection:
   description: "Strojové učenie sa použije na automatickú detekciu citlivých médií na účely ich moderovania. Mierne sa zvýši zaťaženie servera."
   sensitivity: "Citlivosť detekcie"
@@ -1691,6 +1692,7 @@ _deck:
   alwaysShowMainColumn: "Vždy zobraziť v hlavnom stĺpci"
   columnAlign: "Zarovnať stĺpce"
   addColumn: "Pridať stĺpec"
+  configureColumn: "Nastavenie stĺpcov"
   swapLeft: "Vymeniť vľavo"
   swapRight: "Vymeniť vpravo"
   swapUp: "Vymeniť hore"

From b495f6cffff7a9a41cc72bd11417d7b9d79e0f27 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 19 Jul 2022 17:22:24 +0900
Subject: [PATCH 13/13] 12.117.1

---
 CHANGELOG.md | 2 +-
 package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c337e13df6..59c748fb68 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@
 You should also include the user name that made the change.
 -->
 
-## 12.x.x (unreleased)
+## 12.117.1 (2022/07/19)
 
 ### Improvements
 - Client: UIのブラッシュアップ @syuilo
diff --git a/package.json b/package.json
index 2699b7dc96..cabb9f8f9b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.117.0",
+	"version": "12.117.1",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",