Skip to content

Commit e527d9d

Browse files
committed
fix order of QOTW-view messages
1 parent d143fd4 commit e527d9d

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

src/main/java/net/javadiscord/javabot/systems/qotw/commands/view/QOTWViewAnswerSubcommand.java

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
package net.javadiscord.javabot.systems.qotw.commands.view;
22

3+
import java.util.Comparator;
4+
5+
import org.jetbrains.annotations.NotNull;
6+
37
import com.dynxsty.dih4jda.interactions.commands.SlashCommand;
8+
49
import net.dv8tion.jda.api.EmbedBuilder;
10+
import net.dv8tion.jda.api.entities.Message;
511
import net.dv8tion.jda.api.entities.MessageEmbed;
612
import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
713
import net.dv8tion.jda.api.interactions.commands.OptionMapping;
@@ -13,7 +19,6 @@
1319
import net.javadiscord.javabot.systems.qotw.submissions.model.QOTWSubmission;
1420
import net.javadiscord.javabot.util.MessageActionUtils;
1521
import net.javadiscord.javabot.util.Responses;
16-
import org.jetbrains.annotations.NotNull;
1722

1823
/**
1924
* Represents the `/qotw-view answer` subcommand. It allows for viewing an answer to a QOTW.
@@ -63,7 +68,12 @@ public void execute(@NotNull SlashCommandInteractionEvent event) {
6368
MessageActionUtils.copyMessagesToNewThread(event.getGuildChannel().asStandardGuildMessageChannel(),
6469
buildQOTWInfoEmbed(submission, event.getMember() == null ? event.getUser().getName() : event.getMember().getEffectiveName()),
6570
"QOTW #" + submission.getQuestionNumber(),
66-
history.getRetrievedHistory(),
71+
history
72+
.getRetrievedHistory()
73+
.stream()
74+
.filter(msg -> !msg.getAuthor().isSystem() && !msg.getAuthor().isBot())
75+
.sorted(Comparator.comparingLong(Message::getIdLong))
76+
.toList(),
6777
thread -> {
6878
Responses.success(event.getHook(), "View Answer", "Answer copied successfully").queue();
6979
thread.getManager().setLocked(true).queue();

0 commit comments

Comments
 (0)