Skip to content

Commit f16d278

Browse files
committed
don't delete staff messages using automod
1 parent b6ca54f commit f16d278

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/main/java/net/discordjug/javabot/listener/filter/MessageRuleFilter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
import net.discordjug.javabot.data.config.guild.ModerationConfig;
2525
import net.discordjug.javabot.data.h2db.message_cache.MessageCache;
2626
import net.discordjug.javabot.data.h2db.message_cache.model.CachedMessage;
27+
import net.discordjug.javabot.util.Checks;
2728
import net.discordjug.javabot.util.ExceptionLogger;
2829
import net.dv8tion.jda.api.EmbedBuilder;
2930
import net.dv8tion.jda.api.entities.Message.Attachment;
3031
import net.dv8tion.jda.api.entities.Message;
31-
import net.dv8tion.jda.api.entities.MessageEmbed;
3232
import org.springframework.stereotype.Component;
3333

3434
/**
@@ -58,7 +58,7 @@ public MessageModificationStatus processMessage(MessageContent content) {
5858
}
5959
MessageModificationStatus status = MessageModificationStatus.NOT_MODIFIED;
6060
if (ruleToExecute != null) {
61-
if (ruleToExecute.getAction() == MessageAction.BLOCK) {
61+
if (ruleToExecute.getAction() == MessageAction.BLOCK && !Checks.hasStaffRole(botConfig, content.event().getMember())) {
6262
content.event().getMessage().delete()
6363
.flatMap(_ -> content.event().getChannel().sendMessage(content.event().getAuthor().getAsMention() + " Your message has been deleted for moderative reasons. If you believe this happened by mistake, please contact the server staff."))
6464
.delay(Duration.ofSeconds(60))

0 commit comments

Comments
 (0)