Sheldan/abstracto
1
0
Fork 0
mirror of https://github.com/Sheldan/abstracto.git synced 2026-04-05 17:07:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

[AB-347] adding support for multiple and generic attachments to modmail

Browse Source 
fixing editing messages with multiple embeds
fixing message limit also bein imposed on pure embed count
This commit is contained in:
Sheldan
2021-12-25 16:29:23 +01:00
parent cc898b27bb
commit 986b65a1e4
6 changed files with 54 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -314,12 +314,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.setEmbeds(messageToSend.getEmbeds().get(0));
messageAction = messageAction.setEmbeds(messageToSend.getEmbeds());
}
} else {
log.debug("Editing message {} with new embeds.", messageId);
if(messageToSend.getEmbeds() != null && !messageToSend.getEmbeds().isEmpty()) {
messageAction = channel.editMessageEmbedsById(messageId, messageToSend.getEmbeds().get(0));
messageAction = channel.editMessageEmbedsById(messageId, messageToSend.getEmbeds());
} else {
throw new IllegalArgumentException("Message to send did not contain anything to send.");
}

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

@@ -201,10 +201,6 @@ public class TemplateServiceBean implements TemplateService {
if(messageConfiguration.getMessageConfig() != null && messageConfiguration.getMessageConfig().getMessageLimit() != null) {
messageLimit = Math.min(messageLimit, messageConfiguration.getMessageConfig().getMessageLimit());
}
if(embeds.size() > messageLimit) {
log.info("Limiting size of embeds. Max allowed: {}, currently: {}.", messageLimit, embeds.size());
embeds.subList(messageLimit.intValue(), embeds.size()).clear();
}
if(messages.size() > messageLimit) {
log.info("Limiting size of messages. Max allowed: {}, currently: {}.", messageLimit, messages.size());
messages.subList(messageLimit.intValue(), messages.size()).clear();