Skip to content

Commit

Permalink
Handle message related events from unexpected channel types (#2078)
Browse files Browse the repository at this point in the history
  • Loading branch information
@MinnDevelopment
MinnDevelopment committed Apr 11, 2022
1 parent 98f6a63 commit ad17d4c
Show file tree
Hide file tree
Showing 9 changed files with 135 additions and 58 deletions.
14 changes: 13 additions & 1 deletion src/main/java/net/dv8tion/jda/internal/handle/InteractionCreateHandler.java
View file
Expand Up @@ -16,6 +16,8 @@

package net.dv8tion.jda.internal.handle;

import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.GuildChannel;
import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
import net.dv8tion.jda.api.events.interaction.command.MessageContextInteractionEvent;
Expand Down Expand Up @@ -55,10 +57,20 @@ protected Long handleInternally(DataObject content)
}

long guildId = content.getUnsignedLong("guild_id", 0);
Guild guild = api.getGuildById(guildId);
if (api.getGuildSetupController().isLocked(guildId))
return guildId;
if (guildId != 0 && api.getGuildById(guildId) == null)
if (guildId != 0 && guild == null)
return null; // discard event if it is not from a guild we are currently in
if (guild != null)
{
GuildChannel channel = guild.getGuildChannelById(content.getUnsignedLong("channel_id", 0));
if (channel == null || !channel.getType().isMessage()) // TODO: This might break when interactions can be used outside of message channels in the future, not the case right now though!
{
WebSocketClient.LOG.debug("Discarding INTERACTION_CREATE event from unexpected channel type. Channel: {}", channel);
return null;
}
}

switch (InteractionType.fromKey(type))
{
Expand Down
29 changes: 23 additions & 6 deletions src/main/java/net/dv8tion/jda/internal/handle/MessageBulkDeleteHandler.java
View file
Expand Up @@ -16,11 +16,14 @@

package net.dv8tion.jda.internal.handle;

import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.GuildChannel;
import net.dv8tion.jda.api.entities.GuildMessageChannel;
import net.dv8tion.jda.api.events.message.MessageBulkDeleteEvent;
import net.dv8tion.jda.api.utils.data.DataArray;
import net.dv8tion.jda.api.utils.data.DataObject;
import net.dv8tion.jda.internal.JDAImpl;
import net.dv8tion.jda.internal.requests.WebSocketClient;

import java.util.List;
import java.util.stream.Collectors;
Expand All @@ -35,11 +38,20 @@ public MessageBulkDeleteHandler(JDAImpl api)
@Override
protected Long handleInternally(DataObject content)
{
Guild guild = null;
if (!content.isNull("guild_id"))
{
long guildId = content.getLong("guild_id");
if (getJDA().getGuildSetupController().isLocked(guildId))
return guildId;

guild = api.getGuildById(guildId);
if (guild == null)
{
EventCache.LOG.debug("Caching MESSAGE_DELETE event for guild that is not currently cached. GuildID: {}", guildId);
api.getEventCache().cache(EventCache.Type.GUILD, guildId, responseNumber, allContent, this::handle);
return null;
}
}
final long channelId = content.getLong("channel_id");

Expand All @@ -57,15 +69,20 @@ protected Long handleInternally(DataObject content)
}
else
{
//TODO-v5-unified-channel-cache
GuildMessageChannel channel = getJDA().getTextChannelById(channelId);
if (channel == null)
channel = getJDA().getNewsChannelById(channelId);
if (channel == null)
channel = getJDA().getThreadChannelById(channelId);
GuildMessageChannel channel = getJDA().getChannelById(GuildMessageChannel.class, channelId);

if (channel == null)
{
if (guild != null)
{
GuildChannel guildChannel = guild.getGuildChannelById(channelId);
if (guildChannel != null)
{
WebSocketClient.LOG.debug("Discarding MESSAGE_DELETE event for unexpected channel type. Channel: {}", guildChannel);
return null;
}
}

getJDA().getEventCache().cache(EventCache.Type.CHANNEL, channelId, responseNumber, allContent, this::handle);
EventCache.LOG.debug("Received a Bulk Message Delete for a GuildMessageChannel that is not yet cached.");
return null;
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/net/dv8tion/jda/internal/handle/MessageCreateHandler.java
View file
Expand Up @@ -74,6 +74,12 @@ protected Long handleInternally(DataObject content)
case EntityBuilder.MISSING_CHANNEL:
{
final long channelId = content.getLong("channel_id");
if (guild != null && guild.getGuildChannelById(channelId) != null)
{
WebSocketClient.LOG.debug("Discarding MESSAGE_CREATE event for unexpected channel type. Channel: {}", guild.getGuildChannelById(channelId));
return null;
}

jda.getEventCache().cache(EventCache.Type.CHANNEL, channelId, responseNumber, allContent, this::handle);
EventCache.LOG.debug("Received a message for a channel that JDA does not currently have cached");
return null;
Expand Down
32 changes: 23 additions & 9 deletions src/main/java/net/dv8tion/jda/internal/handle/MessageDeleteHandler.java
View file
Expand Up @@ -15,12 +15,14 @@
*/
package net.dv8tion.jda.internal.handle;

import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.GuildChannel;
import net.dv8tion.jda.api.entities.MessageChannel;
import net.dv8tion.jda.api.events.message.MessageDeleteEvent;
import net.dv8tion.jda.api.utils.data.DataObject;
import net.dv8tion.jda.internal.JDAImpl;
import net.dv8tion.jda.internal.entities.ThreadChannelImpl;
import net.dv8tion.jda.internal.entities.mixin.channel.middleman.MessageChannelMixin;
import net.dv8tion.jda.internal.requests.WebSocketClient;

public class MessageDeleteHandler extends SocketHandler
{
Expand All @@ -33,26 +35,38 @@ public MessageDeleteHandler(JDAImpl api)
@Override
protected Long handleInternally(DataObject content)
{
Guild guild = null;
if (!content.isNull("guild_id"))
{
long guildId = content.getLong("guild_id");
if (getJDA().getGuildSetupController().isLocked(guildId))
return guildId;

guild = api.getGuildById(guildId);
if (guild == null)
{
EventCache.LOG.debug("Caching MESSAGE_DELETE event for guild that is not currently cached. GuildID: {}", guildId);
api.getEventCache().cache(EventCache.Type.GUILD, guildId, responseNumber, allContent, this::handle);
return null;
}
}

final long messageId = content.getLong("id");
final long channelId = content.getLong("channel_id");

//TODO-v5-unified-channel-cache
MessageChannel channel = getJDA().getTextChannelById(channelId);
if (channel == null)
channel = getJDA().getNewsChannelById(channelId);
if (channel == null)
channel = getJDA().getThreadChannelById(channelId);
if (channel == null)
channel = getJDA().getPrivateChannelById(channelId);
MessageChannel channel = getJDA().getChannelById(MessageChannel.class, channelId);
if (channel == null)
{
if (guild != null)
{
GuildChannel guildChannel = guild.getGuildChannelById(channelId);
if (guildChannel != null)
{
WebSocketClient.LOG.debug("Discarding MESSAGE_DELETE event for unexpected channel type. Channel: {}", guildChannel);
return null;
}
}

getJDA().getEventCache().cache(EventCache.Type.CHANNEL, channelId, responseNumber, allContent, this::handle);
EventCache.LOG.debug("Got message delete for a channel/group that is not yet cached. ChannelId: {}", channelId);
return null;
Expand Down
29 changes: 23 additions & 6 deletions src/main/java/net/dv8tion/jda/internal/handle/MessageReactionBulkRemoveHandler.java
View file
Expand Up @@ -16,10 +16,13 @@

package net.dv8tion.jda.internal.handle;

import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.GuildChannel;
import net.dv8tion.jda.api.entities.MessageChannel;
import net.dv8tion.jda.api.events.message.react.MessageReactionRemoveAllEvent;
import net.dv8tion.jda.api.utils.data.DataObject;
import net.dv8tion.jda.internal.JDAImpl;
import net.dv8tion.jda.internal.requests.WebSocketClient;

public class MessageReactionBulkRemoveHandler extends SocketHandler
{
Expand All @@ -35,21 +38,35 @@ protected Long handleInternally(DataObject content)
final long channelId = content.getLong("channel_id");
JDAImpl jda = getJDA();

Guild guild = null;
if (!content.isNull("guild_id"))
{
long guildId = content.getUnsignedLong("guild_id");
if (api.getGuildSetupController().isLocked(guildId))
return guildId;

guild = api.getGuildById(guildId);
if (guild == null)
{
EventCache.LOG.debug("Caching MESSAGE_REACTION_REMOVE_ALL event for guild that is not currently cached. GuildID: {}", guildId);
api.getEventCache().cache(EventCache.Type.GUILD, guildId, responseNumber, allContent, this::handle);
return null;
}
}

//TODO-v5-unified-channel-cache
MessageChannel channel = jda.getTextChannelById(channelId);
if (channel == null)
channel = jda.getNewsChannelById(channelId);
if (channel == null)
channel = jda.getThreadChannelById(channelId);
MessageChannel channel = getJDA().getChannelById(MessageChannel.class, channelId);
if (channel == null)
{
if (guild != null)
{
GuildChannel guildChannel = guild.getGuildChannelById(channelId);
if (guildChannel != null)
{
WebSocketClient.LOG.debug("Discarding MESSAGE_REACTION_REMOVE_ALL event for unexpected channel type. Channel: {}", guildChannel);
return null;
}
}

jda.getEventCache().cache(EventCache.Type.CHANNEL, channelId, responseNumber, allContent, this::handle);
EventCache.LOG.debug("Received a reaction for a channel that JDA does not currently have cached channel_id: {} message_id: {}", channelId, messageId);
return null;
Expand Down
21 changes: 10 additions & 11 deletions src/main/java/net/dv8tion/jda/internal/handle/MessageReactionClearEmoteHandler.java
View file
Expand Up @@ -16,14 +16,12 @@

package net.dv8tion.jda.internal.handle;

import net.dv8tion.jda.api.entities.Emote;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.GuildMessageChannel;
import net.dv8tion.jda.api.entities.MessageReaction;
import net.dv8tion.jda.api.entities.*;
import net.dv8tion.jda.api.events.message.react.MessageReactionRemoveEmoteEvent;
import net.dv8tion.jda.api.utils.data.DataObject;
import net.dv8tion.jda.internal.JDAImpl;
import net.dv8tion.jda.internal.entities.EmoteImpl;
import net.dv8tion.jda.internal.requests.WebSocketClient;

public class MessageReactionClearEmoteHandler extends SocketHandler
{
Expand All @@ -48,15 +46,16 @@ protected Long handleInternally(DataObject content)

long channelId = content.getUnsignedLong("channel_id");

//TODO-v5-unified-channel-cache
GuildMessageChannel channel = guild.getTextChannelById(channelId);
if (channel == null)
channel = guild.getNewsChannelById(channelId);
if (channel == null)
channel = guild.getThreadChannelById(channelId);

GuildMessageChannel channel = guild.getChannelById(GuildMessageChannel.class, channelId);
if (channel == null)
{
GuildChannel guildChannel = guild.getGuildChannelById(channelId);
if (guildChannel != null)
{
WebSocketClient.LOG.debug("Discarding MESSAGE_REACTION_REMOVE_EMOJI event for unexpected channel type. Channel: {}", guildChannel);
return null;
}

EventCache.LOG.debug("Caching MESSAGE_REACTION_REMOVE_EMOJI event for unknown channel {}", channelId);
getJDA().getEventCache().cache(EventCache.Type.CHANNEL, channelId, responseNumber, allContent, this::handle);
return null;
Expand Down
19 changes: 11 additions & 8 deletions src/main/java/net/dv8tion/jda/internal/handle/MessageReactionHandler.java
View file
Expand Up @@ -121,16 +121,19 @@ protected Long handleInternally(DataObject content)
}
}

//TODO-v5-unified-channel-cache
MessageChannel channel = api.getTextChannelById(channelId);
if (channel == null)
channel = api.getNewsChannelById(channelId);
if (channel == null)
channel = api.getThreadChannelById(channelId);
if (channel == null)
channel = api.getPrivateChannelById(channelId);
MessageChannel channel = api.getChannelById(MessageChannel.class, channelId);
if (channel == null)
{
if (guild != null)
{
GuildChannel guildChannel = guild.getGuildChannelById(channelId);
if (guildChannel != null)
{
WebSocketClient.LOG.debug("Discarding reaction event for unexpected channel type. Channel: {}", guildChannel);
return null;
}
}

if (guildId != 0)
{
api.getEventCache().cache(EventCache.Type.CHANNEL, channelId, responseNumber, allContent, this::handle);
Expand Down
35 changes: 25 additions & 10 deletions src/main/java/net/dv8tion/jda/internal/handle/MessageUpdateHandler.java
View file
Expand Up @@ -93,6 +93,16 @@ private Long handleMessage(DataObject content, Guild guild)
case EntityBuilder.MISSING_CHANNEL:
{
final long channelId = content.getLong("channel_id");
if (guild != null)
{
GuildChannel guildChannel = guild.getGuildChannelById(channelId);
if (guildChannel != null)
{
WebSocketClient.LOG.debug("Discarding MESSAGE_UPDATE event for unexpected channel type. Channel: {}", guildChannel);
return null;
}
}

getJDA().getEventCache().cache(EventCache.Type.CHANNEL, channelId, responseNumber, allContent, this::handle);
EventCache.LOG.debug("Received a message update for a channel that JDA does not currently have cached");
return null;
Expand Down Expand Up @@ -126,15 +136,20 @@ private Long handleMessageEmbed(DataObject content)
final long channelId = content.getLong("channel_id");
LinkedList<MessageEmbed> embeds = new LinkedList<>();

//TODO-v5-unified-channel-cache
//TODO-v5: handle for threads.
MessageChannel channel = getJDA().getTextChannelsView().get(channelId);
if (channel == null)
channel = getJDA().getNewsChannelById(channelId);
if (channel == null)
channel = getJDA().getPrivateChannelsView().get(channelId);
MessageChannel channel = getJDA().getChannelById(MessageChannel.class, channelId);
if (channel == null)
{
Guild guild = getJDA().getGuildById(content.getUnsignedLong("guild_id", 0L));
if (guild != null)
{
GuildChannel guildChannel = guild.getGuildChannelById(channelId);
if (guildChannel != null)
{
WebSocketClient.LOG.debug("Discarding MESSAGE_UPDATE event for unexpected channel type. Channel: {}", guildChannel);
return null;
}
}

getJDA().getEventCache().cache(EventCache.Type.CHANNEL, channelId, responseNumber, allContent, this::handle);
EventCache.LOG.debug("Received message update for embeds for a channel/group that JDA does not have cached yet.");
return null;
Expand All @@ -145,9 +160,9 @@ private Long handleMessageEmbed(DataObject content)
embeds.add(builder.createMessageEmbed(embedsJson.getObject(i)));

getJDA().handleEvent(
new MessageEmbedEvent(
getJDA(), responseNumber,
messageId, channel, embeds));
new MessageEmbedEvent(
getJDA(), responseNumber,
messageId, channel, embeds));
return null;
}
}
8 changes: 1 addition & 7 deletions src/main/java/net/dv8tion/jda/internal/handle/TypingStartHandler.java
View file
Expand Up @@ -52,13 +52,7 @@ else if (guild == null)
}

final long channelId = content.getLong("channel_id");

//TODO-v5-unified-channel-cache
MessageChannel channel = getJDA().getTextChannelsView().get(channelId);
if (channel == null)
channel = getJDA().getNewsChannelView().get(channelId);
if (channel == null)
channel = getJDA().getPrivateChannelsView().get(channelId);
MessageChannel channel = getJDA().getChannelById(MessageChannel.class, channelId);
if (channel == null)
return null; //We don't have the channel cached yet. We chose not to cache this event
// because that happen very often and could easily fill up the EventCache if
Expand Down

0 comments on commit ad17d4c

Please sign in to comment.