From baaaded54550ec185699e6e9add92fcb3f06dc05 Mon Sep 17 00:00:00 2001
From: Miikka <2606411+Dragory@users.noreply.github.com>
Date: Thu, 2 May 2019 10:30:31 +0300
Subject: [PATCH 1/2] Add some debug logging

---
 src/plugins/Logs.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/plugins/Logs.ts b/src/plugins/Logs.ts
index fc17a985..12c1438d 100644
--- a/src/plugins/Logs.ts
+++ b/src/plugins/Logs.ts
@@ -183,6 +183,7 @@ export class LogsPlugin extends ZeppelinPlugin<ILogsPluginConfig> {
             return `<@!${user.id}> (**${user.username}#${user.discriminator}**, \`${user.id}\`)`;
           } else {
             // No ping/mention
+            if (user.username == null) console.log('?', user);
             return `**${user.username}#${user.discriminator}** (\`${user.id}\`)`;
           }
         },

From 6a3d5a6ed0bd46a8943741a39fdc1f969d3d8df3 Mon Sep 17 00:00:00 2001
From: Miikka <2606411+Dragory@users.noreply.github.com>
Date: Thu, 2 May 2019 10:33:49 +0300
Subject: [PATCH 2/2] Fix lots of undefined user mentions in logs

---
 src/plugins/Logs.ts | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/plugins/Logs.ts b/src/plugins/Logs.ts
index 12c1438d..0404127b 100644
--- a/src/plugins/Logs.ts
+++ b/src/plugins/Logs.ts
@@ -171,19 +171,27 @@ export class LogsPlugin extends ZeppelinPlugin<ILogsPluginConfig> {
     try {
       formatted = await renderTemplate(format, {
         ...data,
-        userMention: async user => {
-          if (!user) return "";
+        userMention: async userOrMember => {
+          if (!userOrMember) return "";
+          
+          let user;
+          let member;
+          
+          if (userOrMember.user) {
+            member = userOrMember;
+            user = member.user;
+          } else {
+            user = userOrMember;
+            member = this.guild.members.get(user.id) || { id: user.id, user };
+          }
 
-          const member: Member = user.user ? user : this.guild.members.get(user.id) || { id: user.id, user };
-
-          const memberConfig = (member.guild && this.getMatchingConfig({ member, userId: user.id })) || ({} as any);
+          const memberConfig = member.guild && this.getMatchingConfig({ member, userId: user.id }) || ({} as any);
 
           if (memberConfig.ping_user) {
             // Ping/mention the user
             return `<@!${user.id}> (**${user.username}#${user.discriminator}**, \`${user.id}\`)`;
           } else {
             // No ping/mention
-            if (user.username == null) console.log('?', user);
             return `**${user.username}#${user.discriminator}** (\`${user.id}\`)`;
           }
         },