fixed issues

Author: Neil-Tomar

src/main/java/net/discordjug/javabot/systems/moderation/AutoMod.java

@@ -9,7 +9,6 @@
 import net.discordjug.javabot.util.ExceptionLogger;
 import net.discordjug.javabot.util.MessageUtils;
 import net.dv8tion.jda.api.Permission;
-import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion;
@@ -26,10 +25,7 @@
 import java.net.URL;
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Scanner;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -54,17 +50,18 @@ public class AutoMod extends ListenerAdapter {
 
 	/**
 	 * Constructor of the class, that creates a list of strings with potential spam/scam URLs.
+	 *
 	 * @param notificationService The {@link QOTWPointsService}
-	 * @param botConfig The main configuration of the bot
-	 * @param moderationService Service object for moderating members
-	 * @param messageCache service for retrieving cached messages
+	 * @param botConfig           The main configuration of the bot
+	 * @param moderationService   Service object for moderating members
+	 * @param messageCache        service for retrieving cached messages
 	 */
 	public AutoMod(NotificationService notificationService, BotConfig botConfig, ModerationService moderationService, MessageCache messageCache) {
 		this.notificationService = notificationService;
 		this.botConfig = botConfig;
 		this.moderationService = moderationService;
 		this.messageCache = messageCache;
-		try(Scanner scan = new Scanner(new URL("https://raw.githubusercontent.com/DevSpen/scam-links/master/src/links.txt").openStream()).useDelimiter("\\A")) {
+		try (Scanner scan = new Scanner(new URL("https://raw.githubusercontent.com/DevSpen/scam-links/master/src/links.txt").openStream()).useDelimiter("\\A")) {
 			String response = scan.next();
 			spamUrls = List.of(response.split("\n"));
 		} catch (IOException e) {
@@ -108,36 +105,46 @@ private boolean canBypassAutomod(Member member) {
 	private void checkNewMessageAutomod(@Nonnull Message message) {
 		// spam
 		long spamCount = messageCache.getMessagesAfter(message.getTimeCreated().minusSeconds(6))
-			.stream()
-			.filter(cached -> cached.getMessageId() != message.getIdLong()) // exclude new/current message
-			.filter(cached -> cached.getAuthorId() == message.getAuthor().getIdLong())
-			.filter(cached ->
-				// only java files -> not spam
-				cached.getAttachments().isEmpty() ||
-				cached.getAttachments().stream()
-					.anyMatch(attachment -> !attachment.contains(".java?")))
-			.count() + 1; // include new message
+				.stream()
+				.filter(cached -> cached.getMessageId() != message.getIdLong()) // exclude new/current message
+				.filter(cached -> cached.getAuthorId() == message.getAuthor().getIdLong())
+				.filter(cached ->
+						// only java files -> not spam
+						cached.getAttachments().isEmpty() ||
+								cached.getAttachments().stream()
+										.anyMatch(attachment -> !attachment.contains(".java?")))
+				.count() + 1; // include new message
 
 		if (spamCount >= 5) {
-			handleSpam(message, message.getMember());
+			handleSpam(message);
 		}
-
 		checkContentAutomod(message);
 		checkCrossChannelSpam(message);
 	}
 
 	private void checkCrossChannelSpam(@Nonnull Message message) {
+		int spamWindowSeconds = (botConfig.get(message.getGuild()).getModerationConfig()).getCrossChannelSpamWindowSeconds();
+		Set<Long> channelIds = new HashSet<>();
 		List<CachedMessage> spamMessages = new ArrayList<>();
-		messageCache.getMessagesAfter(message.getTimeCreated().minusSeconds((botConfig.get(message.getGuild()).getModerationConfig()).getCrossChannelSpamWindowSeconds())).stream()
-				.filter(cachedMessage -> cachedMessage.getAuthorId() == message.getAuthor().getIdLong())
-				.filter(cachedMessage -> spamMessages.stream().noneMatch(
-						spamMessage -> spamMessage.getChannelId() == cachedMessage.getChannelId()))
-				.forEach(spamMessages::add);
 
-		if(spamMessages.size() > (botConfig.get(message.getGuild()).getModerationConfig()).getCrossChannelSpamMinChannels()){
-			handleSpam(spamMessages,message);
+		if (spamWindowSeconds <= 0) {
+			return;
 		}
 
+		for (CachedMessage cachedMessage : messageCache.getMessagesAfter(message.getTimeCreated().minusSeconds(spamWindowSeconds))) {
+			if (cachedMessage.getMessageId() == message.getIdLong()) {
+				continue;
+			}
+			if (cachedMessage.getAuthorId() != message.getAuthor().getIdLong()) {
+				continue;
+			}
+			channelIds.add(cachedMessage.getChannelId());
+			spamMessages.add(cachedMessage);
+		}
+
+		if (channelIds.size() >= (botConfig.get(message.getGuild()).getModerationConfig()).getCrossChannelSpamMinChannels()) {
+			handleSpam(spamMessages, message);
+		}
 	}
 
 	/**
@@ -148,7 +155,7 @@ private void checkCrossChannelSpam(@Nonnull Message message) {
 	private void checkContentAutomod(@Nonnull Message message) {
 		//Check for Advertising Links
 		if (hasAdvertisingLink(message)) {
-			doAutomodActions(message,"Advertising");
+			doAutomodActions(message, "Advertising");
 		}
 
 		//Check for suspicious Links
@@ -176,24 +183,20 @@ private void doAutomodActions(Message message, String reason) {
 	/**
 	 * Handles detected spam messages.
 	 *
-	 * @param msg    the (last) spam message
-	 * @param member the member to be potentially warned
+	 * @param msg the (last) spam message
 	 */
-	private void handleSpam(@Nonnull Message msg, Member member) {
-		moderationService
-				.timeout(
-						member.getUser(),
-						"Automod: Spam",
-						msg.getGuild().getSelfMember(),
-						Duration.of(6, ChronoUnit.HOURS),
-						msg.getChannel(),
-						false
-				);
+	private void handleSpam(@Nonnull Message msg) {
+		markSpam(msg);
 		msg.delete().queue();
 	}
 
 	private void handleSpam(@Nonnull List<CachedMessage> cachedMessages, Message message) {
-		Guild guild = message.getGuild();
+		markSpam(message);
+		cachedMessages.forEach(cachedMessage -> message.getGuild().getTextChannelById(cachedMessage.getChannelId())
+				.deleteMessageById(cachedMessage.getMessageId()).queue());
+	}
+
+	private void markSpam(@Nonnull Message message) {
 		moderationService
 				.timeout(
 						message.getAuthor(),
@@ -203,9 +206,6 @@ private void handleSpam(@Nonnull List<CachedMessage> cachedMessages, Message mes
 						message.getChannel(),
 						false
 				);
-
-		cachedMessages.forEach(cachedMessage -> guild.getTextChannelById(cachedMessage.getChannelId())
-				.deleteMessageById(cachedMessage.getMessageId()).queue());
 	}
 
 	/**
@@ -252,7 +252,7 @@ public boolean hasSuspiciousLink(@NotNull Message message) {
 	 * Checks whether the given message contains a discord invite link.
 	 *
 	 * @param message The Message to check.
-	 * @return True if an invitation is found and False if not.
+	 * @return True if an invites is found and False if not.
 	 */
 	public boolean hasAdvertisingLink(@NotNull Message message) {
 		// Advertising

src/main/resources/database/migrations/07-19-2026_add_channel_column_to_cache.sql

@@ -0,0 +1 @@
+ALTER TABLE message_cache ADD COLUMN channel_id BIGINT DEFAULT -1;