From a1e1396bdb82c161f530b99c28ba6bc0e23092d1 Mon Sep 17 00:00:00 2001 From: Chaoscaot Date: Sat, 31 Aug 2024 20:17:02 +0200 Subject: [PATCH 1/2] Fix Discord Ticket Log --- .../velocitycore/discord/listeners/DiscordTicketHandler.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/DiscordTicketHandler.java b/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/DiscordTicketHandler.java index af36de97..f1520c40 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/DiscordTicketHandler.java +++ b/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/DiscordTicketHandler.java @@ -46,6 +46,7 @@ import org.jetbrains.annotations.NotNull; import java.awt.*; import java.time.Instant; +import java.util.Collections; import java.util.LinkedList; import java.util.stream.Collectors; @@ -118,7 +119,9 @@ public class DiscordTicketHandler extends ListenerAdapter { TextChannel logChannel = event.getGuild().getTextChannelById(TICKET_LOG); SplitUtil.split( - messages.stream().map(StringBuilder::toString).collect(Collectors.joining("\n")), + messages.stream() + .sorted(Collections.reverseOrder()) + .map(StringBuilder::toString).collect(Collectors.joining()), 2000, SplitUtil.Strategy.NEWLINE, SplitUtil.Strategy.ANYWHERE From 35d812b280714eb28e8673d9c3b3eb1309b87f08 Mon Sep 17 00:00:00 2001 From: Chaoscaot Date: Tue, 3 Sep 2024 00:34:07 +0200 Subject: [PATCH 2/2] Fix Discord Ticket Log --- .../velocitycore/discord/listeners/DiscordTicketHandler.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/DiscordTicketHandler.java b/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/DiscordTicketHandler.java index f1520c40..a9592c6c 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/DiscordTicketHandler.java +++ b/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/DiscordTicketHandler.java @@ -87,7 +87,7 @@ public class DiscordTicketHandler extends ListenerAdapter { public void onGenericComponentInteractionCreate(@NotNull GenericComponentInteractionCreateEvent event) { MessageChannel messageChannel = event.getChannel(); if(messageChannel instanceof TextChannel channel && channel.getParentCategoryIdLong() != 0 && channel.getParentCategoryId().equals(TICKET_CATEGORY) && event.getComponentId().startsWith("close-")) { - LinkedList messages = channel.getIterableHistory().complete().stream() + LinkedList messages = channel.getIterableHistory().reverse().complete().stream() .filter(message -> !message.getAuthor().isSystem() && !message.getAuthor().isBot()) .map(message -> { StringBuilder stringBuilder = new StringBuilder() @@ -105,7 +105,7 @@ public class DiscordTicketHandler extends ListenerAdapter { }) .collect(Collectors.toCollection(LinkedList::new)); - messages.addFirst(new StringBuilder().append(" **").append(event.getUser().getName()).append("**: Ticket closed")); + messages.add(new StringBuilder().append(" **").append(event.getUser().getName()).append("**: Ticket closed")); EmbedBuilder embedBuilder = new EmbedBuilder() .setColor(Color.GREEN) @@ -120,7 +120,6 @@ public class DiscordTicketHandler extends ListenerAdapter { TextChannel logChannel = event.getGuild().getTextChannelById(TICKET_LOG); SplitUtil.split( messages.stream() - .sorted(Collections.reverseOrder()) .map(StringBuilder::toString).collect(Collectors.joining()), 2000, SplitUtil.Strategy.NEWLINE,