From d55c86548d265fa6702c9235738f30862dff2b5a Mon Sep 17 00:00:00 2001
From: Leah <kevinlukej@gmail.com>
Date: Mon, 26 Aug 2024 20:27:08 +0200
Subject: You can now disable cat speak in settings (client side)

---
 packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts | 2 ++
 packages/frontend/src/pages/settings/general.vue                     | 2 ++
 packages/frontend/src/store.ts                                       | 4 ++++
 3 files changed, 8 insertions(+)

(limited to 'packages/frontend/src')

diff --git a/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts b/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
index a3a2b9f319..f42e8b1e80 100644
--- a/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
+++ b/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
@@ -89,6 +89,8 @@ export default function (props: MfmProps, { emit }: { emit: SetupContext<MfmEven
 	 * @param disableNyaize Whether nyaize is disabled or not
 	 */
 	const genEl = (ast: mfm.MfmNode[], scale: number, disableNyaize = false) => ast.map((token): VNode | string | (VNode | string)[] => {
+		if (defaultStore.state.disableCatSpeak)
+			disableNyaize = true
 		switch (token.type) {
 			case 'text': {
 				let text = token.props.text.replace(/(\r\n|\n|\r)/g, '\n');
diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue
index 637c1b24b9..8cd1caf6bd 100644
--- a/packages/frontend/src/pages/settings/general.vue
+++ b/packages/frontend/src/pages/settings/general.vue
@@ -68,6 +68,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<MkSwitch v-model="showGapBetweenNotesInTimeline">{{ i18n.ts.showGapBetweenNotesInTimeline }}</MkSwitch>
 				<MkSwitch v-model="loadRawImages">{{ i18n.ts.loadRawImages }}</MkSwitch>
 				<MkSwitch v-model="showTickerOnReplies">{{ i18n.ts.showTickerOnReplies }}</MkSwitch>
+				<MkSwitch v-model="disableCatSpeak">{{ i18n.ts.disableCatSpeak }}</MkSwitch>
 				<MkSelect v-model="searchEngine" placeholder="Other">
 					<template #label>{{ i18n.ts.searchEngine }}</template>
 					<option
@@ -400,6 +401,7 @@ const disableShowingAnimatedImages = computed(defaultStore.makeGetterSetter('dis
 const forceShowAds = computed(defaultStore.makeGetterSetter('forceShowAds'));
 const oneko = computed(defaultStore.makeGetterSetter('oneko'));
 const loadRawImages = computed(defaultStore.makeGetterSetter('loadRawImages'));
+const disableCatSpeak = computed(defaultStore.makeGetterSetter('disableCatSpeak'));
 const highlightSensitiveMedia = computed(defaultStore.makeGetterSetter('highlightSensitiveMedia'));
 const imageNewTab = computed(defaultStore.makeGetterSetter('imageNewTab'));
 const enableFaviconNotificationDot = computed(defaultStore.makeGetterSetter('enableFaviconNotificationDot'));
diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts
index dda320dbac..fea85e409f 100644
--- a/packages/frontend/src/store.ts
+++ b/packages/frontend/src/store.ts
@@ -288,6 +288,10 @@ export const defaultStore = markRaw(new Storage('base', {
 		where: 'device',
 		default: window.matchMedia('(prefers-reduced-motion)').matches,
 	},
+	disableCatSpeak: {
+		where: 'device',
+		default: false,
+	},
 	emojiStyle: {
 		where: 'device',
 		default: 'twemoji', // twemoji / fluentEmoji / native
-- 
cgit v1.2.3-freya


From 49eb673c402b87b695b9b66f924220231b74d634 Mon Sep 17 00:00:00 2001
From: Leah <kevinlukej@gmail.com>
Date: Thu, 29 Aug 2024 22:09:43 +0200
Subject: fix nyaize line

---
 packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'packages/frontend/src')

diff --git a/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts b/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
index f42e8b1e80..3d496f1515 100644
--- a/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
+++ b/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
@@ -58,8 +58,7 @@ export default function (props: MfmProps, { emit }: { emit: SetupContext<MfmEven
 	provide('linkNavigationBehavior', props.linkNavigationBehavior);
 
 	const isNote = props.isNote ?? true;
-	const shouldNyaize = props.nyaize ? props.nyaize === 'respect' ? props.author?.isCat ? props.author.speakAsCat : false : false : false;
-
+	const shouldNyaize = props.nyaize === 'respect' && props.author?.speakAsCat && !defaultStore.state.disableCatSpeak;
 	// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
 	if (props.text == null || props.text === '') return;
 
@@ -89,8 +88,6 @@ export default function (props: MfmProps, { emit }: { emit: SetupContext<MfmEven
 	 * @param disableNyaize Whether nyaize is disabled or not
 	 */
 	const genEl = (ast: mfm.MfmNode[], scale: number, disableNyaize = false) => ast.map((token): VNode | string | (VNode | string)[] => {
-		if (defaultStore.state.disableCatSpeak)
-			disableNyaize = true
 		switch (token.type) {
 			case 'text': {
 				let text = token.props.text.replace(/(\r\n|\n|\r)/g, '\n');
-- 
cgit v1.2.3-freya


From 491a499c582a34282a9fce3cf0791640668cf3ef Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Sat, 14 Sep 2024 11:56:01 +0100
Subject: store `disableCatSpeak` per account

---
 packages/frontend/src/store.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages/frontend/src')

diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts
index fea85e409f..036e43a4b6 100644
--- a/packages/frontend/src/store.ts
+++ b/packages/frontend/src/store.ts
@@ -289,7 +289,7 @@ export const defaultStore = markRaw(new Storage('base', {
 		default: window.matchMedia('(prefers-reduced-motion)').matches,
 	},
 	disableCatSpeak: {
-		where: 'device',
+		where: 'account',
 		default: false,
 	},
 	emojiStyle: {
-- 
cgit v1.2.3-freya


From fa71e5481275b7751e16dcf5fea4846193d83aef Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Sat, 14 Sep 2024 11:56:58 +0100
Subject: backup/restore `disableCatSpeak`

---
 packages/frontend/src/pages/settings/preferences-backups.vue | 1 +
 1 file changed, 1 insertion(+)

(limited to 'packages/frontend/src')

diff --git a/packages/frontend/src/pages/settings/preferences-backups.vue b/packages/frontend/src/pages/settings/preferences-backups.vue
index f9fd494ce9..b0a79ddc39 100644
--- a/packages/frontend/src/pages/settings/preferences-backups.vue
+++ b/packages/frontend/src/pages/settings/preferences-backups.vue
@@ -77,6 +77,7 @@ const defaultStoreSaveKeys: (keyof typeof defaultStore['state'])[] = [
 	'enableFaviconNotificationDot',
 	'imageNewTab',
 	'dataSaver',
+	'disableCatSpeak',
 	'disableShowingAnimatedImages',
 	'emojiStyle',
 	'disableDrawer',
-- 
cgit v1.2.3-freya


From ef002e00b6088213c7bfbadda1d87a0a1212d2e9 Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Thu, 3 Oct 2024 18:51:05 +0100
Subject: cover case of author speaking as cat while not being cat

as @Marie pointed out, if you disable "is cat" without first disabling
"speak as cat", you don't want to speak as a cat!
---
 packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages/frontend/src')

diff --git a/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts b/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
index 3d496f1515..5046f17357 100644
--- a/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
+++ b/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
@@ -58,7 +58,7 @@ export default function (props: MfmProps, { emit }: { emit: SetupContext<MfmEven
 	provide('linkNavigationBehavior', props.linkNavigationBehavior);
 
 	const isNote = props.isNote ?? true;
-	const shouldNyaize = props.nyaize === 'respect' && props.author?.speakAsCat && !defaultStore.state.disableCatSpeak;
+	const shouldNyaize = props.nyaize === 'respect' && props.author?.isCat && props.author?.speakAsCat && !defaultStore.state.disableCatSpeak;
 	// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
 	if (props.text == null || props.text === '') return;
 
-- 
cgit v1.2.3-freya