Handle messages replaced by all msg filters, not only the attachment one

Author: Defective4

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

@@ -7,7 +7,6 @@
 import lombok.RequiredArgsConstructor;
 import net.discordjug.javabot.data.config.BotConfig;
 import net.discordjug.javabot.data.config.GuildConfig;
-import net.discordjug.javabot.data.h2db.message_cache.MessageCache;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.MessageEmbed;
@@ -22,7 +21,6 @@
 public class BlacklistedMessageAttachmentFilter implements MessageFilter {
 
     private final BotConfig botConfig;
-    private final MessageCache cache;
 
     @Override
     public MessageModificationStatus processMessage(MessageContent content) {
@@ -37,8 +35,6 @@ public MessageModificationStatus processMessage(MessageContent content) {
             MessageEmbed attachmentRemovedInfo = new EmbedBuilder()
                     .setDescription("Disallowed attachments have been removed from this message.").build();
             embeds.add(attachmentRemovedInfo);
-            cache.blockedMessages.add(event.getMessageIdLong());
-            cache.sendBlacklistedAttachmentsMessageToLog(event.getGuild(), event.getChannel(), event.getMessage());
             return MessageModificationStatus.MODIFIED;
         } else {
             return MessageModificationStatus.NOT_MODIFIED;

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

@@ -1,7 +1,13 @@
 package net.discordjug.javabot.listener.filter;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jetbrains.annotations.NotNull;
+
 import lombok.RequiredArgsConstructor;
 import net.discordjug.javabot.data.config.BotConfig;
+import net.discordjug.javabot.data.h2db.message_cache.MessageCache;
 import net.discordjug.javabot.systems.moderation.AutoMod;
 import net.discordjug.javabot.util.ExceptionLogger;
 import net.discordjug.javabot.util.WebhookUtil;
@@ -10,10 +16,6 @@
 import net.dv8tion.jda.api.entities.channel.middleman.StandardGuildChannel;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * This class is responsible for calling {@link MessageFilter}s on incoming messages and optionally replacing the message.
@@ -30,6 +32,7 @@ public class MessageFilterHandler extends ListenerAdapter {
 	private final List<MessageFilter> filters;
 	private final AutoMod autoMod;
 	private final BotConfig botConfig;
+	private final MessageCache cache;
 
 	@Override
 	public void onMessageReceived(@NotNull MessageReceivedEvent event) {
@@ -56,6 +59,8 @@ public void onMessageReceived(@NotNull MessageReceivedEvent event) {
 		}
 
 		if (handled) {
+            cache.blockedMessages.add(event.getMessageIdLong());
+            cache.sendBlacklistedAttachmentsMessageToLog(event.getGuild(), event.getChannel(), event.getMessage());
 			IWebhookContainer webhookContainer = null;
 			long threadId = 0;
 			if (event.isFromType(ChannelType.TEXT)) {