From 854ce1862df8fd682f6dd10540ecc5f43672fe96 Mon Sep 17 00:00:00 2001 From: Dragory <2606411+Dragory@users.noreply.github.com> Date: Thu, 19 Aug 2021 18:34:24 +0300 Subject: [PATCH] Fix error in log userMention() --- backend/src/plugins/Logs/util/getLogMessage.ts | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/backend/src/plugins/Logs/util/getLogMessage.ts b/backend/src/plugins/Logs/util/getLogMessage.ts index f39b8ab4..2431128c 100644 --- a/backend/src/plugins/Logs/util/getLogMessage.ts +++ b/backend/src/plugins/Logs/util/getLogMessage.ts @@ -51,12 +51,16 @@ export async function getLogMessage( const values = new TemplateSafeValueContainer({ ...data, timestamp, - userMention: async ( - inputUserOrMember: TemplateSafeUser | TemplateSafeMember | TemplateSafeUser[] | TemplateSafeMember[], - ) => { - if (!inputUserOrMember) return ""; + userMention: async (inputUserOrMember: unknown) => { + if (!inputUserOrMember) { + return ""; + } - const usersOrMembers = Array.isArray(inputUserOrMember) ? inputUserOrMember : [inputUserOrMember]; + const inputArray = Array.isArray(inputUserOrMember) ? inputUserOrMember : [inputUserOrMember]; + // TODO: Resolve IDs to users/members + const usersOrMembers = inputArray.filter( + v => v instanceof TemplateSafeUser || v instanceof TemplateSafeMember, + ) as Array; const mentions: string[] = []; for (const userOrMember of usersOrMembers) {