Fixed issues when JDA received a create event for a new Private channel.

discord-jda · Jul 9, 2016 · aa9fd8b · aa9fd8b
1 parent 6759f13
commit aa9fd8b
Showing 1 changed file with 35 additions and 30 deletions.
diff --git a/src/main/java/net/dv8tion/jda/handle/ChannelCreateHandler.java b/src/main/java/net/dv8tion/jda/handle/ChannelCreateHandler.java
@@ -33,51 +33,56 @@ public ChannelCreateHandler(JDAImpl api, int responseNumber)
     @Override
     protected String handleInternally(JSONObject content)
     {
-        String type;
-        if (content.has("type"))
-            type = content.getString("type");
-        else if (content.has("recipient"))
-            type = "private";
-        else
-            throw new IllegalArgumentException("ChannelCreateEvent provided an unrecognized ChannelCreate format.  JSON: " + content);
+        String type = content.getString("type");
+        boolean isPrivate = content.getBoolean("is_private");
 
-        if (!type.equals("private") && GuildLock.get(api).isLocked(content.getString("guild_id")))
+        if (!isPrivate && GuildLock.get(api).isLocked(content.getString("guild_id")))
         {
             return content.getString("guild_id");
         }
 
-        if (type.equals("text"))
-        {
-            api.getEventManager().handle(
-                    new TextChannelCreateEvent(
-                            api, responseNumber,
-                            new EntityBuilder(api).createTextChannel(content, content.getString("guild_id"))));
-        }
-        else if (type.equals("voice"))
+        if (!isPrivate)
         {
-            api.getEventManager().handle(
-                    new VoiceChannelCreateEvent(
-                            api, responseNumber,
-                            new EntityBuilder(api).createVoiceChannel(content, content.getString("guild_id"))));
-        }
-        else if (type.equalsIgnoreCase("private"))
-        {
-            PrivateChannel pc = new EntityBuilder(api).createPrivateChannel(content);
-            if (pc == null)
+            if (type.equals("text"))
             {
-                JDAImpl.LOG.warn("Discord API sent us a Private CREATE_CHANNEL for a user we can't see, ignoring event.");
+                api.getEventManager().handle(
+                        new TextChannelCreateEvent(
+                                api, responseNumber,
+                                new EntityBuilder(api).createTextChannel(content, content.getString("guild_id"))));
             }
-            else
+            else if (type.equals("voice"))
             {
                 api.getEventManager().handle(
-                        new PrivateChannelCreateEvent(
+                        new VoiceChannelCreateEvent(
                                 api, responseNumber,
-                                pc.getUser()));
+                                new EntityBuilder(api).createVoiceChannel(content, content.getString("guild_id"))));
             }
+            else
+                throw new IllegalArgumentException("ChannelCreateEvent provided an unrecognized guild channel type.  JSON: " + content);
         }
         else
         {
-            throw new IllegalArgumentException("ChannelCreateEvent provided an unregonized channel type.  JSON: " + content);
+            if (type.equals("text"))
+            {
+                PrivateChannel pc = new EntityBuilder(api).createPrivateChannel(content);
+                if (pc == null)
+                {
+                    JDAImpl.LOG.warn("Discord API sent us a Private CREATE_CHANNEL for a user we can't see, ignoring event.");
+                }
+                else
+                {
+                    api.getEventManager().handle(
+                            new PrivateChannelCreateEvent(
+                                    api, responseNumber,
+                                    pc.getUser()));
+                }
+            }
+            else if (type.equals("voice"))
+            {
+                JDAImpl.LOG.warn("Received a CHANNEL_CREATE for a Private Voice channel. Currently, we don't support, so ignoring. Might explode though.. ?");
+            }
+            else
+                throw new IllegalArgumentException("ChannelCreateEvent provided an unrecognized private channel type.  JSON: " + content);
         }
         EventCache.get(api).playbackCache(EventCache.Type.CHANNEL, content.getString("id"));
         return null;