diff --git a/README.md b/README.md index 7944080c4..cb8b5d00b 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ An example implementation of this bot can be seen [here](https://github.com/Shel ## Technologies -* [JDA](https://github.com/DV8FromTheWorld/JDA/) The Discord API Wrapper in the version 4.2.1_262 +* [JDA](https://github.com/DV8FromTheWorld/JDA/) The Discord API Wrapper in the version 4.3.0_284 * [Spring boot](https://github.com/spring-projects/spring-boot) is used as a framework to create standalone application in Java with Java EE methods. (including Dependency injection and more) * [Hibernate](https://github.com/hibernate/hibernate-orm) is used as a reference implementation of JPA. * [Freemarker](https://github.com/apache/freemarker) is used as a templating engine. This is used to provide internationalization for user facing text and enable dynamic embed configuration. diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ChannelServiceBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ChannelServiceBean.java index b2f531389..25ee74159 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ChannelServiceBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ChannelServiceBean.java @@ -180,7 +180,7 @@ public class ChannelServiceBean implements ChannelService { @Override public MessageAction sendEmbedToChannelInComplete(MessageEmbed embed, MessageChannel channel) { metricService.incrementCounter(MESSAGE_SEND_METRIC); - return channel.sendMessage(embed).allowedMentions(getAllowedMentionsFor(channel, null)); + return channel.sendMessageEmbeds(embed).allowedMentions(getAllowedMentionsFor(channel, null)); } @Override @@ -218,7 +218,7 @@ public class ChannelServiceBean implements ChannelService { metricService.incrementCounter(MESSAGE_SEND_METRIC); String text = messageToSend.getMessages().get(i); MessageEmbed embed = messageToSend.getEmbeds().get(i); - MessageAction messageAction = textChannel.sendMessage(text).embed(embed); + MessageAction messageAction = textChannel.sendMessage(text).setEmbeds(embed); allMessageActions.add(messageAction); } // one of these loops will get additional iterations, if the number is different, not both @@ -231,7 +231,7 @@ public class ChannelServiceBean implements ChannelService { for (int i = iterations; i < messageToSend.getEmbeds().size(); i++) { metricService.incrementCounter(MESSAGE_SEND_METRIC); MessageEmbed embed = messageToSend.getEmbeds().get(i); - MessageAction messageAction = textChannel.sendMessage(embed); + MessageAction messageAction = textChannel.sendMessageEmbeds(embed); allMessageActions.add(messageAction); } if(messageToSend.hasFileToSend()) { @@ -280,12 +280,12 @@ public class ChannelServiceBean implements ChannelService { messageAction = channel.editMessageById(messageId, messageToSend.getMessages().get(0)); if(messageToSend.getEmbeds() != null && !messageToSend.getEmbeds().isEmpty()) { log.debug("Also editing the embed for message {}.", messageId); - messageAction = messageAction.embed(messageToSend.getEmbeds().get(0)); + messageAction = messageAction.setEmbeds(messageToSend.getEmbeds().get(0)); } } else { log.debug("Editing message {} with new embeds.", messageId); if(messageToSend.getEmbeds() != null && !messageToSend.getEmbeds().isEmpty()) { - messageAction = channel.editMessageById(messageId, messageToSend.getEmbeds().get(0)); + messageAction = channel.editMessageEmbedsById(messageId, messageToSend.getEmbeds().get(0)); } else { throw new IllegalArgumentException("Message to send did not contain anything to send."); } @@ -300,7 +300,7 @@ public class ChannelServiceBean implements ChannelService { @Override public CompletableFuture editEmbedMessageInAChannel(MessageEmbed embedToSend, MessageChannel channel, Long messageId) { metricService.incrementCounter(MESSAGE_EDIT_METRIC); - return channel.editMessageById(messageId, embedToSend).submit(); + return channel.editMessageEmbedsById(messageId, embedToSend).submit(); } @Override @@ -312,7 +312,7 @@ public class ChannelServiceBean implements ChannelService { @Override public CompletableFuture editTextMessageInAChannel(String text, MessageEmbed messageEmbed, MessageChannel channel, Long messageId) { metricService.incrementCounter(MESSAGE_EDIT_METRIC); - return channel.editMessageById(messageId, text).embed(messageEmbed).submit(); + return channel.editMessageById(messageId, text).setEmbeds(messageEmbed).submit(); } @Override diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/MessageServiceBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/MessageServiceBean.java index 130867ede..97e134289 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/MessageServiceBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/MessageServiceBean.java @@ -208,13 +208,13 @@ public class MessageServiceBean implements MessageService { @Override public MessageAction editMessage(Message message, MessageEmbed messageEmbed) { metricService.incrementCounter(MESSAGE_EDIT_METRIC); - return message.editMessage(messageEmbed); + return message.editMessageEmbeds(messageEmbed); } @Override public MessageAction editMessage(Message message, String text, MessageEmbed messageEmbed) { metricService.incrementCounter(MESSAGE_EDIT_METRIC); - return message.editMessage(text).embed(messageEmbed); + return message.editMessage(text).setEmbeds(messageEmbed); } @Override diff --git a/abstracto-application/pom.xml b/abstracto-application/pom.xml index 7d8c44ecb..f5373e348 100644 --- a/abstracto-application/pom.xml +++ b/abstracto-application/pom.xml @@ -57,7 +57,7 @@ yyyy/MM/dd HH:mm - 4.2.1_262 + 4.3.0_284 3.0.4 2.0.0-RC.1 1.5.3