Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop

2 files changed, 12 insertions, 3 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f1bc0a96fd..2c87db8558 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ You should also include the user name that made the change.
 ### Improvements
 
 ### Bugfixes
+- Server: 引用内の文章がnyaizeされてしまう問題を修正 @kabo2468
 - Server: Bug fix for Pinned Users lookup on instance @squidicuzz
 - Client: インスタンスティッカーのfaviconを読み込む際に偽サイト警告が出ることがあるのを修正 @syuilo
 
diff --git a/packages/backend/src/core/entities/NoteEntityService.ts b/packages/backend/src/core/entities/NoteEntityService.ts
index 098f072a51..5605cf8ce6 100644
--- a/packages/backend/src/core/entities/NoteEntityService.ts
+++ b/packages/backend/src/core/entities/NoteEntityService.ts
@@ -329,12 +329,20 @@ export class NoteEntityService implements OnModuleInit {
 
 		if (packed.user.isCat && packed.text) {
 			const tokens = packed.text ? mfm.parse(packed.text) : [];
-			mfm.inspect(tokens, node => {
+			function nyaizeNode(node: mfm.MfmNode) {
+				if (node.type === 'quote') return;
 				if (node.type === 'text') {
-					// TODO: quoteなtextはskip
 					node.props.text = nyaize(node.props.text);
 				}
-			});
+				if (node.children) {
+					for (const child of node.children) {
+						nyaizeNode(child);
+					}
+				}
+			}
+			for (const node of tokens) {
+				nyaizeNode(node);
+			}
 			packed.text = mfm.toString(tokens);
 		}