Skip to content

Commit 745c108

Browse files
committed
Replaced overview message to embed
1 parent 8f60483 commit 745c108

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

application/src/main/java/org/togetherjava/tjbot/commands/help/HelpThreadOverviewUpdater.java

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.togetherjava.tjbot.commands.help;
22

3+
import net.dv8tion.jda.api.EmbedBuilder;
34
import net.dv8tion.jda.api.JDA;
45
import net.dv8tion.jda.api.entities.Guild;
56
import net.dv8tion.jda.api.entities.Message;
@@ -13,10 +14,12 @@
1314
import net.dv8tion.jda.api.utils.messages.MessageEditBuilder;
1415
import net.dv8tion.jda.api.utils.messages.MessageEditData;
1516
import net.dv8tion.jda.internal.requests.CompletedRestAction;
17+
import org.jetbrains.annotations.NonNls;
1618
import org.slf4j.Logger;
1719
import org.slf4j.LoggerFactory;
1820
import org.togetherjava.tjbot.commands.MessageReceiverAdapter;
1921
import org.togetherjava.tjbot.commands.Routine;
22+
import org.togetherjava.tjbot.commands.utils.DiscordClientAction;
2023
import org.togetherjava.tjbot.config.Config;
2124

2225
import javax.annotation.Nullable;
@@ -39,7 +42,7 @@
3942
public final class HelpThreadOverviewUpdater extends MessageReceiverAdapter implements Routine {
4043
private static final Logger logger = LoggerFactory.getLogger(HelpThreadOverviewUpdater.class);
4144

42-
private static final String STATUS_TITLE = "## __**Active questions**__ ##";
45+
private static final @NonNls String STATUS_TITLE = "## Active questions ##";
4346
private static final int OVERVIEW_QUESTION_LIMIT = 150;
4447
private static final AtomicInteger FIND_STATUS_MESSAGE_CONSECUTIVE_FAILURES =
4548
new AtomicInteger(0);
@@ -120,7 +123,9 @@ private void updateOverview(TextChannel overviewChannel) {
120123
logger.debug("Found {} active questions", activeThreads.size());
121124

122125
MessageEditData message = new MessageEditBuilder()
123-
.setContent(STATUS_TITLE + "\n\n" + createDescription(activeThreads))
126+
.setEmbeds(new EmbedBuilder().setTitle(STATUS_TITLE)
127+
.setDescription(createDescription(activeThreads))
128+
.build())
124129
.build();
125130

126131
getStatusMessage(overviewChannel)
@@ -163,12 +168,13 @@ private static RestAction<Optional<Message>> getStatusMessage(MessageChannel cha
163168
}
164169

165170
private static boolean isStatusMessage(Message message) {
166-
if (!message.getAuthor().equals(message.getJDA().getSelfUser())) {
171+
if (message.getEmbeds().isEmpty()
172+
|| !message.getAuthor().equals(message.getJDA().getSelfUser())) {
167173
return false;
168174
}
169175

170-
String content = message.getContentRaw();
171-
return content.startsWith(STATUS_TITLE);
176+
String messageEmbedTitle = message.getEmbeds().get(0).getTitle();
177+
return STATUS_TITLE.equals(messageEmbedTitle);
172178
}
173179

174180
private RestAction<Message> sendUpdatedOverview(@Nullable Message statusMessage,

0 commit comments

Comments
 (0)