Merge branch 'main' into springify

Author: danthe1st

src/main/java/net/javadiscord/javabot/systems/help/HelpChannelUpdater.java

@@ -395,6 +395,8 @@ private void updateHelpOverview() {
 						helpConfig.getHelpOverviewMessageIds().put(channelId, m.getIdLong());
 						botConfig.flush();
 						log.info("Successfully created new Help Overview Message in '{}' on message with id '{}'", channelId, m.getId());
+						ExceptionLogger.capture(err);
+						botConfig.get(m.getGuild()).getModerationConfig().getLogChannel().sendMessage("Sent new help-overview message (Check sentry for cause!)").queue();
 					})
 			);
 		});

src/main/java/net/javadiscord/javabot/systems/help/commands/CloseCommand.java

@@ -0,0 +1,31 @@
+package net.javadiscord.javabot.systems.help.commands;
+
+import java.util.concurrent.ScheduledExecutorService;
+
+import net.dv8tion.jda.api.interactions.commands.OptionType;
+import net.dv8tion.jda.api.interactions.commands.build.Commands;
+import net.javadiscord.javabot.data.config.BotConfig;
+import net.javadiscord.javabot.data.h2db.DbActions;
+
+/**
+ * A simple command that can be used inside reserved help channels to immediately unreserve them,
+ * instead of waiting for a timeout.
+ * An alias to /unreserve
+ */
+public class CloseCommand extends UnreserveCommand {
+
+	/**
+	 * The constructor of this class, which sets the corresponding
+	 * {@link net.dv8tion.jda.api.interactions.commands.build.SlashCommandData}.
+	 * @param asyncPool The thread pool for asynchronous operations
+	 * @param botConfig The main configuration of the bot
+	 * @param dbActions A utility object providing various operations on the main database
+	 */
+	public CloseCommand(BotConfig botConfig, ScheduledExecutorService asyncPool, DbActions dbActions) {
+		super(botConfig, asyncPool, dbActions);
+		setSlashCommandData(
+				Commands.slash("close", "Unreserves this help channel so that others can use it.")
+						.setGuildOnly(true).addOption(OptionType.STRING, "reason",
+								"The reason why you're unreserving this channel", false));
+	}
+}

src/main/java/net/javadiscord/javabot/systems/help/commands/UnreserveCommand.java

@@ -2,8 +2,6 @@
 
 import java.util.concurrent.ScheduledExecutorService;
 
-import javax.sql.DataSource;
-
 import com.dynxsty.dih4jda.interactions.commands.SlashCommand;
 import net.dv8tion.jda.api.entities.TextChannel;
 import net.dv8tion.jda.api.entities.User;
@@ -23,7 +21,6 @@
  */
 public class UnreserveCommand extends SlashCommand {
 	private final BotConfig botConfig;
-	private final DataSource dataSource;
 	private final ScheduledExecutorService asyncPool;
 	private final DbActions dbActions;
 
@@ -35,7 +32,6 @@ public class UnreserveCommand extends SlashCommand {
 	 */
 	public UnreserveCommand(BotConfig botConfig, ScheduledExecutorService asyncPool, DbActions dbActions) {
 		this.botConfig = botConfig;
-		this.dataSource = dbActions.getDataSource();
 		this.asyncPool = asyncPool;
 		this.dbActions = dbActions;
 		setSlashCommandData(Commands.slash("unreserve", "Unreserves this help channel so that others can use it.")

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

@@ -238,8 +238,12 @@ public boolean hasSuspiciousLink(@NotNull Message message) {
 	public boolean hasAdvertisingLink(@NotNull Message message) {
 		// Advertising
 		Matcher matcher = INVITE_URL.matcher(cleanString(message.getContentRaw()));
-		if (matcher.find()) {
-			return botConfig.get(message.getGuild()).getModerationConfig().getAutomodInviteExcludes().stream().noneMatch(message.getContentRaw()::contains);
+		int start = 0;
+		while (matcher.find(start)) {
+			if (botConfig.get(message.getGuild()).getModerationConfig().getAutomodInviteExcludes().stream().noneMatch(matcher.group()::contains)) {
+				return true;
+			}
+			start = matcher.start() + 1;
 		}
 		return false;
 	}