Merge branch 'main' into springify

Author: danthe1st

build.gradle.kts

@@ -28,8 +28,8 @@ dependencies {
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.0")
 
     // DIH4JDA (Interaction Framework) & JDA
-    implementation("com.github.DynxstyGIT:DIH4JDA:f564af77e9")
-    implementation("net.dv8tion:JDA:5.0.0-alpha.17") {
+    implementation("com.github.DynxstyGIT:DIH4JDA:c8f7928efc")
+    implementation("net.dv8tion:JDA:5.0.0-alpha.20") {
         exclude(module = "opus-java")
     }
 

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

@@ -23,11 +23,12 @@
 import com.dynxsty.dih4jda.interactions.components.ButtonHandler;
 import com.dynxsty.dih4jda.interactions.components.ModalHandler;
 import com.dynxsty.dih4jda.interactions.components.SelectMenuHandler;
+
 import io.sentry.Sentry;
 import lombok.RequiredArgsConstructor;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
-import net.dv8tion.jda.api.utils.AllowedMentions;
+import net.dv8tion.jda.api.utils.messages.MessageRequest;
 import net.javadiscord.javabot.data.config.BotConfig;
 import net.javadiscord.javabot.systems.AutoDetectableComponentHandler;
 import net.javadiscord.javabot.tasks.PresenceUpdater;
@@ -100,7 +101,7 @@ public void init() {
 	 */
 	public static void main(String[] args) throws Exception {
 		TimeZone.setDefault(TimeZone.getTimeZone(ZoneOffset.UTC));
-		AllowedMentions.setDefaultMentions(EnumSet.of(Message.MentionType.ROLE, Message.MentionType.CHANNEL, Message.MentionType.USER, Message.MentionType.EMOJI));
+		MessageRequest.setDefaultMentions(EnumSet.of(Message.MentionType.ROLE, Message.MentionType.CHANNEL, Message.MentionType.USER, Message.MentionType.EMOJI));
 		SpringApplication.run(Bot.class, args);
 	}
 

src/main/java/net/javadiscord/javabot/data/config/GuildConfig.java

@@ -31,6 +31,7 @@ public class GuildConfig {
 	private transient Path file;
 
 	private HelpConfig helpConfig;
+	private HelpForumConfig helpForumConfig;
 	private ModerationConfig moderationConfig;
 	private QOTWConfig qotwConfig;
 	private MetricsConfig metricsConfig;
@@ -48,6 +49,7 @@ public GuildConfig(Guild guild, Path file) {
 		this.file = file;
 		// Initialize all config items.
 		this.helpConfig = new HelpConfig();
+		this.helpForumConfig = new HelpForumConfig();
 		this.moderationConfig = new ModerationConfig();
 		this.qotwConfig = new QOTWConfig();
 		this.metricsConfig = new MetricsConfig();
@@ -95,6 +97,8 @@ private void setGuild(Guild guild) {
 		this.guild = guild;
 		if (this.helpConfig == null) this.helpConfig = new HelpConfig();
 		this.helpConfig.setGuildConfig(this);
+		if (this.helpForumConfig == null) this.helpForumConfig = new HelpForumConfig();
+		this.helpForumConfig.setGuildConfig(this);
 		if (this.moderationConfig == null) this.moderationConfig = new ModerationConfig();
 		this.moderationConfig.setGuildConfig(this);
 		if (this.qotwConfig == null) this.qotwConfig = new QOTWConfig();

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

@@ -2,8 +2,8 @@
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import net.dv8tion.jda.api.entities.Category;
 import net.dv8tion.jda.api.entities.Role;
+import net.dv8tion.jda.api.entities.channel.concrete.Category;
 import net.javadiscord.javabot.data.config.GuildConfigItem;
 import net.javadiscord.javabot.systems.help.naming_strategies.*;
 

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

@@ -0,0 +1,20 @@
+package net.javadiscord.javabot.data.config.guild;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import net.dv8tion.jda.api.entities.channel.concrete.ForumChannel;
+import net.javadiscord.javabot.data.config.GuildConfigItem;
+
+/**
+ * Configuration for the guilds' forum help system, which aims to replace the
+ * 'old' text channel-based one.
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class HelpForumConfig extends GuildConfigItem {
+	private long helpForumChannelId = 0;
+
+	public ForumChannel getHelpForumChannel() {
+		return getGuild().getForumChannelById(helpForumChannelId);
+	}
+}

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

@@ -2,7 +2,7 @@
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import net.javadiscord.javabot.data.config.GuildConfigItem;
 
 import java.util.List;

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

@@ -2,7 +2,7 @@
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import net.dv8tion.jda.api.entities.Category;
+import net.dv8tion.jda.api.entities.channel.concrete.Category;
 import net.javadiscord.javabot.data.config.GuildConfigItem;
 
 /**

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

@@ -3,7 +3,7 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import net.dv8tion.jda.api.entities.Role;
-import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import net.javadiscord.javabot.data.config.GuildConfigItem;
 
 import java.util.List;

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

@@ -2,9 +2,9 @@
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import net.dv8tion.jda.api.entities.NewsChannel;
 import net.dv8tion.jda.api.entities.Role;
-import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.NewsChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import net.javadiscord.javabot.data.config.GuildConfigItem;
 
 /**

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

@@ -2,7 +2,7 @@
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.entities.emoji.UnicodeEmoji;
 import net.javadiscord.javabot.data.config.GuildConfigItem;