Merge remote-tracking branch 'javabot/main' into message-mod-rules

Author: danthe1st

src/main/java/net/discordjug/javabot/Bot.java

@@ -101,7 +101,7 @@ public void onApplicationEvent(ApplicationReadyEvent event) {
 	 */
 	public static void main(String[] args) throws Exception {
 		TimeZone.setDefault(TimeZone.getTimeZone(ZoneOffset.UTC));
-		MessageRequest.setDefaultMentions(EnumSet.of(Message.MentionType.ROLE, Message.MentionType.CHANNEL, Message.MentionType.USER, Message.MentionType.EMOJI));
+		MessageRequest.setDefaultMentions(EnumSet.of(Message.MentionType.CHANNEL, Message.MentionType.USER, Message.MentionType.EMOJI));
 		SpringApplication.run(Bot.class, args);
 	}
 

src/main/java/net/discordjug/javabot/RuntimeHintsConfiguration.java

@@ -63,6 +63,15 @@ public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
 		// caffeine
 		hints.reflection().registerTypeIfPresent(getClass().getClassLoader(), "com.github.benmanes.caffeine.cache.SSW", MemberCategory.INVOKE_DECLARED_METHODS, MemberCategory.INVOKE_DECLARED_CONSTRUCTORS);
 
+		try {
+			// These classes are necessary on X11 but may not be loaded on Wayland when generating native hints
+			for(Class<?> cl : getClass().getClassLoader().loadClass("sun.font.FontConfigManager").getDeclaredClasses()) {
+				hints.jni().registerType(cl, MemberCategory.ACCESS_DECLARED_FIELDS, MemberCategory.INVOKE_DECLARED_CONSTRUCTORS);
+			}
+		} catch (ClassNotFoundException e) {
+			throw new RuntimeException(e);
+		}
+		
 		for (Class<?> cl : WebhookEmbed.class.getClasses()) {
 			hints.reflection().registerType(cl,  MemberCategory.ACCESS_DECLARED_FIELDS, MemberCategory.INVOKE_PUBLIC_METHODS);
 		}

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

@@ -64,12 +64,11 @@ public MigrateSubcommand(ExecutorService asyncPool, DataSource dataSource, Syste
 	}
 
 	/**
-	 * Replies with all available migrations to run.
+	 * Finds all all available migrations to run.
 	 *
-	 * @param event The {@link CommandAutoCompleteInteractionEvent} that was fired.
 	 * @return A {@link List} with all Option Choices.
 	 */
-	public static @NotNull List<Command.Choice> replyMigrations(CommandAutoCompleteInteractionEvent event) {
+	public static @NotNull List<Command.Choice> getAvailableMigrations() {
 		List<Command.Choice> choices = new ArrayList<>(25);
 		try (Stream<Path> s = Files.list(MigrationUtils.getMigrationsDirectory())) {
 			List<Path> paths = s.filter(path -> path.getFileName().toString().endsWith(".sql")).toList();
@@ -134,6 +133,6 @@ public void execute(@NotNull SlashCommandInteractionEvent event) {
 
 	@Override
 	public void handleAutoComplete(@NotNull CommandAutoCompleteInteractionEvent event, @NotNull AutoCompleteQuery target) {
-		event.replyChoices(AutoCompleteUtils.filterChoices(event, replyMigrations(event))).queue();
+		event.replyChoices(AutoCompleteUtils.filterChoices(event, getAvailableMigrations())).queue();
 	}
 }

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

@@ -109,7 +109,7 @@ public void synchronizeNow() {
 	public void cache(Message message) {
 		MessageCacheConfig config = botConfig.get(message.getGuild()).getMessageCacheConfig();
 		if (cache.size() + 1 > config.getMaxCachedMessages()) {
-			cache.remove(0);
+			cache.removeFirst();
 		}
 		if (messageCount >= config.getMessageSynchronizationInterval()) {
 			synchronize();
@@ -131,7 +131,7 @@ public void sendUpdatedMessageToLog(Message updated, CachedMessage before) {
 		if (config.getMessageCacheLogChannel() == null) return;
 		if (updated.getContentRaw().trim().equals(before.getMessageContent()) && updated.getAttachments().size() == before.getAttachments().size()) return;
 		MessageCreateAction action = config.getMessageCacheLogChannel()
-				.sendMessageEmbeds(buildMessageEditEmbed(updated.getGuild(), updated.getAuthor(), updated.getChannel(), before, updated))
+				.sendMessageEmbeds(buildMessageEditEmbed(updated.getAuthor(), updated.getChannel(), before, updated))
 				.addComponents(ActionRow.of(Button.link(updated.getJumpUrl(), "Jump to Message")));
 		if (before.getMessageContent().length() > MessageEmbed.VALUE_MAX_LENGTH || updated.getContentRaw().length() > MessageEmbed.VALUE_MAX_LENGTH) {
 			action.addFiles(FileUpload.fromData(buildEditedMessageFile(updated.getAuthor(), before, updated), before.getMessageId() + ".txt"));
@@ -150,7 +150,7 @@ public void sendDeletedMessageToLog(Guild guild, MessageChannel channel, CachedM
 		MessageCacheConfig config = botConfig.get(guild).getMessageCacheConfig();
 		if (config.getMessageCacheLogChannel() == null) return;
 		guild.getJDA().retrieveUserById(message.getAuthorId()).queue(author -> {
-			MessageCreateAction action = config.getMessageCacheLogChannel().sendMessageEmbeds(buildMessageDeleteEmbed(guild, author, channel, message));
+			MessageCreateAction action = config.getMessageCacheLogChannel().sendMessageEmbeds(buildMessageDeleteEmbed(author, channel, message));
 			if (message.getMessageContent().length() > MessageEmbed.VALUE_MAX_LENGTH) {
 				action.addFiles(FileUpload.fromData(buildDeletedMessageFile(author, message), message.getMessageId() + ".txt"));
 			}
@@ -209,7 +209,7 @@ public EmbedBuilder buildMessageCacheEmbed(MessageChannel channel, User author,
 						false);
 	}
 
-	private MessageEmbed buildMessageEditEmbed(Guild guild, User author, MessageChannel channel, CachedMessage before, Message after) {
+	private MessageEmbed buildMessageEditEmbed(User author, MessageChannel channel, CachedMessage before, Message after) {
 		EmbedBuilder eb = buildMessageCacheEmbed(channel, author, before, "Before")
 				.setTitle("Message Edited")
 				.setColor(Responses.Type.WARN.getColor())
@@ -233,7 +233,7 @@ private MessageEmbed buildMessageEditEmbed(Guild guild, User author, MessageChan
 				.build();
 	}
 
-	private MessageEmbed buildMessageDeleteEmbed(Guild guild, User author, MessageChannel channel, CachedMessage message) {
+	private MessageEmbed buildMessageDeleteEmbed(User author, MessageChannel 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/systems/configuration/ConfigCommand.java

@@ -1,7 +1,6 @@
 package net.discordjug.javabot.systems.configuration;
 
 import xyz.dynxsty.dih4jda.interactions.commands.application.SlashCommand;
-import net.discordjug.javabot.data.config.BotConfig;
 import net.discordjug.javabot.systems.moderation.CommandModerationPermissions;
 import net.dv8tion.jda.api.interactions.commands.build.Commands;
 
@@ -12,12 +11,11 @@
 public class ConfigCommand extends SlashCommand implements CommandModerationPermissions {
 	/**
 	 * The constructor of this class, which sets the corresponding {@link net.dv8tion.jda.api.interactions.commands.build.SlashCommandData}.
-	 * @param botConfig The main configuration of the bot
 	 * @param exportConfigSubcommand /config export
 	 * @param getConfigSubcommand /config get
 	 * @param setConfigSubcommand /config set
 	 */
-	public ConfigCommand(BotConfig botConfig, ExportConfigSubcommand exportConfigSubcommand, GetConfigSubcommand getConfigSubcommand, SetConfigSubcommand setConfigSubcommand) {
+	public ConfigCommand(ExportConfigSubcommand exportConfigSubcommand, GetConfigSubcommand getConfigSubcommand, SetConfigSubcommand setConfigSubcommand) {
 		setModerationSlashCommandData(Commands.slash("config", "Administrative Commands for managing the bot's configuration."));
 		addSubcommands(exportConfigSubcommand, getConfigSubcommand, setConfigSubcommand);
 	}

src/main/java/net/discordjug/javabot/systems/configuration/ConfigSubcommand.java

@@ -50,7 +50,7 @@ public void execute(@NotNull SlashCommandInteractionEvent event) {
 		try {
 			handleConfigSubcommand(event, botConfig.get(event.getGuild())).queue();
 		} catch (UnknownPropertyException e) {
-			Responses.warning(event, "Unknown Property", "The provided property could not be found.")
+			Responses.warnin(event, "Unknown Property", "The provided property could not be found.")
 					.queue();
 		}
 	}

src/main/java/net/discordjug/javabot/systems/help/commands/HelpGuidelinesSubcommand.java

@@ -1,6 +1,5 @@
 package net.discordjug.javabot.systems.help.commands;
 
-import net.discordjug.javabot.data.config.BotConfig;
 import net.discordjug.javabot.util.Responses;
 import net.discordjug.javabot.util.StringResourceCache;
 import net.dv8tion.jda.api.EmbedBuilder;
@@ -16,9 +15,8 @@
 public class HelpGuidelinesSubcommand extends SlashCommand.Subcommand {
 	/**
 	 * The constructor of this class, which sets the corresponding {@link net.dv8tion.jda.api.interactions.commands.build.SlashCommandData}.
-	 * @param botConfig The main configuration of the bot
 	 */
-	public HelpGuidelinesSubcommand(BotConfig botConfig) {
+	public HelpGuidelinesSubcommand() {
 		setCommandData(new SubcommandData("guidelines", "Show the server's help guidelines in a simple format."));
 	}
 

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

@@ -125,7 +125,7 @@ private void onCloseRequest(Interaction interaction, IReplyCallback replyCallbac
 					replyCallback.getUser().getIdLong() == manager.getPostThread().getOwnerIdLong(),
 					reason);
 		} else {
-			Responses.warning(replyCallback, "Could not close this post", "You're not allowed to close this post.").queue();
+			Responses.warnin(replyCallback, "Could not close this post", "You're not allowed to close this post.").queue();
 		}
 	}
 
@@ -134,7 +134,7 @@ private boolean isReasonInvalid(String reason) {
 	}
 
 	private void replyInvalidChannel(IReplyCallback replyCallback) {
-		Responses.warning(replyCallback, "Invalid Channel",
+		Responses.warnin(replyCallback, "Invalid Channel",
 						"This command may only be used in either the text-channel-based help system, or in our new forum help system.")
 				.queue();
 	}

src/main/java/net/discordjug/javabot/systems/help/dao/HelpAccountRepository.java

@@ -30,7 +30,7 @@ public class HelpAccountRepository {
 	 * Inserts a new {@link HelpAccount}.
 	 *
 	 * @param account The account that should be inserted.
-	 * @throws SQLException If an error occurs.
+	 * @throws DataAccessException If an error occurs.
 	 */
 	public void insert(HelpAccount account) throws DataAccessException {
 
@@ -44,7 +44,7 @@ public void insert(HelpAccount account) throws DataAccessException {
 	 * Updates a single {@link HelpAccount}.
 	 *
 	 * @param account The account that should be updated.
-	 * @throws SQLException If an error occurs.
+	 * @throws DataAccessException If an error occurs.
 	 */
 	public void update(HelpAccount account) throws DataAccessException {
 		jdbcTemplate.update("UPDATE help_account SET experience = ? WHERE user_id = ?",
@@ -57,7 +57,7 @@ public void update(HelpAccount account) throws DataAccessException {
 	 *
 	 * @param userId The user's id.
 	 * @return An {@link HelpAccount} object, as an {@link Optional}.
-	 * @throws SQLException If an error occurs.
+	 * @throws DataAccessException If an error occurs.
 	 */
 	public Optional<HelpAccount> getByUserId(long userId) throws DataAccessException {
 		try {
@@ -73,7 +73,7 @@ public Optional<HelpAccount> getByUserId(long userId) throws DataAccessException
 	 * @param page    The page.
 	 * @param size    The amount of {@link HelpAccount}s to return.
 	 * @return A {@link List} containing the specified amount of {@link HelpAccount}s.
-	 * @throws SQLException If an error occurs.
+	 * @throws DataAccessException If an error occurs.
 	 */
 	public List<HelpAccount> getAccounts(int page, int size) throws DataAccessException {
 		return jdbcTemplate.query("SELECT * FROM help_account WHERE experience > 0 ORDER BY experience DESC LIMIT ? OFFSET ?", (rs, row)->this.read(rs),
@@ -84,7 +84,7 @@ public List<HelpAccount> getAccounts(int page, int size) throws DataAccessExcept
 	 * Gets the total amount of {@link HelpAccount}s stored in the database, that have more than 0 experience.
 	 *
 	 * @return The amount, as an {@link Integer}.
-	 * @throws SQLException If an error occurs.
+	 * @throws DataAccessException If an error occurs.
 	 */
 	public int getTotalAccounts() throws DataAccessException {
 		try {

src/main/java/net/discordjug/javabot/systems/help/dao/HelpTransactionRepository.java

@@ -33,7 +33,7 @@ public class HelpTransactionRepository {
 	 *
 	 * @param transaction The transaction that should be inserted.
 	 * @return The inserted {@link HelpTransaction}.
-	 * @throws SQLException If an error occurs.
+	 * @throws DataAccessException If an error occurs.
 	 */
 	public HelpTransaction save(HelpTransaction transaction) throws DataAccessException {
 		SimpleJdbcInsert simpleJdbcInsert = new SimpleJdbcInsert(jdbcTemplate)
@@ -56,7 +56,7 @@ public HelpTransaction save(HelpTransaction transaction) throws DataAccessExcept
 	 *
 	 * @param id The transaction's id.
 	 * @return A {@link HelpTransaction} object.
-	 * @throws SQLException If an error occurs.
+	 * @throws DataAccessException If an error occurs.
 	 */
 	public Optional<HelpTransaction> getTransaction(long id) throws DataAccessException {
 		try {
@@ -72,7 +72,7 @@ public Optional<HelpTransaction> getTransaction(long id) throws DataAccessExcept
 	 * @param userId The user's id.
 	 * @param count  The count of transactions that should be retrieved.
 	 * @return A List with all {@link HelpTransaction}s.
-	 * @throws SQLException If an error occurs.
+	 * @throws DataAccessException If an error occurs.
 	 */
 	public List<HelpTransaction> getTransactions(long userId, int count) throws DataAccessException {
 		return jdbcTemplate.query("SELECT * FROM help_transaction WHERE recipient = ? ORDER BY created_at DESC LIMIT ?", (rs, rowNumber) -> this.read(rs), userId, count);