From 07ac1938c83e6fbffbeeeebcbcf9e43fedcd2058 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20Spie=C3=9F?= Date: Wed, 26 Jun 2019 20:42:16 +0200 Subject: [PATCH] Ignore unknown message types --- .../net/dv8tion/jda/core/handle/MessageCreateHandler.java | 5 +++++ .../net/dv8tion/jda/core/handle/MessageUpdateHandler.java | 2 +- .../restaction/pagination/MessagePaginationAction.java | 7 +++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/dv8tion/jda/core/handle/MessageCreateHandler.java b/src/main/java/net/dv8tion/jda/core/handle/MessageCreateHandler.java index 51f9c31f87..beee5fae15 100644 --- a/src/main/java/net/dv8tion/jda/core/handle/MessageCreateHandler.java +++ b/src/main/java/net/dv8tion/jda/core/handle/MessageCreateHandler.java @@ -78,6 +78,11 @@ protected Long handleInternally(JSONObject content) EventCache.LOG.debug("Received a message for a user that JDA does not currently have cached"); return null; } + case EntityBuilder.UNKNOWN_MESSAGE_TYPE: + { + WebSocketClient.LOG.debug("Ignoring message with unknown type: {}", content); + return null; + } default: throw e; } diff --git a/src/main/java/net/dv8tion/jda/core/handle/MessageUpdateHandler.java b/src/main/java/net/dv8tion/jda/core/handle/MessageUpdateHandler.java index ed47dcaed4..3db330a232 100644 --- a/src/main/java/net/dv8tion/jda/core/handle/MessageUpdateHandler.java +++ b/src/main/java/net/dv8tion/jda/core/handle/MessageUpdateHandler.java @@ -61,7 +61,7 @@ protected Long handleInternally(JSONObject content) case DEFAULT: return handleMessage(content); default: - WebSocketClient.LOG.debug("JDA received a message of unknown type. Type: {} JSON: {}", type, content); + WebSocketClient.LOG.debug("JDA received a message update for an unexpected message type. Type: {} JSON: {}", type, content); return null; } } diff --git a/src/main/java/net/dv8tion/jda/core/requests/restaction/pagination/MessagePaginationAction.java b/src/main/java/net/dv8tion/jda/core/requests/restaction/pagination/MessagePaginationAction.java index 53dbf269cc..64aa12d3ec 100644 --- a/src/main/java/net/dv8tion/jda/core/requests/restaction/pagination/MessagePaginationAction.java +++ b/src/main/java/net/dv8tion/jda/core/requests/restaction/pagination/MessagePaginationAction.java @@ -142,6 +142,13 @@ protected void handleResponse(Response response, Request> request) { LOG.warn("Encountered an exception in MessagePagination", e); } + catch (IllegalArgumentException e) + { + if (EntityBuilder.UNKNOWN_MESSAGE_TYPE.equals(e.getMessage())) + LOG.warn("Skipping unknown message type during pagination", e); + else + LOG.warn("Unexpected issue trying to parse message during pagination", e); + } } request.onSuccess(messages);