Sheldan/abstracto
1
0
Fork 0
mirror of https://github.com/Sheldan/abstracto.git synced 2026-01-23 20:30:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

[AB-xxx] upgrading to newer JDA version

Browse Source
This commit is contained in:
Sheldan
2021-06-27 22:47:10 +02:00
parent 67121b318d
commit bbc5918d88
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ChannelServiceBean.java
View File

@@ -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<Message> 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<Message> 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

4
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/MessageServiceBean.java
View File

@@ -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