Add null checks to Message Create and Message Update debug logs

Erisa · Aug 10, 2024 · d4a11cd · d4a11cd
1 parent b550844
commit d4a11cd
Showing 1 changed file with 22 additions and 2 deletions.
diff --git a/Events/MessageEvent.cs b/Events/MessageEvent.cs
@@ -16,14 +16,34 @@ class MessageEvent
 
  public static async Task MessageCreated(DiscordClient client, MessageCreatedEventArgs e)
  {
- client.Logger.LogDebug("Got a message create event for {message} by {user}", DiscordHelpers.MessageLink(e.Message), e.Message.Author.Id);
+ if (e.Message is null)
+ {
+ client.Logger.LogError("Got a message create event but the message was null!");
+ return;
+ } else if (e.Message.Author is null)
+ {
+ client.Logger.LogDebug("Got a message create event for a message with no author: {message}", DiscordHelpers.MessageLink(e.Message));
+ } else
+ {
+ client.Logger.LogDebug("Got a message create event for {message} by {user}", DiscordHelpers.MessageLink(e.Message), e.Message.Author.Id);
+ }
 
  await MessageHandlerAsync(client, e.Message, e.Channel);
  }
 
  public static async Task MessageUpdated(DiscordClient client, MessageUpdatedEventArgs e)
  {
- client.Logger.LogDebug("Got a message update event for {message} by {user}", DiscordHelpers.MessageLink(e.Message), e.Message.Author.Id);
+ if (e.Message is null)
+ {
+ client.Logger.LogError("Got a message update event but the message was null!");
+ return;
+ } else if (e.Message.Author is null)
+ {
+ client.Logger.LogDebug("Got a message update event for a message with no author: {message}", DiscordHelpers.MessageLink(e.Message));
+ } else
+ {
+ client.Logger.LogDebug("Got a message update event for {message} by {user}", DiscordHelpers.MessageLink(e.Message), e.Message.Author.Id);
+ }
 
  await MessageHandlerAsync(client, e.Message, e.Channel, true);
  }