Skip to content

Remove MessageEmbedEvent #2720

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 21, 2024
Merged

Remove MessageEmbedEvent #2720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 0 additions & 60 deletions src/main/java/net/dv8tion/jda/api/events/message/MessageEmbedEvent.java
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/main/java/net/dv8tion/jda/api/hooks/ListenerAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,6 @@ public void onMessageReceived(@Nonnull MessageReceivedEvent event) {}
public void onMessageUpdate(@Nonnull MessageUpdateEvent event) {}
public void onMessageDelete(@Nonnull MessageDeleteEvent event) {}
public void onMessageBulkDelete(@Nonnull MessageBulkDeleteEvent event) {}
public void onMessageEmbed(@Nonnull MessageEmbedEvent event) {}
public void onMessageReactionAdd(@Nonnull MessageReactionAddEvent event) {}
public void onMessageReactionRemove(@Nonnull MessageReactionRemoveEvent event) {}
public void onMessageReactionRemoveAll(@Nonnull MessageReactionRemoveAllEvent event) {}
Expand Down
51 changes: 0 additions & 51 deletions src/main/java/net/dv8tion/jda/internal/handle/MessageUpdateHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,15 @@

import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.Message;
import net.dv8tion.jda.api.entities.MessageEmbed;
import net.dv8tion.jda.api.entities.MessageType;
import net.dv8tion.jda.api.entities.channel.ChannelType;
import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
import net.dv8tion.jda.api.events.message.MessageEmbedEvent;
import net.dv8tion.jda.api.events.message.MessageUpdateEvent;
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.entities.EntityBuilder;
import net.dv8tion.jda.internal.requests.WebSocketClient;

import java.util.LinkedList;

public class MessageUpdateHandler extends SocketHandler
{

Expand Down Expand Up @@ -72,15 +66,7 @@ protected Long handleInternally(DataObject content)
WebSocketClient.LOG.debug("JDA received a message update for an unexpected message type. Type: {} JSON: {}", type, content);
return null;
}
else if (!content.isNull("embeds"))
{
//Received update with no "type" field which means its an update for a rich embed message
handleMessageEmbed(content);
return null;
}
}
else if (!content.isNull("embeds"))
return handleMessageEmbed(content);
return null;
}

Expand Down Expand Up @@ -137,41 +123,4 @@ private Long handleMessage(DataObject content, Guild guild)
message));
return null;
}

private Long handleMessageEmbed(DataObject content)
{
EntityBuilder builder = getJDA().getEntityBuilder();
final long messageId = content.getLong("id");
final long channelId = content.getLong("channel_id");
LinkedList<MessageEmbed> embeds = new LinkedList<>();

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;
}

DataArray embedsJson = content.getArray("embeds");
for (int i = 0; i < embedsJson.length(); i++)
embeds.add(builder.createMessageEmbed(embedsJson.getObject(i)));

getJDA().handleEvent(
new MessageEmbedEvent(
getJDA(), responseNumber,
messageId, channel, embeds));
return null;
}
}
Loading