Skip to content

Commit 535777d

Browse files
committed
Make overview message a message instead of embed (clickable on mobile)
1 parent 3ad4687 commit 535777d

File tree

1 file changed

+8
-14
lines changed

1 file changed

+8
-14
lines changed

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

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

3-
import net.dv8tion.jda.api.EmbedBuilder;
43
import net.dv8tion.jda.api.JDA;
4+
import net.dv8tion.jda.api.MessageBuilder;
55
import net.dv8tion.jda.api.entities.*;
66
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
77
import net.dv8tion.jda.api.requests.RestAction;
@@ -31,7 +31,7 @@
3131
public final class HelpThreadOverviewUpdater extends MessageReceiverAdapter implements Routine {
3232
private static final Logger logger = LoggerFactory.getLogger(HelpThreadOverviewUpdater.class);
3333

34-
private static final String STATUS_TITLE = "Active questions";
34+
private static final String STATUS_TITLE = "## __**Active questions**__ ##";
3535
private static final int OVERVIEW_QUESTION_LIMIT = 150;
3636

3737
private final HelpSystemHelper helper;
@@ -131,19 +131,18 @@ private void updateOverview(@NotNull IThreadContainer stagingChannel,
131131

132132
logger.debug("Found {} active questions", activeThreads.size());
133133

134-
MessageEmbed embed = new EmbedBuilder().setTitle(STATUS_TITLE)
135-
.setDescription(createDescription(activeThreads))
136-
.setColor(HelpSystemHelper.AMBIENT_COLOR)
134+
Message message = new MessageBuilder()
135+
.setContent(STATUS_TITLE + "\n\n" + createDescription(activeThreads))
137136
.build();
138137

139138
getStatusMessage(overviewChannel).flatMap(maybeStatusMessage -> {
140139
logger.debug("Sending the updated question overview");
141140
if (maybeStatusMessage.isEmpty()) {
142-
return overviewChannel.sendMessageEmbeds(embed);
141+
return overviewChannel.sendMessage(message);
143142
}
144143

145144
String statusMessageId = maybeStatusMessage.orElseThrow().getId();
146-
return overviewChannel.editMessageEmbedsById(statusMessageId, embed);
145+
return overviewChannel.editMessageById(statusMessageId, message);
147146
}).queue();
148147
}
149148

@@ -186,13 +185,8 @@ private static boolean isStatusMessage(@NotNull Message message) {
186185
return false;
187186
}
188187

189-
List<MessageEmbed> embeds = message.getEmbeds();
190-
if (embeds.isEmpty()) {
191-
return false;
192-
}
193-
194-
MessageEmbed embed = embeds.get(0);
195-
return STATUS_TITLE.equals(embed.getTitle());
188+
String content = message.getContentRaw();
189+
return content.startsWith(STATUS_TITLE);
196190
}
197191

198192
private enum ChannelType {

0 commit comments

Comments
 (0)