Catch parsing exception for scheduled events (#2401)

discord-jda · Feb 19, 2023 · 8e46689 · 8e46689
1 parent f774ba8
commit 8e46689
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 12 deletions.
diff --git a/src/main/java/net/dv8tion/jda/internal/entities/EntityBuilder.java b/src/main/java/net/dv8tion/jda/internal/entities/EntityBuilder.java
@@ -201,16 +201,22 @@ private void createScheduledEventPass(GuildImpl guildObj, DataArray array)
     {
         if (!getJDA().isCacheFlagSet(CacheFlag.SCHEDULED_EVENTS))
             return;
-        SnowflakeCacheViewImpl<ScheduledEvent> eventView = guildObj.getScheduledEventsView();
         for (int i = 0; i < array.length(); i++)
         {
             DataObject object = array.getObject(i);
-            if (object.isNull("id"))
+            try
             {
-                LOG.error("Received GUILD_CREATE with a scheduled event with a null ID. JSON: {}", object);
-                continue;
+                if (object.isNull("id"))
+                {
+                    LOG.error("Received GUILD_CREATE with a scheduled event with a null ID. JSON: {}", object);
+                    continue;
+                }
+                createScheduledEvent(guildObj, object);
+            }
+            catch (ParsingException exception)
+            {
+                LOG.error("Received GUILD_CREATE with a scheduled event that failed to parse. JSON: {}", object, exception);
             }
-            createScheduledEvent(guildObj, object);
         }
     }
 
@@ -1023,7 +1029,12 @@ public ScheduledEvent createScheduledEvent(GuildImpl guild, DataObject json)
             scheduledEvent.setLocation(json.getString("channel_id"));
             break;
         case EXTERNAL:
-            String externalLocation = json.getObject("entity_metadata").getString("location");
+            String externalLocation;
+            if (json.isNull("entity_metadata") || json.getObject("entity_metadata").isNull("location"))
+                externalLocation = "";
+            else
+                externalLocation = json.getObject("entity_metadata").getString("location");
+
             scheduledEvent.setLocation(externalLocation);
         }
         return scheduledEvent;

diff --git a/src/main/java/net/dv8tion/jda/internal/handle/ScheduledEventUpdateHandler.java b/src/main/java/net/dv8tion/jda/internal/handle/ScheduledEventUpdateHandler.java
@@ -16,7 +16,7 @@
 
 package net.dv8tion.jda.internal.handle;
 
-import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.ScheduledEvent;
 import net.dv8tion.jda.api.entities.channel.concrete.StageChannel;
 import net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel;
 import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
@@ -28,7 +28,7 @@
 import net.dv8tion.jda.internal.entities.ScheduledEventImpl;
 
 import java.time.OffsetDateTime;
-import java.util.*;
+import java.util.Objects;
 
 public class ScheduledEventUpdateHandler extends SocketHandler
 {
@@ -70,10 +70,11 @@ protected Long handleInternally(DataObject content)
         String location = content.getString("channel_id", null);
         GuildChannel channel = null;
         String oldLocation = event.getLocation();
-        if (location == null)
-            location = content.getObject("entity_metadata").getString("location", null);
-        else
+
+        if (location != null)
             channel = guild.getGuildChannelById(location);
+        else // null in some cases due to discord validation bugs
+            location = content.optObject("entity_metadata").map(o -> o.getString("location", "")).orElse("");
 
         if (!Objects.equals(name, event.getName()))
         {
@@ -107,7 +108,7 @@ protected Long handleInternally(DataObject content)
             event.setStatus(status);
             getJDA().handleEvent(new ScheduledEventUpdateStatusEvent(getJDA(), responseNumber, event, oldStatus));
         }
-        if (channel == null && location != null && !location.equals(event.getLocation()))
+        if (channel == null && !location.equals(event.getLocation()))
         {
             event.setLocation(location);
             event.setType(ScheduledEvent.Type.EXTERNAL);