Avoid NPE when reaction event getUser returns null

ScoreUnder · Feb 5, 2021 · eb92027 · eb92027
1 parent f786b2e
commit eb92027
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/scala/score/discord/canti/functionality/EventLogger.scala b/src/main/scala/score/discord/canti/functionality/EventLogger.scala
@@ -67,9 +67,9 @@ class EventLogger(implicit messageOwnership: MessageOwnership) extends EventList
       logger.trace(s"NICK CHANGE: ${ev.getGuild.unambiguousString} ${ev.getMember.unambiguousString} " +
         s"from ${ev.getOldNickname} to ${ev.getNewNickname}")
     case ev: MessageReactionAddEvent =>
-      logHigherIfMyMessage(ev, s"REACT: ${ev.getUser.unambiguousString} ${ev.getReaction}")
+      logHigherIfMyMessage(ev, s"REACT: ${Option(ev.getUser).fold(s"User?(${ev.getUserId})")(_.unambiguousString)} ${ev.getReaction}")
     case ev: MessageReactionRemoveEvent =>
-      logHigherIfMyMessage(ev, s"UNREACT: ${ev.getUser.unambiguousString} ${ev.getReaction}")
+      logHigherIfMyMessage(ev, s"UNREACT: ${Option(ev.getUser).fold(s"User?(${ev.getUserId})")(_.unambiguousString)} ${ev.getReaction}")
     case ev: MessageReactionRemoveAllEvent =>
       logHigherIfMyMessage(ev, s"CLEAR REACT: ${ev.getMessageId}")
     case ev: GuildMemberRoleAddEvent =>