Skip to content

Commit 9f85534

Browse files
authored
Merge pull request #509 from danthe1st/message-links
split message attachments in embed fields
2 parents e4869d1 + 1822ff3 commit 9f85534

File tree

1 file changed

+17
-8
lines changed

1 file changed

+17
-8
lines changed

src/main/java/net/discordjug/javabot/data/h2db/message_cache/MessageCache.java

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -206,15 +206,24 @@ private MessageEmbed buildMessageDeleteEmbed(Guild guild, User author, MessageCh
206206
message.getMessageContent().length(),
207207
MessageEmbed.VALUE_MAX_LENGTH)), false);
208208
if (!message.getAttachments().isEmpty()) {
209-
eb.addField("Attachments",
210-
message
211-
.getAttachments()
212-
.stream()
213-
.collect(Collectors.joining("\n")),
214-
false);
209+
addAttachmentsToMessageBuilder(message, eb);
215210
}
216-
return eb
217-
.build();
211+
return eb.build();
212+
}
213+
214+
private void addAttachmentsToMessageBuilder(CachedMessage message, EmbedBuilder eb) {
215+
StringBuilder attachmentBuilder = new StringBuilder();
216+
for (String attachment : message.getAttachments()) {
217+
if (attachmentBuilder.length() + attachment.length() >= MessageEmbed.VALUE_MAX_LENGTH - 1) {
218+
eb.addField("Attachments", attachmentBuilder.toString(),false);
219+
attachmentBuilder.setLength(0);
220+
221+
} else {
222+
attachmentBuilder.append('\n');
223+
}
224+
attachmentBuilder.append(attachment);
225+
}
226+
eb.addField("Attachments", attachmentBuilder.toString(), false);
218227
}
219228

220229
private InputStream buildDeletedMessageFile(User author, CachedMessage message) {

0 commit comments

Comments
 (0)