Skip to content

Commit 8df9ae0

Browse files
committed
Revert "Handle messages replaced by all msg filters, not only the
attachment one" This reverts commit a01678c.
1 parent 3fdeb20 commit 8df9ae0

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import lombok.RequiredArgsConstructor;
88
import net.discordjug.javabot.data.config.BotConfig;
99
import net.discordjug.javabot.data.config.GuildConfig;
10+
import net.discordjug.javabot.data.h2db.message_cache.MessageCache;
1011
import net.dv8tion.jda.api.EmbedBuilder;
1112
import net.dv8tion.jda.api.entities.Message;
1213
import net.dv8tion.jda.api.entities.MessageEmbed;
@@ -21,7 +22,8 @@
2122
public class BlacklistedMessageAttachmentFilter implements MessageFilter {
2223

2324
private final BotConfig botConfig;
24-
25+
private final MessageCache cache;
26+
2527
@Override
2628
public MessageModificationStatus processMessage(MessageContent content) {
2729
MessageReceivedEvent event = content.event();
@@ -35,6 +37,8 @@ public MessageModificationStatus processMessage(MessageContent content) {
3537
MessageEmbed attachmentRemovedInfo = new EmbedBuilder()
3638
.setDescription("Disallowed attachments have been removed from this message.").build();
3739
embeds.add(attachmentRemovedInfo);
40+
cache.blockedMessages.add(event.getMessageIdLong());
41+
cache.sendBlacklistedAttachmentsMessageToLog(event.getGuild(), event.getChannel(), event.getMessage());
3842
return MessageModificationStatus.MODIFIED;
3943
} else {
4044
return MessageModificationStatus.NOT_MODIFIED;

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
import lombok.RequiredArgsConstructor;
99
import net.discordjug.javabot.data.config.BotConfig;
10-
import net.discordjug.javabot.data.h2db.message_cache.MessageCache;
1110
import net.discordjug.javabot.systems.moderation.AutoMod;
1211
import net.discordjug.javabot.util.ExceptionLogger;
1312
import net.discordjug.javabot.util.WebhookUtil;
@@ -32,7 +31,6 @@ public class MessageFilterHandler extends ListenerAdapter {
3231
private final List<MessageFilter> filters;
3332
private final AutoMod autoMod;
3433
private final BotConfig botConfig;
35-
private final MessageCache cache;
3634

3735
@Override
3836
public void onMessageReceived(@NotNull MessageReceivedEvent event) {
@@ -59,8 +57,6 @@ public void onMessageReceived(@NotNull MessageReceivedEvent event) {
5957
}
6058

6159
if (handled) {
62-
cache.blockedMessages.add(event.getMessageIdLong());
63-
cache.sendBlacklistedAttachmentsMessageToLog(event.getGuild(), event.getChannel(), event.getMessage());
6460
IWebhookContainer webhookContainer = null;
6561
long threadId = 0;
6662
if (event.isFromType(ChannelType.TEXT)) {

0 commit comments

Comments
 (0)