From cd7f8b080e50fa6f4ae094262d33cf7f750c4ea7 Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 20 Sep 2018 04:56:24 +0900 Subject: [PATCH] Fix #2738 --- src/misc/should-mute-this-note.ts | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/misc/should-mute-this-note.ts b/src/misc/should-mute-this-note.ts index c818115a3..663e60af6 100644 --- a/src/misc/should-mute-this-note.ts +++ b/src/misc/should-mute-this-note.ts @@ -1,13 +1,19 @@ +import * as mongo from 'mongodb'; + +function toString(id: any) { + return mongo.ObjectID.prototype.isPrototypeOf(id) ? (id as mongo.ObjectID).toHexString() : id; +} + export default function(note: any, mutedUserIds: string[]): boolean { - if (mutedUserIds.indexOf(note.userId) != -1) { + if (mutedUserIds.includes(toString(note.userId))) { return true; } - if (note.reply != null && mutedUserIds.indexOf(note.reply.userId) != -1) { + if (note.reply != null && mutedUserIds.includes(toString(note.reply.userId))) { return true; } - if (note.renote != null && mutedUserIds.indexOf(note.renote.userId) != -1) { + if (note.renote != null && mutedUserIds.includes(toString(note.renote.userId))) { return true; }