Skip to content

Commit 8038325

Browse files
committed
Fix reminders not mentioning
1 parent abf06b7 commit 8038325

File tree

4 files changed

+7
-15
lines changed

4 files changed

+7
-15
lines changed

src/commander/java/com/mcmoddev/mmdbot/commander/TheCommander.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -330,9 +330,6 @@ public void start() {
330330
jdbi = Jdbi.create(dataSource);
331331
}
332332

333-
MessageRequest.setDefaultMentionRepliedUser(false);
334-
MessageRequest.setDefaultMentions(DEFAULT_MENTIONS);
335-
336333
// Setup components
337334
{
338335
final var storage = ComponentStorage.sql(jdbi, "components");

src/commander/java/com/mcmoddev/mmdbot/commander/reminders/Reminder.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ public void run() {
105105

106106
public MessageCreateBuilder buildMessage(final JDA jda, final User user) {
107107
return new MessageCreateBuilder()
108+
.mention(user)
108109
.setContent(isPrivateChannel() ? null : user.getAsMention())
109110
.setEmbeds(
110111
new EmbedBuilder()

src/core/java/com/mcmoddev/mmdbot/core/RunBots.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
import com.mcmoddev.mmdbot.core.util.Constants;
2929
import com.mcmoddev.mmdbot.core.util.TaskScheduler;
3030
import lombok.experimental.UtilityClass;
31+
import net.dv8tion.jda.api.entities.Message;
32+
import net.dv8tion.jda.api.utils.messages.MessageRequest;
3133
import org.slf4j.Logger;
3234
import org.slf4j.LoggerFactory;
3335

@@ -42,6 +44,7 @@
4244
import java.nio.file.Path;
4345
import java.util.ArrayList;
4446
import java.util.Comparator;
47+
import java.util.EnumSet;
4548
import java.util.List;
4649
import java.util.Map;
4750
import java.util.Objects;
@@ -65,6 +68,9 @@ public class RunBots {
6568
// thread are D4J bots
6669
BOT_STARTER_EXECUTOR.setKeepAliveTime(2, TimeUnit.MINUTES);
6770
BOT_STARTER_EXECUTOR.allowCoreThreadTimeOut(true);
71+
72+
MessageRequest.setDefaultMentionRepliedUser(false);
73+
MessageRequest.setDefaultMentions(EnumSet.complementOf(EnumSet.of(Message.MentionType.HERE, Message.MentionType.EVERYONE)));
6874
}
6975

7076
private static final Logger LOG = LoggerFactory.getLogger(RunBots.class);

src/watcher/java/com/mcmoddev/mmdbot/watcher/TheWatcher.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
*/
2121
package com.mcmoddev.mmdbot.watcher;
2222

23-
import club.minnced.discord.webhook.send.AllowedMentions;
2423
import com.jagrosh.jdautilities.command.CommandClient;
2524
import com.jagrosh.jdautilities.command.CommandClientBuilder;
2625
import com.mcmoddev.mmdbot.core.bot.Bot;
@@ -61,13 +60,11 @@
6160
import net.dv8tion.jda.api.JDABuilder;
6261
import net.dv8tion.jda.api.entities.Activity;
6362
import net.dv8tion.jda.api.entities.Member;
64-
import net.dv8tion.jda.api.entities.Message;
6563
import net.dv8tion.jda.api.events.Event;
6664
import net.dv8tion.jda.api.events.ReadyEvent;
6765
import net.dv8tion.jda.api.exceptions.InvalidTokenException;
6866
import net.dv8tion.jda.api.hooks.EventListener;
6967
import net.dv8tion.jda.api.requests.GatewayIntent;
70-
import net.dv8tion.jda.api.requests.restaction.MessageCreateAction;
7168
import net.dv8tion.jda.api.utils.cache.CacheFlag;
7269
import net.dv8tion.jda.api.utils.messages.MessageRequest;
7370
import org.flywaydb.core.Flyway;
@@ -81,11 +78,9 @@
8178
import org.spongepowered.configurate.serialize.TypeSerializerCollection;
8279
import org.sqlite.SQLiteDataSource;
8380

84-
import javax.security.auth.login.LoginException;
8581
import java.io.IOException;
8682
import java.nio.file.Files;
8783
import java.nio.file.Path;
88-
import java.util.EnumSet;
8984
import java.util.Objects;
9085
import java.util.Set;
9186
import java.util.concurrent.Executors;
@@ -160,10 +155,6 @@ public Logger getLogger() {
160155
GatewayIntent.MESSAGE_CONTENT
161156
);
162157

163-
private static final Set<Message.MentionType> DEFAULT_MENTIONS = EnumSet.of(
164-
Message.MentionType.EMOJI,
165-
Message.MentionType.CHANNEL);
166-
167158
static {
168159
MessageRequest.setDefaultMentionRepliedUser(false);
169160
}
@@ -293,9 +284,6 @@ public void start() {
293284
MISC_LISTENER.addListener(UpdateRulesCommand::onEvent);
294285
MISC_LISTENER.addListeners(new EventReactionAdded(), new PersistedRolesEvents());
295286

296-
MessageRequest.setDefaultMentionRepliedUser(false);
297-
MessageRequest.setDefaultMentions(DEFAULT_MENTIONS);
298-
299287
try {
300288
final var builder = JDABuilder
301289
.create(dotenv.get("BOT_TOKEN"), INTENTS)

0 commit comments

Comments
 (0)