From 7879c5abdb79e5001c929dfad9a34524f2ba9682 Mon Sep 17 00:00:00 2001 From: caneleex Date: Tue, 5 Jul 2022 19:34:01 +0200 Subject: [PATCH] default to an empty string in Emoji#fromData --- src/main/java/net/dv8tion/jda/api/entities/emoji/Emoji.java | 2 +- .../jda/internal/handle/MessageReactionClearEmojiHandler.java | 2 -- .../dv8tion/jda/internal/handle/MessageReactionHandler.java | 4 ---- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/main/java/net/dv8tion/jda/api/entities/emoji/Emoji.java b/src/main/java/net/dv8tion/jda/api/entities/emoji/Emoji.java index dff1c92933..8466ae5b74 100644 --- a/src/main/java/net/dv8tion/jda/api/entities/emoji/Emoji.java +++ b/src/main/java/net/dv8tion/jda/api/entities/emoji/Emoji.java @@ -174,7 +174,7 @@ static EmojiUnion fromData(@Nonnull DataObject emoji) if (emoji.isNull("id")) return (EmojiUnion) fromUnicode(emoji.getString("name")); else - return (EmojiUnion) fromCustom(emoji.getString("name"), emoji.getUnsignedLong("id"), emoji.getBoolean("animated")); + return (EmojiUnion) fromCustom(emoji.getString("name", ""), emoji.getUnsignedLong("id"), emoji.getBoolean("animated")); } /** diff --git a/src/main/java/net/dv8tion/jda/internal/handle/MessageReactionClearEmojiHandler.java b/src/main/java/net/dv8tion/jda/internal/handle/MessageReactionClearEmojiHandler.java index b7b2949ef1..d5212ed08f 100644 --- a/src/main/java/net/dv8tion/jda/internal/handle/MessageReactionClearEmojiHandler.java +++ b/src/main/java/net/dv8tion/jda/internal/handle/MessageReactionClearEmojiHandler.java @@ -67,8 +67,6 @@ protected Long handleInternally(DataObject content) long messageId = content.getUnsignedLong("message_id"); DataObject emoji = content.getObject("emoji"); - if (emoji.isNull("name")) - emoji.put("name", ""); EmojiUnion reactionEmoji = Emoji.fromData(emoji); MessageReaction reaction = new MessageReaction(channel, reactionEmoji, messageId, false, 0); diff --git a/src/main/java/net/dv8tion/jda/internal/handle/MessageReactionHandler.java b/src/main/java/net/dv8tion/jda/internal/handle/MessageReactionHandler.java index b3ec0c2e73..d5728c6ec1 100644 --- a/src/main/java/net/dv8tion/jda/internal/handle/MessageReactionHandler.java +++ b/src/main/java/net/dv8tion/jda/internal/handle/MessageReactionHandler.java @@ -147,11 +147,7 @@ protected Long handleInternally(DataObject content) ); } - // reaction remove has null name sometimes - if (emoji.isNull("name")) - emoji.put("name", ""); EmojiUnion rEmoji = Emoji.fromData(emoji); - MessageReaction reaction = new MessageReaction(channel, rEmoji, messageId, userId == api.getSelfUser().getIdLong(), -1); if (channel.getType() == ChannelType.PRIVATE)