Merge branch 'main' into help-stats-command

danthe1st · danthe1st · commit 34c06ad129eb · 2023-10-30T16:28:44.000+01:00
diff --git a/README.md b/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
 
diff --git a/build.gradle.kts b/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")
     }
 
diff --git a/src/main/java/net/javadiscord/javabot/api/routes/metrics/model/MetricsData.java b/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;
 }
diff --git a/src/main/java/net/javadiscord/javabot/data/config/guild/MetricsConfig.java b/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 = "";
 
diff --git a/src/main/java/net/javadiscord/javabot/listener/GitHubLinkListener.java b/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();
 			}
 		}
diff --git a/src/main/java/net/javadiscord/javabot/listener/JobChannelCloseOldPostsListener.java b/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();
 		}
 	}
diff --git a/src/main/java/net/javadiscord/javabot/listener/MessageLinkListener.java b/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())));
 			}
 		}
diff --git a/src/main/java/net/javadiscord/javabot/listener/QOTWSubmissionListener.java b/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();
 		}
 	}
diff --git a/src/main/java/net/javadiscord/javabot/systems/help/AutoCodeFormatter.java b/src/main/java/net/javadiscord/javabot/systems/help/AutoCodeFormatter.java
@@ -5,7 +5,6 @@
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.MessageEmbed;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
-import net.dv8tion.jda.api.interactions.components.buttons.Button;
 import net.javadiscord.javabot.data.config.BotConfig;
 import net.javadiscord.javabot.systems.moderation.AutoMod;
 import net.javadiscord.javabot.systems.user_preferences.UserPreferenceService;
@@ -124,9 +123,8 @@ private void sendFormatHint(MessageReceivedEvent event) {
 		event.getMessage()
 				.replyEmbeds(formatHintEmbed(event.getGuild()))
 				.addActionRow(
-						Button.secondary(InteractionUtils.DELETE_ORIGINAL_TEMPLATE, "\uD83D\uDDD1️")
-				)
-				.queue();
+						InteractionUtils.createDeleteButton(event.getAuthor().getIdLong())
+				).queue();
 	}
 
 	private void replaceUnformattedCode(String msg, int codeStartIndex, int codeEndIndex, MessageReceivedEvent event) {
diff --git a/src/main/java/net/javadiscord/javabot/systems/help/HelpExperienceService.java b/src/main/java/net/javadiscord/javabot/systems/help/HelpExperienceService.java
@@ -11,7 +11,9 @@
 import net.javadiscord.javabot.systems.help.dao.HelpTransactionRepository;
 import net.javadiscord.javabot.systems.help.model.HelpAccount;
 import net.javadiscord.javabot.systems.help.model.HelpTransaction;
+import net.javadiscord.javabot.systems.user_commands.leaderboard.ExperienceLeaderboardSubcommand;
 import net.javadiscord.javabot.util.ExceptionLogger;
+import net.javadiscord.javabot.util.ImageCache;
 import net.javadiscord.javabot.util.Pair;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.dao.DataAccessException;
@@ -97,6 +99,7 @@ public void performTransaction(long recipient, double value, Guild guild, long c
 		helpTransactionRepository.save(transaction);
 		checkExperienceRoles(guild, account);
 		log.info("Added {} help experience to {}'s help account", value, recipient);
+		ImageCache.removeCachedImagesByKeyword(ExperienceLeaderboardSubcommand.CACHE_PREFIX);
 	}
 
 	private void checkExperienceRoles(@NotNull Guild guild, @NotNull HelpAccount account) {
@@ -114,10 +117,10 @@ private void checkExperienceRoles(@NotNull Guild guild, @NotNull HelpAccount acc
 					}
 				}), e -> {});
 	}
-	
+
 	/**
 	 * add XP to all helpers depending on the messages they sent.
-	 * 
+	 *
 	 * @param post The {@link ThreadChannel} post
 	 * @param allowIfXPAlreadyGiven {@code true} if XP should be awarded if XP have already been awarded
 	 */
diff --git a/src/main/java/net/javadiscord/javabot/systems/help/HelpListener.java b/src/main/java/net/javadiscord/javabot/systems/help/HelpListener.java
@@ -162,14 +162,9 @@ private void replyCloseSuggestionIfPatternMatches(Message msg) {
 									Note that you will not be able to send further messages here after this post have been closed but you will be able to create new posts.
 									""")
 				.addActionRow(
-						createCloseSuggestionButton(msg.getChannel()
-								.asThreadChannel()),
-						Button.secondary(
-								InteractionUtils.DELETE_ORIGINAL_TEMPLATE,
-								"\uD83D\uDDD1️"
-								)
-						)
-				.queue();
+						createCloseSuggestionButton(msg.getChannel().asThreadChannel()),
+						InteractionUtils.createDeleteButton(msg.getAuthor().getIdLong())
+				).queue();
 				recentlyCloseSuggestedPosts.put(
 						postId,
 						System.currentTimeMillis() + SUGGEST_CLOSE_TIMEOUT
diff --git a/src/main/java/net/javadiscord/javabot/systems/help/dao/HelpTransactionRepository.java b/src/main/java/net/javadiscord/javabot/systems/help/dao/HelpTransactionRepository.java
@@ -112,6 +112,31 @@ public List<Pair<MonthInYear, HelpAccount>> getTotalTransactionWeightByMonthAndU
 				start);
 	}
 	
+	/**
+	 * Gets the number of users that earned help XP in the last 30 days.
+	 * This corresponds to the number of elements in {@link HelpTransactionRepository#getTotalTransactionWeightsInLastMonth(int, int)}
+	 * @return number of users earning help XP in the last 30 days
+	 */
+	public int getNumberOfUsersWithHelpXPInLastMonth() {
+		return jdbcTemplate.queryForObject("SELECT COUNT(DISTINCT recipient) FROM help_transaction WHERE created_at >= ?",
+				(rs, row) -> rs.getInt(1),
+				LocalDateTime.now().minusDays(30));
+	}
+
+	/**
+	 * Gets the total XP of users in the last 30 days in descending order of XP.
+	 * This query uses pagination.
+	 * @param page the page to request
+	 * @param pageSize the number of users
+	 * @return the requested user IDs as well as their XP counts
+	 * @see HelpTransactionRepository#getNumberOfUsersWithHelpXPInLastMonth()
+	 */
+	public List<Pair<Long, Integer>> getTotalTransactionWeightsInLastMonth(int page, int pageSize) {
+		return jdbcTemplate.query("SELECT recipient, SUM(weight) experience FROM help_transaction WHERE created_at >= ? GROUP BY recipient ORDER BY experience DESC LIMIT ? OFFSET ?",
+				(rs, row) -> new Pair<>(rs.getLong(1), rs.getInt(2)),
+				LocalDateTime.now().minusDays(30), pageSize, page);
+	}
+
 	/**
 	 * Checks whether a transaction with a specific recipient exists in a specific channel.
 	 * @param recipient The ID of the recipient
diff --git a/src/main/java/net/javadiscord/javabot/systems/user_commands/format_code/FormatAndIndentCodeMessageContext.java b/src/main/java/net/javadiscord/javabot/systems/user_commands/format_code/FormatAndIndentCodeMessageContext.java
@@ -27,7 +27,7 @@ public FormatAndIndentCodeMessageContext() {
 	public void execute(@NotNull MessageContextInteractionEvent event) {
 		event.replyFormat("```java\n%s\n```", IndentationHelper.formatIndentation(StringUtils.standardSanitizer().compute(event.getTarget().getContentRaw()), IndentationHelper.IndentationType.TABS))
 				.setAllowedMentions(List.of())
-				.setComponents(FormatCodeCommand.buildActionRow(event.getTarget()))
+				.setComponents(FormatCodeCommand.buildActionRow(event.getTarget(), event.getUser().getIdLong()))
 				.queue();
 	}
 }
diff --git a/src/main/java/net/javadiscord/javabot/systems/user_commands/format_code/FormatCodeCommand.java b/src/main/java/net/javadiscord/javabot/systems/user_commands/format_code/FormatCodeCommand.java
@@ -56,8 +56,8 @@ public FormatCodeCommand() {
 	}
 
 	@Contract("_ -> new")
-	static @NotNull ActionRow buildActionRow(@NotNull Message target) {
-		return ActionRow.of(Button.secondary(InteractionUtils.DELETE_ORIGINAL_TEMPLATE, "\uD83D\uDDD1️"),
+	static @NotNull ActionRow buildActionRow(@NotNull Message target, long requesterId) {
+		return ActionRow.of(InteractionUtils.createDeleteButton(requesterId),
 				Button.link(target.getJumpUrl(), "View Original"));
 	}
 
@@ -78,7 +78,7 @@ public void execute(@NotNull SlashCommandInteractionEvent event) {
 						if (target != null) {
 							event.getHook().sendMessageFormat("```%s\n%s\n```", format, IndentationHelper.formatIndentation(StringUtils.standardSanitizer().compute(target.getContentRaw()),IndentationHelper.IndentationType.valueOf(indentation)))
 									.setAllowedMentions(List.of())
-									.setComponents(buildActionRow(target))
+									.setComponents(buildActionRow(target, event.getUser().getIdLong()))
 									.queue();
 						} else {
 							Responses.error(event.getHook(), "Could not find message; please specify a message id.").queue();
@@ -93,7 +93,7 @@ public void execute(@NotNull SlashCommandInteractionEvent event) {
 			event.getChannel().retrieveMessageById(messageId).queue(
 					target -> event.getHook().sendMessageFormat("```%s\n%s\n```", format, IndentationHelper.formatIndentation(StringUtils.standardSanitizer().compute(target.getContentRaw()), IndentationHelper.IndentationType.valueOf(indentation)))
 							.setAllowedMentions(List.of())
-							.setComponents(buildActionRow(target))
+							.setComponents(buildActionRow(target, event.getUser().getIdLong()))
 							.queue(),
 					e -> Responses.error(event.getHook(), "Could not retrieve message with id: " + messageId).queue());
 		}
diff --git a/src/main/java/net/javadiscord/javabot/systems/user_commands/format_code/FormatCodeMessageContext.java b/src/main/java/net/javadiscord/javabot/systems/user_commands/format_code/FormatCodeMessageContext.java
@@ -25,7 +25,7 @@ public FormatCodeMessageContext() {
 	public void execute(@NotNull MessageContextInteractionEvent event) {
 		event.replyFormat("```java\n%s\n```", StringUtils.standardSanitizer().compute(event.getTarget().getContentRaw()))
 				.setAllowedMentions(List.of())
-				.setComponents(FormatCodeCommand.buildActionRow(event.getTarget()))
+				.setComponents(FormatCodeCommand.buildActionRow(event.getTarget(), event.getUser().getIdLong()))
 				.queue();
 	}
 }
diff --git a/src/main/java/net/javadiscord/javabot/systems/user_commands/leaderboard/ExperienceLeaderboardSubcommand.java b/src/main/java/net/javadiscord/javabot/systems/user_commands/leaderboard/ExperienceLeaderboardSubcommand.java
diff --git a/src/main/java/net/javadiscord/javabot/systems/user_commands/leaderboard/LeaderboardCreator.java b/src/main/java/net/javadiscord/javabot/systems/user_commands/leaderboard/LeaderboardCreator.java
diff --git a/src/main/java/net/javadiscord/javabot/systems/user_commands/leaderboard/QOTWLeaderboardSubcommand.java b/src/main/java/net/javadiscord/javabot/systems/user_commands/leaderboard/QOTWLeaderboardSubcommand.java
diff --git a/src/main/java/net/javadiscord/javabot/tasks/PresenceUpdater.java b/src/main/java/net/javadiscord/javabot/tasks/PresenceUpdater.java
diff --git a/src/main/java/net/javadiscord/javabot/util/InteractionUtils.java b/src/main/java/net/javadiscord/javabot/util/InteractionUtils.java
diff --git a/src/main/java/net/javadiscord/javabot/util/WebhookUtil.java b/src/main/java/net/javadiscord/javabot/util/WebhookUtil.java

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ dependencies {`
`31`	`31`
`32`	`32`	`// DIH4JDA (Command Framework) & JDA`
`33`	`33`	`implementation("com.github.DynxstyGIT:DIH4JDA:120a15ad2e")`
`34`		`- implementation("net.dv8tion:JDA:5.0.0-beta.12") {`
	`34`	`+ implementation("net.dv8tion:JDA:5.0.0-beta.15") {`
`35`	`35`	`exclude(module = "opus-java")`
`36`	`36`	`}`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@`
`12`	`12`	`public class MetricsData {`
`13`	`13`	`private long memberCount;`
`14`	`14`	`private long onlineCount;`
`15`		`- private String weeklyMessages;`
`16`		`- private String activeMembers;`
	`15`	`+ private long weeklyMessages;`
	`16`	`+ private long activeMembers;`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public void onMessageReceived(@NotNull MessageReceivedEvent event) {`
`36`	`36`	`if (!content.getFirst().isBlank() && !content.getSecond().isBlank()) {`
`37`	`37`	event.getMessage().reply(String.format("```%s\n%s\n```", content.getSecond(), StringUtils.standardSanitizer().compute(content.getFirst())))
`38`	`38`	`.setAllowedMentions(List.of())`
`39`		`- .setActionRow(Button.secondary(InteractionUtils.DELETE_ORIGINAL_TEMPLATE, "\uD83D\uDDD1️"), Button.link(matcher.group(), "View on GitHub"))`
	`39`	`+ .setActionRow(InteractionUtils.createDeleteButton(event.getAuthor().getIdLong()), Button.link(matcher.group(), "View on GitHub"))`
`40`	`40`	`.queue();`
`41`	`41`	`}`
`42`	`42`	`}`