Merge remote-tracking branch 'javabot/main' into custom-automod-search

Author: danthe1st

src/main/java/net/discordjug/javabot/data/config/SystemsConfig.java

@@ -24,6 +24,11 @@ public class SystemsConfig {
 	 * The Key used for the bing-search-api.
 	 */
 	private String azureSubscriptionKey = "";
+	
+	/**
+	 * The API key of the Answer Overflow API.
+	 */
+	private String answerOverflowApiKey = "";
 
 	/**
 	 * The DSN for the Sentry API.

src/main/java/net/discordjug/javabot/data/config/guild/ModerationConfig.java

@@ -28,6 +28,18 @@ public class ModerationConfig extends GuildConfigItem {
 	private long adminRoleId = 0;
 	private long expertRoleId = 0;
 
+	/**
+	* The time window, in seconds, that the cross-channel spam automod looks back over when
+	* counting a user's recent messages. If this is {@code 0}, the cross-channel spam automod
+	* is disabled.
+	*/
+	private int crossChannelSpamWindowSeconds = 0;
+
+	/**
+	 * The number of distinct channels a user must post in within
+	 * {@link #crossChannelSpamWindowSeconds} seconds before the cross-channel spam automod acts.
+	 */
+	private int crossChannelSpamMinChannels = 3;
 	/**
 	 * ID of the share-knowledge channel.
 	 */

src/main/java/net/discordjug/javabot/data/h2db/MigrationUtils.java

@@ -7,16 +7,32 @@
 import java.nio.file.*;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
+import lombok.extern.slf4j.Slf4j;
 import net.discordjug.javabot.data.h2db.commands.MigrationsListSubcommand;
 
 /**
  * Utility class that handles SQL Migrations.
  */
+@Slf4j
 public class MigrationUtils {
+	
+	private static final Path migrationDirectory;
 
 	private MigrationUtils() {
 	}
+	
+	static {
+		Path dir;
+		try {
+			dir = createMigrationsDirectory();
+		} catch (IOException | URISyntaxException e) {
+			log.error("Cannot create database migration directory", e);
+			dir = null;
+		}
+		migrationDirectory = dir;
+	}
 
 	/**
 	 * Tries to get the Migrations Directories' Path.
@@ -26,6 +42,10 @@ private MigrationUtils() {
 	 * @throws IOException        If an error occurs.
 	 */
 	public static Path getMigrationsDirectory() throws URISyntaxException, IOException {
+		return Objects.requireNonNull(migrationDirectory);
+	}
+	
+	private static Path createMigrationsDirectory() throws IOException, URISyntaxException {
 		URL resource = MigrationsListSubcommand.class.getResource("/database/migrations/");
 		if (resource == null) throw new IOException("Missing resource /migrations/");
 		URI uri = resource.toURI();

src/main/java/net/discordjug/javabot/data/h2db/commands/ExportTableSubcommand.java

@@ -52,7 +52,6 @@ public ExportTableSubcommand(ExecutorService asyncPool, SystemsConfig systemsCon
 								.addChoice("Message Cache", "MESSAGE_CACHE")
 								.addChoice("Question of the Week Accounts", "QOTW_POINTS")
 								.addChoice("Question of the Week Questions", "QOTW_QUESTION")
-								.addChoice("Reserved Help Channels", "RESERVED_HELP_CHANNELS")
 								.addChoice("Starboard", "STARBOARD")
 								.addChoice("Warns", "WARN")
 								.addChoice("User Preferences", "USER_PREFERENCES"),

src/main/java/net/discordjug/javabot/data/h2db/commands/MigrateSubcommand.java

@@ -93,7 +93,6 @@ public void execute(@NotNull SlashCommandInteractionEvent event) {
 				return;
 			}
 			String sql = Files.readString(migrationFile);
-			migrationsDir.getFileSystem().close();
 			String[] statements = sql.split("\\s*;\\s*");
 			if (statements.length == 0) {
 				Responses.error(event, "The migration `" + migrationName + "` does not contain any statements. Please remove or edit it before running again.").queue();

src/main/java/net/discordjug/javabot/data/h2db/message_cache/MessageCache.java

@@ -16,6 +16,7 @@
 import net.dv8tion.jda.api.components.buttons.Button;
 import net.dv8tion.jda.api.entities.*;
 import net.dv8tion.jda.api.entities.Message.Attachment;
+import net.dv8tion.jda.api.entities.channel.Channel;
 import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
 import net.dv8tion.jda.api.requests.restaction.MessageCreateAction;
 import net.dv8tion.jda.api.utils.FileUpload;
@@ -149,7 +150,7 @@ public void sendUpdatedMessageToLog(Message updated, CachedMessage before) {
 	 * @param channel The message's {@link MessageChannel}.
 	 * @param message The {@link CachedMessage}.
 	 */
-	public void sendDeletedMessageToLog(Guild guild, MessageChannel channel, CachedMessage message) {
+	public void sendDeletedMessageToLog(Guild guild, Channel channel, CachedMessage message) {
 		MessageCacheConfig config = botConfig.get(guild).getMessageCacheConfig();
 		if (config.getMessageCacheLogChannel() == null) return;
 		guild.getJDA().retrieveUserById(message.getAuthorId()).queue(author -> {
@@ -199,7 +200,7 @@ private void requestMessageAttachments(CachedMessage message) {
 	 * @param contentFieldName the name of the field containing the message content in the embed.
 	 * @return an {@link EmbedBuilder} with information about the message.
 	 */
-	public EmbedBuilder buildMessageCacheEmbed(MessageChannel channel, User author, CachedMessage message, String contentFieldName) {
+	public EmbedBuilder buildMessageCacheEmbed(Channel channel, User author, CachedMessage message, String contentFieldName) {
 		long epoch = IdCalculatorCommand.getTimestampFromId(message.getMessageId()) / 1000;
 		return new EmbedBuilder()
 				.setAuthor(UserUtils.getUserTag(author), null, author.getEffectiveAvatarUrl())
@@ -236,7 +237,7 @@ private MessageEmbed buildMessageEditEmbed(User author, MessageChannel channel,
 				.build();
 	}
 
-	private MessageEmbed buildMessageDeleteEmbed(User author, MessageChannel channel, CachedMessage message) {
+	private MessageEmbed buildMessageDeleteEmbed(User author, Channel channel, CachedMessage message) {
 		EmbedBuilder eb = buildMessageCacheEmbed(channel, author, message, "Message Content")
 				.setTitle("Message Deleted")
 				.setColor(Responses.Type.ERROR.getColor());

src/main/java/net/discordjug/javabot/data/h2db/message_cache/MessageCacheListener.java

@@ -4,6 +4,8 @@
 import net.discordjug.javabot.data.config.guild.MessageCacheConfig;
 import net.discordjug.javabot.data.h2db.message_cache.model.CachedMessage;
 import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
+import net.dv8tion.jda.api.events.channel.ChannelDeleteEvent;
 import net.dv8tion.jda.api.events.message.MessageDeleteEvent;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.events.message.MessageUpdateEvent;
@@ -39,25 +41,35 @@ public void onMessageUpdate(@NotNull MessageUpdateEvent event) {
 		CachedMessage before;
 		if (optional.isPresent()) {
 			CachedMessage inCache= optional.get();
-			before = new CachedMessage(inCache.getMessageId(), inCache.getAuthorId(), inCache.getMessageContent(), inCache.getAttachments());
+			before = new CachedMessage(inCache.getMessageId(), inCache.getAuthorId(), inCache.getChannelId(),inCache.getMessageContent(), inCache.getAttachments());
 			inCache.init(event.getMessage());
 		} else {
-			before = new CachedMessage(event.getMessageIdLong(), event.getAuthor().getIdLong(), "[unknown content]", List.of());
+			before = new CachedMessage(event.getMessageIdLong(), event.getAuthor().getIdLong(), event.getChannel().getIdLong(),"[unknown content]", List.of());
 			messageCache.cache(event.getMessage());
 		}
 		messageCache.sendUpdatedMessageToLog(event.getMessage(), before);
 	}
 
 	@Override
 	public void onMessageDelete(@NotNull MessageDeleteEvent event) {
-		Optional<CachedMessage> optional = messageCache.cache.stream().filter(m -> m.getMessageId() == event.getMessageIdLong()).findFirst();
+		processMessageDeletion(event.getMessageIdLong(), event.getGuildChannel());
+	}
+	
+	@Override
+	public void onChannelDelete(ChannelDeleteEvent event) {
+		if (event.getChannelType().isThread()) {
+			processMessageDeletion(event.getChannel().getIdLong(), event.getChannel().asThreadChannel().getParentChannel());
+		}
+	}
+
+	private void processMessageDeletion(long messageId, GuildChannel channel) {
+		Optional<CachedMessage> optional = messageCache.cache.stream().filter(m -> m.getMessageId() == messageId).findFirst();
 		optional.ifPresent(message -> {
-			messageCache.sendDeletedMessageToLog(event.getGuild(), event.getChannel(), message);
+			messageCache.sendDeletedMessageToLog(channel.getGuild(), channel, message);
 			messageCache.cache.remove(message);
 		});
 	}
 
-
 	/**
 	 * Checks whether the given message should be ignored by the cache.
 	 * <p>

src/main/java/net/discordjug/javabot/data/h2db/message_cache/dao/MessageCacheRepository.java

@@ -44,15 +44,16 @@ private void clear() throws DataAccessException {
 		jdbcTemplate.update("DELETE FROM message_cache WHERE 1 = 1");
 	}
 
-	private void insertList(@NotNull List<CachedMessage> messages) throws DataAccessException {
-		jdbcTemplate.batchUpdate("MERGE INTO message_cache (message_id, author_id, message_content) VALUES (?, ?, ?)",
+	public void insertList(@NotNull List<CachedMessage> messages) throws DataAccessException {
+		jdbcTemplate.batchUpdate("MERGE INTO message_cache (message_id, author_id, channel_id, message_content) VALUES (?, ?, ?, ?)",
 				new BatchPreparedStatementSetter() {
 					@Override
 					public void setValues(PreparedStatement stmt, int i) throws SQLException {
 						CachedMessage msg = messages.get(i);
 						stmt.setLong(1, msg.getMessageId());
 						stmt.setLong(2, msg.getAuthorId());
-						stmt.setString(3, msg.getMessageContent());
+						stmt.setLong(3,msg.getChannelId());
+						stmt.setString(4, msg.getMessageContent());
 						stmt.executeUpdate();
 					}
 
@@ -101,7 +102,7 @@ public List<CachedMessage> getAll() throws DataAccessException {
 			messages.merge(msg.getMessageId(), msg, (oldValue, value) -> {
 				ArrayList<String> attachments = new ArrayList<>(oldValue.getAttachments());
 				attachments.addAll(value.getAttachments());
-				return new CachedMessage(oldValue.getMessageId(), oldValue.getAuthorId(), oldValue.getMessageContent(), attachments);
+				return new CachedMessage(oldValue.getMessageId(), oldValue.getAuthorId(), oldValue.getChannelId(),oldValue.getMessageContent(), attachments);
 			});
 		}
 		return new ArrayList<>(messages.values());
@@ -116,6 +117,7 @@ private CachedMessage read(ResultSet rs) throws SQLException {
 		return new CachedMessage(
 				rs.getLong("message_cache.message_id"),
 				rs.getLong("author_id"),
+				rs.getLong("channel_id"),
 				rs.getString("message_content"),
 				attachments);
 	}

src/main/java/net/discordjug/javabot/data/h2db/message_cache/model/CachedMessage.java

@@ -19,25 +19,29 @@
 public class CachedMessage {
 	private final long messageId;
 	private final long authorId;
+	private final long channelId;
 	private String messageContent;
 	private List<String> attachments=new ArrayList<>();
 
-	private CachedMessage(long messageId, long authorId) {
+	private CachedMessage(long messageId, long authorId,long channelId) {
 		this.messageId = messageId;
 		this.authorId = authorId;
+		this.channelId = channelId;
 	}
 
 	/**
 	 * Creates a {@link CachedMessage} with the given information.
 	 * @param messageId The Discord ID of the message
 	 * @param authorId The Discord ID of the message author
+	 * @param channelId The Discord ID of the message channel
 	 * @param messageContent the textual content of the message
 	 * @param attachments The attachment URLs
 	 */
-	public CachedMessage(long messageId, long authorId, String messageContent, List<String> attachments) {
+	public CachedMessage(long messageId, long authorId, long channelId, String messageContent, List<String> attachments) {
 		super();
 		this.messageId = messageId;
 		this.authorId = authorId;
+		this.channelId = channelId;
 		this.messageContent = messageContent;
 		this.attachments = List.copyOf(attachments);
 	}
@@ -49,7 +53,7 @@ public CachedMessage(long messageId, long authorId, String messageContent, List<
 	 * @return The built {@link CachedMessage}.
 	 */
 	public static CachedMessage of(Message message) {
-		CachedMessage cachedMessage = new CachedMessage(message.getIdLong(), message.getAuthor().getIdLong());
+		CachedMessage cachedMessage = new CachedMessage(message.getIdLong(), message.getAuthor().getIdLong(),message.getChannelIdLong());
 		cachedMessage.init(message);
 		return cachedMessage;
 	}

src/main/java/net/discordjug/javabot/systems/help/AnswerOverflowService.java

@@ -0,0 +1,58 @@
+package net.discordjug.javabot.systems.help;
+
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpRequest.BodyPublishers;
+import java.net.http.HttpResponse.BodyHandlers;
+
+import lombok.extern.slf4j.Slf4j;
+import net.discordjug.javabot.data.config.BotConfig;
+import org.springframework.stereotype.Service;
+
+/**
+ * A service class for interacting with the Answer Overflow bot.
+ */
+@Service
+@Slf4j
+public class AnswerOverflowService {
+	private final String apiKey;
+	
+	public AnswerOverflowService(BotConfig config) {
+		apiKey = config.getSystems().getAnswerOverflowApiKey();
+	}
+	
+	/**
+	 * Marks a message as the answer of a forum post with Answer Overflow.
+	 * @param postId The Discord ID of the forum post
+	 * @param messageId The Discord ID of the message that should be marked as the answer.
+	 */
+	public void markAnswer(long postId, long messageId) {
+		if (apiKey == null || apiKey.isBlank()) {
+			return;
+		}
+		
+		try (HttpClient client = HttpClient.newHttpClient()) {
+			client.sendAsync(
+					HttpRequest.newBuilder(URI.create("https://www.answeroverflow.com/api/v1/messages/" + postId))
+						.header("x-api-key", apiKey)
+						.header("Content-Type", "application/json")
+						.POST(BodyPublishers.ofString("""
+								{
+									"solutionId": "%d"
+								}
+								""".formatted(messageId)))
+					.build(),
+					BodyHandlers.ofString())
+				.thenAccept(response -> {
+					if (response.statusCode() != 200) {
+						log.warn("Answer Overflow responded with unexpected status code {}, post ID: {}, message ID: {}, body: {}", response.statusCode(), postId, messageId, response.body());
+					}
+				})
+				.exceptionally(e -> {
+					log.error("An exception occured trying to mark a post as an answer.", e);
+					return null;
+				});
+		}
+	}
+}