Merge branch 'main' into help-ack-timestamps

Author: danthe1st

README.md

@@ -28,7 +28,7 @@ At startup, the bot will initially start by loading just the global settings, an
 
 We're using [DIH4JDA](https://github.com/DynxstyGIT/DIH4JDA) as our Command/Interaction framework, which makes it quite easy to add new commands.
 
-[PingCommand.java](https://github.com/Java-Discord/JavaBot/blob/main/src/main/java/net/javadiscord/javabot/systems/commands/PingCommand.java)
+[PingCommand.java](https://github.com/Java-Discord/JavaBot/blob/main/src/main/java/net/javadiscord/javabot/systems/user_commands/PingCommand.java)
 ```java
 /**
  * <h3>This class represents the /ping command.</h3>

build.gradle.kts

@@ -30,8 +30,8 @@ dependencies {
     compileOnly("org.jetbrains:annotations:23.0.0")
 
     // DIH4JDA (Command Framework) & JDA
-    implementation("xyz.dynxsty:dih4jda:1.6.2")
-    implementation("net.dv8tion:JDA:5.0.0-beta.2") {
+    implementation("com.github.DynxstyGIT:DIH4JDA:120a15ad2e")
+    implementation("net.dv8tion:JDA:5.0.0-beta.12") {
         exclude(module = "opus-java")
     }
 

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

@@ -7,12 +7,12 @@
 import java.util.Map;
 import java.util.TimeZone;
 
-import javax.annotation.PostConstruct;
-
 import org.jetbrains.annotations.NotNull;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationListener;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.FilterType;
 import org.springframework.scheduling.annotation.EnableScheduling;
@@ -46,7 +46,7 @@
 )
 @EnableScheduling
 @RequiredArgsConstructor
-public class Bot {
+public class Bot implements ApplicationListener<ApplicationReadyEvent> {
 
 	private final DIH4JDA dih4jda;
 	private final BotConfig config;
@@ -64,12 +64,12 @@ private void addEventListeners(final List<ListenerAdapter> listeners) {
 		}
 		dih4jda.getJDA().addEventListener(dih4jda);
 	}
-
+	
 	/**
 	 * Initializes Sentry, interactions and listeners.
 	 */
-	@PostConstruct
-	public void init() {
+	@Override
+	public void onApplicationEvent(ApplicationReadyEvent event) {
 		Sentry.init(options -> {
 			options.setDsn(config.getSystems().getSentryDsn());
 			options.setTracesSampleRate(1.0);

src/main/java/net/javadiscord/javabot/SpringConfig.java

@@ -14,7 +14,6 @@
 
 import xyz.dynxsty.dih4jda.DIH4JDA;
 import xyz.dynxsty.dih4jda.DIH4JDABuilder;
-import xyz.dynxsty.dih4jda.DIH4JDALogger;
 import xyz.dynxsty.dih4jda.exceptions.DIH4JDAException;
 import xyz.dynxsty.dih4jda.interactions.commands.application.RegistrationType;
 
@@ -39,27 +38,27 @@
 @RequiredArgsConstructor
 public class SpringConfig {
 	@Bean
-	public PresenceUpdater standardActivityPresenceUpdater() {
+	PresenceUpdater standardActivityPresenceUpdater() {
 		return PresenceUpdater.standardActivities();
 	}
 
 	@Bean
-	public DataSource getDataSource(BotConfig config) {
+	DataSource getDataSource(BotConfig config) {
 		return DbHelper.initDataSource(config);
 	}
 
 	@Bean
-	public ScheduledExecutorService asyncPool(BotConfig config) {
+	ScheduledExecutorService asyncPool(BotConfig config) {
 		return Executors.newScheduledThreadPool(config.getSystems().getAsyncPoolSize());
 	}
 
 	@Bean
-	public BotConfig config() {
+	BotConfig config() {
 		return new BotConfig(Path.of("config"));
 	}
 
 	@Bean
-	public SystemsConfig systemsConfig(BotConfig botConfig) {
+	SystemsConfig systemsConfig(BotConfig botConfig) {
 		return botConfig.getSystems();
 	}
 
@@ -71,7 +70,7 @@ public SystemsConfig systemsConfig(BotConfig botConfig) {
 	 * @throws LoginException if the token is invalid
 	 */
 	@Bean
-	public JDA jda(BotConfig botConfig, ApplicationContext ctx) throws LoginException {
+	JDA jda(BotConfig botConfig, ApplicationContext ctx) throws LoginException {
 		Collection<Object> listeners = ctx.getBeansWithAnnotation(PreRegisteredListener.class).values();
 		return JDABuilder.createDefault(botConfig.getSystems().getJdaBotToken())
 			.setStatus(OnlineStatus.DO_NOT_DISTURB)
@@ -90,16 +89,17 @@ public JDA jda(BotConfig botConfig, ApplicationContext ctx) throws LoginExceptio
 	 * @throws DIH4JDAException if an error occurs while initializing {@link DIH4JDA}
 	 */
 	@Bean
-	public DIH4JDA initializeDIH4JDA(JDA jda) throws DIH4JDAException {
+	DIH4JDA initializeDIH4JDA(JDA jda) throws DIH4JDAException {
 		DIH4JDA.setDefaultRegistrationType(RegistrationType.GLOBAL);
 		return DIH4JDABuilder.setJDA(jda)
-			.disableLogging(DIH4JDALogger.Type.SMART_QUEUE_IGNORED)
+			.setGlobalSmartQueue(false)
+			.setGuildSmartQueue(false)
 			.disableAutomaticCommandRegistration()
 			.build();
 	}
 
 	@Bean
-	public BotConfig botConfig() {
+	BotConfig botConfig() {
 		return new BotConfig(Path.of("config"));
 	}
 }

src/main/java/net/javadiscord/javabot/api/TomcatConfig.java

@@ -40,7 +40,7 @@ public TomcatConfig(@Value("${tomcat.ajp.port}") int ajpPort, @Value("${tomcat.a
 	 * @return The {@link TomcatServletWebServerFactory}.
 	 */
 	@Bean
-	public TomcatServletWebServerFactory servletContainer() {
+	TomcatServletWebServerFactory servletContainer() {
 		TomcatServletWebServerFactory tomcat = new TomcatServletWebServerFactory();
 		if (tomcatAjpEnabled) {
 			Connector ajpConnector = new Connector("org.apache.coyote.ajp.AjpNioProtocol");

src/main/java/net/javadiscord/javabot/api/routes/metrics/MetricsController.java

@@ -1,15 +1,13 @@
 package net.javadiscord.javabot.api.routes.metrics;
 
 import com.github.benmanes.caffeine.cache.Caffeine;
-import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.Guild;
 import net.javadiscord.javabot.api.exception.InvalidEntityIdException;
 import net.javadiscord.javabot.api.routes.CaffeineCache;
 import net.javadiscord.javabot.api.routes.metrics.model.MetricsData;
 import net.javadiscord.javabot.data.config.BotConfig;
 import net.javadiscord.javabot.data.config.guild.MetricsConfig;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -21,7 +19,6 @@
 /**
  * Handles all GET-Requests on the guilds/{guild_id}/metrics/ route.
  */
-@Slf4j
 @RestController
 public class MetricsController extends CaffeineCache<Long, MetricsData> {
 	private final JDA jda;
@@ -33,7 +30,6 @@ public class MetricsController extends CaffeineCache<Long, MetricsData> {
 	 * @param jda The {@link Autowired} {@link JDA} instance to use.
 	 * @param botConfig The main configuration of the bot
 	 */
-	@Autowired
 	public MetricsController(final JDA jda, BotConfig botConfig) {
 		super(Caffeine.newBuilder()
 				.expireAfterWrite(15, TimeUnit.MINUTES)

src/main/java/net/javadiscord/javabot/data/config/guild/HelpConfig.java

@@ -49,8 +49,14 @@ public class HelpConfig extends GuildConfigItem {
 			You can disable notifications like this using the `/preferences` command.
 			[Post link](%s)
 			""";
-	
-	
+
+	/**
+	 * The message that is sent in a post to tell users that they
+	 * should use discord's code-formatting, provided the bot detects unformatted code.
+	 * Issued by {@link net.javadiscord.javabot.systems.help.AutoCodeFormatter}
+	 */
+	private String formatHintMessage = "> Please format your code to make it more readable. \n> For java, it should look like this: \n```\u200B`\u200B`\u200B`\u200Bjava\npublic void foo() {\n \n}\n\u200B`\u200B`\u200B`\u200B```";
+
 	/**
 	 * The message that's sent when a user unreserved a channel where other users
 	 * participated in.
@@ -93,6 +99,12 @@ public class HelpConfig extends GuildConfigItem {
 	 */
 	private int minimumMessageLength = 10;
 
+	/**
+	 * The message-embed's footnote of an unformatted-code-replacement.
+	 * Issued by {@link net.javadiscord.javabot.systems.help.AutoCodeFormatter}
+	 */
+	private String autoFormatInfoMessage = "This message has been formatted automatically. You can disable this using ``/preferences``.";
+
 	/**
 	 * The amount of experience points one gets for being thanked by the help channel owner.
 	 */

src/main/java/net/javadiscord/javabot/data/h2db/DbHelper.java

@@ -22,7 +22,6 @@
 import java.sql.Statement;
 import java.util.Arrays;
 import java.util.List;
-import java.util.concurrent.ExecutorService;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -38,8 +37,6 @@
 public class DbHelper {
 	@Getter
 	private final DataSource dataSource;
-	private final ExecutorService asyncPool;
-	private final BotConfig botConfig;
 
 	/**
 	 * Initializes the data source that'll be used throughout the bot to access

src/main/java/net/javadiscord/javabot/data/h2db/commands/MessageCacheInfoSubcommand.java

@@ -1,5 +1,6 @@
 package net.javadiscord.javabot.data.h2db.commands;
 
+import net.javadiscord.javabot.util.UserUtils;
 import xyz.dynxsty.dih4jda.interactions.commands.application.SlashCommand;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.Permission;
@@ -45,7 +46,7 @@ private MessageEmbed buildInfoEmbed(GuildConfig config, User author) {
 		long messages = dbActions.count("SELECT count(*) FROM message_cache");
 		int maxMessages = config.getMessageCacheConfig().getMaxCachedMessages();
 		return new EmbedBuilder()
-				.setAuthor(author.getAsTag(), null, author.getEffectiveAvatarUrl())
+				.setAuthor(UserUtils.getUserTag(author), null, author.getEffectiveAvatarUrl())
 				.setTitle("Message Cache Info")
 				.setColor(Responses.Type.DEFAULT.getColor())
 				.addField("Table Size", dbActions.getLogicalSize("message_cache") + " bytes", false)

src/main/java/net/javadiscord/javabot/data/h2db/commands/QuickMigrateSubcommand.java

@@ -118,7 +118,7 @@ CREATE TABLE my_table (
 				.setRequired(true)
 				.build();
 		return Modal.create("quick-migrate", "Quick Migrate")
-				.addActionRows(ActionRow.of(sqlInput), ActionRow.of(confirmInput))
+				.addComponents(ActionRow.of(sqlInput), ActionRow.of(confirmInput))
 				.build();
 	}
 }