Merge remote-tracking branch 'origin/main' into dynxsty/post_based_help

Author: jasonlessenich

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

@@ -22,6 +22,7 @@ public class QOTWConfig extends GuildConfigItem {
 	private long submissionsForumChannelId;
 	private long questionRoleId;
 	private long qotwReviewRoleId;
+	private long qotwChampionRoleId;
 	private String submissionForumOngoingReviewTagName = "";
 
 	public NewsChannel getQuestionChannel() {
@@ -44,6 +45,10 @@ public Role getQOTWReviewRole() {
 		return this.getGuild().getRoleById(this.qotwReviewRoleId);
 	}
 
+	public Role getQOTWChampionRole() {
+		return this.getGuild().getRoleById(this.qotwChampionRoleId);
+	}
+
 	/**
 	 * Gets a {@link ForumTag} based on the specified name.
 	 *

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

@@ -96,7 +96,7 @@ private char copyCase(String original, int index, char newChar) {
 	}
 
 	private void sendWebhookMessage(Webhook webhook, Message originalMessage, String newMessageContent, long threadId) {
-		WebhookUtil.mirrorMessageToWebhook(webhook, originalMessage, newMessageContent, threadId)
+		WebhookUtil.mirrorMessageToWebhook(webhook, originalMessage, newMessageContent, threadId, null, null)
 				.thenAccept(unused -> originalMessage.delete().queue()).exceptionally(e -> {
 					log.error("replacing the content 'fuck' with 'hug' in an incoming message failed", e);
 					return null;

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

@@ -15,6 +15,7 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -34,7 +35,7 @@ public void onMessageReceived(@NotNull MessageReceivedEvent event) {
 			Optional<RestAction<Message>> optional = parseMessageUrl(matcher.group(), event.getJDA());
 			optional.ifPresent(action -> action.queue(
 					m -> WebhookUtil.ensureWebhookExists(event.getChannel().asTextChannel(),
-							wh -> WebhookUtil.mirrorMessageToWebhook(wh, m, m.getContentRaw(), 0, ActionRow.of(Button.link(m.getJumpUrl(), "Jump to Message")))
+							wh -> WebhookUtil.mirrorMessageToWebhook(wh, m, m.getContentRaw(), 0, List.of(ActionRow.of(Button.link(m.getJumpUrl(), "Jump to Message"))), null)
 					), e -> ExceptionLogger.capture(e, getClass().getSimpleName())
 			));
 		}

src/main/java/net/javadiscord/javabot/systems/moderation/report/ReportManager.java

@@ -159,7 +159,7 @@ private void handleMessageReport(ModalInteractionEvent event, String messageId)
 			MessageChannel reportChannel = config.getModerationConfig().getReportChannel();
 			reportChannel.sendMessageEmbeds(embed.build()).queue(m -> createReportThread(m, target.getAuthor().getIdLong(), config.getModerationConfig(), thread->{
 				WebhookUtil.ensureWebhookExists(thread.getParentChannel().asStandardGuildMessageChannel(), wh->{
-					WebhookUtil.mirrorMessageToWebhook(wh, target, target.getContentRaw(), thread.getIdLong());
+					WebhookUtil.mirrorMessageToWebhook(wh, target, target.getContentRaw(), thread.getIdLong(), null, null);
 				});
 			}));
 			embed.setDescription("Successfully reported " + "`" + target.getAuthor().getAsTag() + "`!\nYour report has been send to our Moderators");

src/main/java/net/javadiscord/javabot/systems/notification/QOTWNotificationService.java

@@ -65,7 +65,7 @@ public void sendSubmissionDeclinedEmbed() {
 				.setDescription(String.format(
 						"""
 								Your submission was marked as the best answer!
-								You've been granted **`1 extra QOTW-Point`**! (total: %s)""", points))
+								You've been granted **`1 extra QOTW-Point`**! (monthly total: %s)""", points))
 				.build();
 	}
 
@@ -75,7 +75,7 @@ public void sendSubmissionDeclinedEmbed() {
 				.setDescription(String.format(
 						"""
 								Your submission was accepted! %s
-								You've been granted **`1 QOTW-Point`**! (total: %s)""",
+								You've been granted **`1 QOTW-Point`**! (monthly total: %s)""",
 						systemsConfig.getEmojiConfig().getSuccessEmote(guild.getJDA()), points))
 				.build();
 	}

src/main/java/net/javadiscord/javabot/systems/qotw/QOTWPointsService.java

@@ -12,6 +12,8 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
+import java.time.YearMonth;
 import java.util.List;
 import java.util.Optional;
 
@@ -33,14 +35,13 @@ public class QOTWPointsService {
 	@Transactional
 	public QOTWAccount getOrCreateAccount(long userId) throws DataAccessException {
 		QOTWAccount account;
-		Optional<QOTWAccount> optional = pointsRepository.getByUserId(userId);
+		Optional<QOTWAccount> optional = pointsRepository.getByUserId(userId, getCurrentMonth());
 		if (optional.isPresent()) {
 			account = optional.get();
 		} else {
 			account = new QOTWAccount();
 			account.setUserId(userId);
 			account.setPoints(0);
-			pointsRepository.insert(account);
 		}
 		return account;
 	}
@@ -53,7 +54,7 @@ public QOTWAccount getOrCreateAccount(long userId) throws DataAccessException {
 	 */
 	public int getQOTWRank(long userId) {
 		try{
-			List<QOTWAccount> accounts = pointsRepository.sortByPoints();
+			List<QOTWAccount> accounts = pointsRepository.sortByPoints(getCurrentMonth());
 			return accounts.stream()
 					.map(QOTWAccount::getUserId)
 					.toList()
@@ -88,9 +89,10 @@ public long getPoints(long userId) {
 	 */
 	public List<Pair<QOTWAccount, Member>> getTopMembers(int n, Guild guild) {
 		try {
-			List<QOTWAccount> accounts = pointsRepository.sortByPoints();
+			List<QOTWAccount> accounts = pointsRepository.sortByPoints(getCurrentMonth());
 			return accounts.stream()
 					.map(s -> new Pair<>(s, guild.getMemberById(s.getUserId())))
+					.filter(p->p.first().getPoints() > 0)
 					.filter(p -> p.second() != null)
 					.limit(n)
 					.toList();
@@ -109,7 +111,7 @@ public List<Pair<QOTWAccount, Member>> getTopMembers(int n, Guild guild) {
 	 */
 	public List<QOTWAccount> getTopAccounts(int amount, int page) {
 		try {
-			return pointsRepository.getTopAccounts(page, amount);
+			return pointsRepository.getTopAccounts(getCurrentMonth(), page, amount);
 		} catch (DataAccessException e) {
 			ExceptionLogger.capture(e, getClass().getSimpleName());
 			return List.of();
@@ -119,21 +121,24 @@ public List<QOTWAccount> getTopAccounts(int amount, int page) {
 	/**
 	 * Increments a single user's QOTW-Points.
 	 *
-	 * @param userId The discord Id of the user.
+	 * @param userId The ID of the user whose points shall be incremented
 	 * @return The total points after the update.
 	 */
 	public long increment(long userId) {
 		try {
-			QOTWAccount account = getOrCreateAccount(userId);
-			account.setPoints(account.getPoints() + 1);
-			if (pointsRepository.update(account)) {
-				return account.getPoints();
-			} else {
-				return 0;
-			}
+			LocalDate date=LocalDate.now();
+			int points = pointsRepository.getPointsAtDate(userId, date)+1;
+			pointsRepository.setPointsAtDate(userId, date, points);
+			LocalDate month = getCurrentMonth();
+			long newScore = pointsRepository.getByUserId(userId, month).map(QOTWAccount::getPoints).orElse(0L);
+			return newScore;
 		} catch (DataAccessException e) {
 			ExceptionLogger.capture(e, getClass().getSimpleName());
 			return 0;
 		}
 	}
+
+	public static LocalDate getCurrentMonth() {
+		return YearMonth.from(LocalDate.now()).atDay(1);
+	}
 }

src/main/java/net/javadiscord/javabot/systems/qotw/commands/QOTWAdminCommand.java

@@ -4,7 +4,6 @@
 import net.dv8tion.jda.api.interactions.commands.build.Commands;
 import net.dv8tion.jda.api.interactions.commands.build.SubcommandGroupData;
 import net.javadiscord.javabot.systems.qotw.commands.qotw_points.IncrementPointsSubcommand;
-import net.javadiscord.javabot.systems.qotw.commands.qotw_points.SetPointsSubcommand;
 import net.javadiscord.javabot.systems.qotw.commands.questions_queue.AddQuestionSubcommand;
 import net.javadiscord.javabot.systems.qotw.commands.questions_queue.ListQuestionsSubcommand;
 import net.javadiscord.javabot.systems.qotw.commands.questions_queue.RemoveQuestionSubcommand;
@@ -23,18 +22,17 @@ public class QOTWAdminCommand extends SlashCommand {
 	 * @param addQuestionSubcommand     /qotw-admin questions-queue add
 	 * @param removeQuestionSubcommand  /qotw-admin questions-queue remove
 	 * @param incrementPointsSubcommand /qotw-admin account increment
-	 * @param setPointsSubcommand       /qotw-admin account set
 	 * @param reviewSubcommand          /qotw-admin submissions review
 	 */
-	public QOTWAdminCommand(ListQuestionsSubcommand listQuestionsSubcommand, AddQuestionSubcommand addQuestionSubcommand, RemoveQuestionSubcommand removeQuestionSubcommand, IncrementPointsSubcommand incrementPointsSubcommand, SetPointsSubcommand setPointsSubcommand, QOTWReviewSubcommand reviewSubcommand) {
+	public QOTWAdminCommand(ListQuestionsSubcommand listQuestionsSubcommand, AddQuestionSubcommand addQuestionSubcommand, RemoveQuestionSubcommand removeQuestionSubcommand, IncrementPointsSubcommand incrementPointsSubcommand, QOTWReviewSubcommand reviewSubcommand) {
 		setCommandData(Commands.slash("qotw-admin", "Administrative tools for managing the Question of the Week.")
 				.setDefaultPermissions(DefaultMemberPermissions.DISABLED)
 				.setGuildOnly(true)
 		);
 		addSubcommands(reviewSubcommand);
 		addSubcommandGroups(
 				SubcommandGroup.of(new SubcommandGroupData("questions-queue", "Commands for interacting with the set of QOTW questions that are in queue."), listQuestionsSubcommand, addQuestionSubcommand, removeQuestionSubcommand),
-				SubcommandGroup.of(new SubcommandGroupData("account", "Commands for interaction with Users Question of the Week points."), incrementPointsSubcommand, setPointsSubcommand),
+				SubcommandGroup.of(new SubcommandGroupData("account", "Commands for interaction with Users Question of the Week points."), incrementPointsSubcommand),
 				SubcommandGroup.of(new SubcommandGroupData("submissions", "Commands for managing QOTW Submissions."), reviewSubcommand)
 		);
 	}