From cdf852747e7fc2f3d82d7a240e4bd25bdbde49e3 Mon Sep 17 00:00:00 2001 From: danthe1st Date: Sat, 11 Jan 2025 23:50:04 +0100 Subject: [PATCH 1/2] split message attachments in embed fields --- .../data/h2db/message_cache/MessageCache.java | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/src/main/java/net/discordjug/javabot/data/h2db/message_cache/MessageCache.java b/src/main/java/net/discordjug/javabot/data/h2db/message_cache/MessageCache.java index 13d49d4dd..ca914fe70 100644 --- a/src/main/java/net/discordjug/javabot/data/h2db/message_cache/MessageCache.java +++ b/src/main/java/net/discordjug/javabot/data/h2db/message_cache/MessageCache.java @@ -206,15 +206,24 @@ private MessageEmbed buildMessageDeleteEmbed(Guild guild, User author, MessageCh message.getMessageContent().length(), MessageEmbed.VALUE_MAX_LENGTH)), false); if (!message.getAttachments().isEmpty()) { - eb.addField("Attachments", - message - .getAttachments() - .stream() - .collect(Collectors.joining("\n")), - false); + addAttachmentsToMessageBuilder(message, eb); } - return eb - .build(); + return eb.build(); + } + + private void addAttachmentsToMessageBuilder(CachedMessage message, EmbedBuilder eb) { + StringBuilder attachmentBuilder = new StringBuilder(); + for (String attachment : message.getAttachments()) { + if(attachmentBuilder.length() + attachment.length() >= MessageEmbed.VALUE_MAX_LENGTH - 1) { + eb.addField("Attachments", attachmentBuilder.toString(),false); + attachmentBuilder.setLength(0); + + }else { + attachmentBuilder.append('\n'); + } + attachmentBuilder.append(attachment); + } + eb.addField("Attachments", attachmentBuilder.toString(), false); } private InputStream buildDeletedMessageFile(User author, CachedMessage message) { From 1822ff3410987463884d96f960a52416be170209 Mon Sep 17 00:00:00 2001 From: danthe1st Date: Tue, 14 Jan 2025 22:04:39 +0100 Subject: [PATCH 2/2] fix formatting --- .../javabot/data/h2db/message_cache/MessageCache.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/discordjug/javabot/data/h2db/message_cache/MessageCache.java b/src/main/java/net/discordjug/javabot/data/h2db/message_cache/MessageCache.java index ca914fe70..606fec2fb 100644 --- a/src/main/java/net/discordjug/javabot/data/h2db/message_cache/MessageCache.java +++ b/src/main/java/net/discordjug/javabot/data/h2db/message_cache/MessageCache.java @@ -214,11 +214,11 @@ private MessageEmbed buildMessageDeleteEmbed(Guild guild, User author, MessageCh private void addAttachmentsToMessageBuilder(CachedMessage message, EmbedBuilder eb) { StringBuilder attachmentBuilder = new StringBuilder(); for (String attachment : message.getAttachments()) { - if(attachmentBuilder.length() + attachment.length() >= MessageEmbed.VALUE_MAX_LENGTH - 1) { + if (attachmentBuilder.length() + attachment.length() >= MessageEmbed.VALUE_MAX_LENGTH - 1) { eb.addField("Attachments", attachmentBuilder.toString(),false); attachmentBuilder.setLength(0); - }else { + } else { attachmentBuilder.append('\n'); } attachmentBuilder.append(attachment);