From 0f25c744150046245e38f69449524a37d850b473 Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Thu, 9 Jan 2020 14:37:48 +0900
Subject: [PATCH] =?UTF-8?q?=E3=82=AB=E3=82=B9=E3=82=BF=E3=83=A0=E7=B5=B5?=
 =?UTF-8?q?=E6=96=87=E5=AD=97=E3=83=AA=E3=82=A2=E3=82=AF=E3=82=B7=E3=83=A7?=
 =?UTF-8?q?=E3=83=B3=E3=81=A7=E3=81=AA=E3=81=84=E3=82=82=E3=81=AE=E3=81=AF?=
 =?UTF-8?q?=E7=B5=B5=E6=96=87=E5=AD=97=E3=82=AF=E3=82=A8=E3=83=AA=E3=82=92?=
 =?UTF-8?q?=E3=81=97=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=20(#5693?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* カスタム絵文字リアクションの絵文字がNoteに添付されないのを修正

* ねんのため

* 記述順

* カスタム絵文字リアクションでないものは絵文字クエリをしないように
---
 src/models/repositories/note.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/models/repositories/note.ts b/src/models/repositories/note.ts
index bf5ebfdbf..9c01bf84d 100644
--- a/src/models/repositories/note.ts
+++ b/src/models/repositories/note.ts
@@ -139,9 +139,11 @@ export class NoteRepository extends Repository<Note> {
 				});
 			}
 
+			reactionNames = reactionNames?.filter(x => x.match(/^:[^:]+:$/)).map(x => x.replace(/:/g, ''));
+
 			if (reactionNames?.length > 0) {
 				where.push({
-					name: In(reactionNames.map(x => x.replace(/:/g, ''))),
+					name: In(reactionNames),
 					host: null
 				});
 			}