From d7e2cf8721e8383a1cfc7787775ad1cea477c944 Mon Sep 17 00:00:00 2001 From: roflmaoqwerty <36663568+roflmaoqwerty@users.noreply.github.com> Date: Wed, 29 Jan 2020 07:42:27 +1100 Subject: [PATCH] refactored search result format methods --- backend/src/plugins/Utility.ts | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/backend/src/plugins/Utility.ts b/backend/src/plugins/Utility.ts index 758d4808..3e0a6625 100644 --- a/backend/src/plugins/Utility.ts +++ b/backend/src/plugins/Utility.ts @@ -521,18 +521,23 @@ export class UtilityPlugin extends ZeppelinPlugin { }; } - protected formatSearchResultList(members: Member[]): string { + protected formatSearchResultList(members: Array): string { const longestId = members.reduce((longest, member) => Math.max(longest, member.id.length), 0); const lines = members.map(member => { const paddedId = member.id.padEnd(longestId, " "); - let line = `${paddedId} ${member.user.username}#${member.user.discriminator}`; - if (member.nick) line += ` (${member.nick})`; + let line; + if (member instanceof Member) { + line = `${paddedId} ${member.user.username}#${member.user.discriminator}`; + if (member.nick) line += ` (${member.nick})`; + } else { + line = `${paddedId} ${member.username}#${member.discriminator}`; + } return line; }); return lines.join("\n"); } - protected formatSearchResultIdList(members: Member[]): string { + protected formatSearchResultIdList(members: Array): string { return members.map(m => m.id).join(" "); }