From eb5a2949d37d6b178d35e75d02915da101e132c1 Mon Sep 17 00:00:00 2001 From: Tijs Date: Thu, 6 Oct 2022 10:15:19 +0200 Subject: [PATCH 1/2] Replaced overview message to embed --- .../commands/help/HelpThreadOverviewUpdater.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/help/HelpThreadOverviewUpdater.java b/application/src/main/java/org/togetherjava/tjbot/commands/help/HelpThreadOverviewUpdater.java index 3337e18f6e..164cc717db 100644 --- a/application/src/main/java/org/togetherjava/tjbot/commands/help/HelpThreadOverviewUpdater.java +++ b/application/src/main/java/org/togetherjava/tjbot/commands/help/HelpThreadOverviewUpdater.java @@ -1,5 +1,6 @@ package org.togetherjava.tjbot.commands.help; +import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Message; @@ -13,6 +14,7 @@ import net.dv8tion.jda.api.utils.messages.MessageEditBuilder; import net.dv8tion.jda.api.utils.messages.MessageEditData; import net.dv8tion.jda.internal.requests.CompletedRestAction; +import org.jetbrains.annotations.NonNls; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.togetherjava.tjbot.commands.MessageReceiverAdapter; @@ -39,7 +41,7 @@ public final class HelpThreadOverviewUpdater extends MessageReceiverAdapter implements Routine { private static final Logger logger = LoggerFactory.getLogger(HelpThreadOverviewUpdater.class); - private static final String STATUS_TITLE = "## __**Active questions**__ ##"; + private static final @NonNls String STATUS_TITLE = "## Active questions ##"; private static final int OVERVIEW_QUESTION_LIMIT = 150; private static final AtomicInteger FIND_STATUS_MESSAGE_CONSECUTIVE_FAILURES = new AtomicInteger(0); @@ -120,7 +122,9 @@ private void updateOverview(TextChannel overviewChannel) { logger.debug("Found {} active questions", activeThreads.size()); MessageEditData message = new MessageEditBuilder() - .setContent(STATUS_TITLE + "\n\n" + createDescription(activeThreads)) + .setEmbeds(new EmbedBuilder().setTitle(STATUS_TITLE) + .setDescription(createDescription(activeThreads)) + .build()) .build(); getStatusMessage(overviewChannel) @@ -163,12 +167,13 @@ private static RestAction> getStatusMessage(MessageChannel cha } private static boolean isStatusMessage(Message message) { - if (!message.getAuthor().equals(message.getJDA().getSelfUser())) { + if (message.getEmbeds().isEmpty() + || !message.getAuthor().equals(message.getJDA().getSelfUser())) { return false; } - String content = message.getContentRaw(); - return content.startsWith(STATUS_TITLE); + String messageEmbedTitle = message.getEmbeds().get(0).getTitle(); + return STATUS_TITLE.equals(messageEmbedTitle); } private RestAction sendUpdatedOverview(@Nullable Message statusMessage, From f4de2736033dca4f31d66b34a7f764a4295a061e Mon Sep 17 00:00:00 2001 From: Tijs Date: Tue, 11 Oct 2022 11:59:13 +0200 Subject: [PATCH 2/2] Removed NonNls annotation --- .../tjbot/commands/help/HelpThreadOverviewUpdater.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/help/HelpThreadOverviewUpdater.java b/application/src/main/java/org/togetherjava/tjbot/commands/help/HelpThreadOverviewUpdater.java index 164cc717db..c6024c643a 100644 --- a/application/src/main/java/org/togetherjava/tjbot/commands/help/HelpThreadOverviewUpdater.java +++ b/application/src/main/java/org/togetherjava/tjbot/commands/help/HelpThreadOverviewUpdater.java @@ -14,7 +14,6 @@ import net.dv8tion.jda.api.utils.messages.MessageEditBuilder; import net.dv8tion.jda.api.utils.messages.MessageEditData; import net.dv8tion.jda.internal.requests.CompletedRestAction; -import org.jetbrains.annotations.NonNls; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.togetherjava.tjbot.commands.MessageReceiverAdapter; @@ -41,7 +40,7 @@ public final class HelpThreadOverviewUpdater extends MessageReceiverAdapter implements Routine { private static final Logger logger = LoggerFactory.getLogger(HelpThreadOverviewUpdater.class); - private static final @NonNls String STATUS_TITLE = "## Active questions ##"; + private static final String STATUS_TITLE = "## Active questions ##"; private static final int OVERVIEW_QUESTION_LIMIT = 150; private static final AtomicInteger FIND_STATUS_MESSAGE_CONSECUTIVE_FAILURES = new AtomicInteger(0);