Merge branch 'main' into user-api

Author: danthe1st

README.md

@@ -70,7 +70,7 @@ For more information on how this works, visit the [DIH4JDA Wiki!](https://github
 #### `GET` `guilds/{guild_id}/leaderboard/experience?page=1`
 - A paginated endpoint which responds with an ordered list of users, based on their help channel experience.
 
-You can try out the API yourself on `api.javadiscord.net`!
+You can try out the API yourself on `api.discordjug.net`!
 
 # Credits
 

build.gradle.kts

@@ -31,7 +31,7 @@ dependencies {
 
     // DIH4JDA (Command Framework) & JDA
     implementation("com.github.DynxstyGIT:DIH4JDA:120a15ad2e")
-    implementation("net.dv8tion:JDA:5.0.0-beta.12") {
+    implementation("net.dv8tion:JDA:5.0.0-beta.15") {
         exclude(module = "opus-java")
     }
 

src/main/java/net/javadiscord/javabot/api/routes/metrics/model/MetricsData.java

@@ -12,6 +12,6 @@
 public class MetricsData {
 	private long memberCount;
 	private long onlineCount;
-	private String weeklyMessages;
-	private String activeMembers;
+	private long weeklyMessages;
+	private long activeMembers;
 }

src/main/java/net/javadiscord/javabot/api/routes/user_profile/UserProfileController.java

@@ -104,7 +104,7 @@ public ResponseEntity<UserProfileData> getUserProfile(
 				data.setQotwAccount(qotwAccount);
 				// Help Account
 				HelpAccount helpAccount = helpExperienceService.getOrCreateAccount(user.getIdLong());
-				data.setHelpAccount(HelpAccountData.of(helpAccount, guild));
+				data.setHelpAccount(HelpAccountData.of(botConfig, helpAccount, guild));
 				// User Warns
 				LocalDateTime cutoff = LocalDateTime.now().minusDays(botConfig.get(guild).getModerationConfig().getWarnTimeoutDays());
 				data.setWarns(warnRepository.getActiveWarnsByUserId(user.getIdLong(), cutoff));

src/main/java/net/javadiscord/javabot/api/routes/user_profile/model/HelpAccountData.java

@@ -3,6 +3,7 @@
 import lombok.Data;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Role;
+import net.javadiscord.javabot.data.config.BotConfig;
 import net.javadiscord.javabot.systems.help.model.HelpAccount;
 import net.javadiscord.javabot.util.ColorUtils;
 import net.javadiscord.javabot.util.Pair;
@@ -27,20 +28,21 @@ public class HelpAccountData {
 	 * A simple utility method which creates an instance of this class based on
 	 * the specified {@link HelpAccount}.
 	 *
+	 * @param botConfig configuration of the bot.
 	 * @param account The {@link HelpAccount} to convert.
 	 * @param guild   The {@link Guild}.
 	 * @return An instance of the {@link HelpAccountData} class.
 	 */
-	public static @NotNull HelpAccountData of(@NotNull HelpAccount account, Guild guild) {
+	public static @NotNull HelpAccountData of(BotConfig botConfig, @NotNull HelpAccount account, Guild guild) {
 		HelpAccountData data = new HelpAccountData();
 		data.setExperienceCurrent(account.getExperience());
-		Pair<Role, Double> previousRank = account.getPreviousExperienceGoal(guild);
+		Pair<Role, Double> previousRank = account.getPreviousExperienceGoal(botConfig, guild);
 		if (previousRank != null && previousRank.first() != null) {
 			data.setCurrentRank(previousRank.first().getName());
 			data.setCurrentRankColor(ColorUtils.toString(previousRank.first().getColor()));
 			data.setExperiencePrevious(previousRank.second());
 		}
-		Pair<Role, Double> nextRank = account.getNextExperienceGoal(guild);
+		Pair<Role, Double> nextRank = account.getNextExperienceGoal(botConfig, guild);
 		if (nextRank != null && nextRank.first() != null) {
 			data.setNextRank(nextRank.first().getName());
 			data.setNextRankColor(ColorUtils.toString(nextRank.first().getColor()));

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

@@ -11,8 +11,8 @@
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class MetricsConfig extends GuildConfigItem {
-	private String weeklyMessages = "";
-	private String activeMembers = "";
+	private long weeklyMessages = -1;
+	private long activeMembers = -1;
 	private long metricsCategoryId = 0;
 	private String metricsMessageTemplate = "";
 

src/main/java/net/javadiscord/javabot/listener/GitHubLinkListener.java

@@ -36,7 +36,7 @@ public void onMessageReceived(@NotNull MessageReceivedEvent event) {
 			if (!content.getFirst().isBlank() && !content.getSecond().isBlank()) {
 				event.getMessage().reply(String.format("```%s\n%s\n```", content.getSecond(), StringUtils.standardSanitizer().compute(content.getFirst())))
 						.setAllowedMentions(List.of())
-						.setActionRow(Button.secondary(InteractionUtils.DELETE_ORIGINAL_TEMPLATE, "\uD83D\uDDD1️"), Button.link(matcher.group(), "View on GitHub"))
+						.setActionRow(InteractionUtils.createDeleteButton(event.getAuthor().getIdLong()), Button.link(matcher.group(), "View on GitHub"))
 						.queue();
 			}
 		}

src/main/java/net/javadiscord/javabot/listener/JobChannelCloseOldPostsListener.java

@@ -8,7 +8,6 @@
 import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel;
 import net.dv8tion.jda.api.events.channel.ChannelCreateEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
-import net.dv8tion.jda.api.interactions.components.buttons.Button;
 import net.javadiscord.javabot.data.config.BotConfig;
 import net.javadiscord.javabot.util.InteractionUtils;
 
@@ -17,9 +16,9 @@
  */
 @RequiredArgsConstructor
 public class JobChannelCloseOldPostsListener extends ListenerAdapter {
-	
+
 	private final BotConfig botConfig;
-	
+
 	@Override
 	public void onChannelCreate(ChannelCreateEvent event) {
 		if (event.getChannel().getType() != ChannelType.GUILD_PUBLIC_THREAD) {
@@ -30,10 +29,10 @@ public void onChannelCreate(ChannelCreateEvent event) {
 				botConfig.get(event.getGuild()).getModerationConfig().getJobChannelId()) {
 			return;
 		}
-		
-		
+
+
 		boolean postClosed = false;
-		
+
 		for (ThreadChannel otherPost : post.getParentChannel().getThreadChannels()) {
 			if (otherPost.getOwnerIdLong() == post.getOwnerIdLong() &&
 					otherPost.getIdLong() != post.getIdLong() &&
@@ -56,9 +55,7 @@ public void onChannelCreate(ChannelCreateEvent event) {
 					.setDescription("Since only one open post is allowed per user, older posts have been closed")
 					.setColor(Color.YELLOW)
 					.build())
-				.addActionRow(Button.secondary(
-						InteractionUtils.DELETE_ORIGINAL_TEMPLATE,
-						"\uD83D\uDDD1️"))
+				.addActionRow(InteractionUtils.createDeleteButton(post.getOwnerIdLong()))
 				.queue();
 		}
 	}

src/main/java/net/javadiscord/javabot/listener/MessageLinkListener.java

@@ -15,6 +15,7 @@
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import net.dv8tion.jda.api.requests.RestAction;
 import net.javadiscord.javabot.util.ExceptionLogger;
+import net.javadiscord.javabot.util.InteractionUtils;
 import net.javadiscord.javabot.util.WebhookUtil;
 import org.jetbrains.annotations.NotNull;
 
@@ -42,7 +43,12 @@ public void onMessageReceived(@NotNull MessageReceivedEvent event) {
 				Optional<RestAction<Message>> optional = parseMessageUrl(matcher.group(), event.getJDA());
 				optional.ifPresent(action -> action.queue(m -> {
 						WebhookUtil.ensureWebhookExists(webhookChannel,
-								wh -> WebhookUtil.mirrorMessageToWebhook(wh, m, m.getContentRaw(), messageChannel.getType().isThread() ? messageChannel.getIdLong() : 0, List.of(ActionRow.of(Button.link(m.getJumpUrl(), "Jump to Message"))), null));
+							wh -> WebhookUtil.mirrorMessageToWebhook(wh, m, m.getContentRaw(),
+									messageChannel.getType().isThread() ? messageChannel.getIdLong() : 0,
+									List.of(ActionRow.of(
+											Button.link(m.getJumpUrl(), "Jump to Message"),
+											Button.secondary(InteractionUtils.createDeleteInteractionId(m.getAuthor().getIdLong()), "\uD83D\uDDD1️"))),
+									null));
 					}, e -> ExceptionLogger.capture(e, getClass().getSimpleName())));
 			}
 		}

src/main/java/net/javadiscord/javabot/listener/QOTWSubmissionListener.java

@@ -5,7 +5,6 @@
 import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
-import net.dv8tion.jda.api.interactions.components.buttons.Button;
 import net.javadiscord.javabot.data.config.BotConfig;
 import net.javadiscord.javabot.data.config.guild.QOTWConfig;
 import net.javadiscord.javabot.util.InteractionUtils;
@@ -35,7 +34,7 @@ public void onMessageReceived(@NotNull MessageReceivedEvent event) {
 									Please keep in mind that messages **over 2000 characters** get split in half due to webhook limitations.
 									If you want to make sure that your submission is properly formatted, split your message into smaller chunks instead.""",
 							event.getAuthor().getAsMention())
-					.setActionRow(Button.secondary(InteractionUtils.DELETE_ORIGINAL_TEMPLATE, "\uD83D\uDDD1️"))
+					.setActionRow(InteractionUtils.createDeleteButton(event.getAuthor().getIdLong()))
 					.queue();
 		}
 	}