Skip to content

Replaced overview message to embed #611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 11, 2022
Merged

Replaced overview message to embed #611

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb5a294
Replaced overview message to embed
Tais993 Oct 6, 2022
f4de273
Removed NonNls annotation
Tais993 Oct 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions ...ication/src/main/java/org/togetherjava/tjbot/commands/help/HelpThreadOverviewUpdater.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -39,7 +40,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 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);
Expand Down Expand Up @@ -120,7 +121,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)
Expand Down Expand Up @@ -163,12 +166,13 @@ private static RestAction<Optional<Message>> 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<Message> sendUpdatedOverview(@Nullable Message statusMessage,
Expand Down