Made some final cleanup

Author: jasonlessenich

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

@@ -6,8 +6,11 @@
 import net.dv8tion.jda.api.entities.channel.concrete.ForumChannel;
 import net.dv8tion.jda.api.entities.channel.concrete.NewsChannel;
 import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
+import net.dv8tion.jda.api.entities.channel.forums.ForumTag;
 import net.javadiscord.javabot.data.config.GuildConfigItem;
 
+import java.util.List;
+
 /**
  * Configuration for the guild's qotw system.
  */
@@ -19,6 +22,7 @@ public class QOTWConfig extends GuildConfigItem {
 	private long submissionsForumChannelId;
 	private long questionRoleId;
 	private long qotwReviewRoleId;
+	private String submissionForumOngoingReviewTagName = "";
 
 	public NewsChannel getQuestionChannel() {
 		return this.getGuild().getNewsChannelById(this.questionChannelId);
@@ -39,4 +43,16 @@ public Role getQOTWRole() {
 	public Role getQOTWReviewRole() {
 		return this.getGuild().getRoleById(this.qotwReviewRoleId);
 	}
+
+	/**
+	 * Gets a {@link ForumTag} based on the specified name.
+	 *
+	 * @return The specified {@link ForumTag} or null if there is no tag matching the specified name.
+	 */
+	public ForumTag getSubmissionsForumOngoingReviewTag() {
+		ForumChannel forumChannel = getSubmissionsForumChannel();
+		if (forumChannel == null) return null;
+		List<ForumTag> tags = forumChannel.getAvailableTagsByName(this.submissionForumOngoingReviewTagName, true);
+		return tags.stream().findFirst().orElse(null);
+	}
 }

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

@@ -12,7 +12,6 @@
 import org.jetbrains.annotations.NotNull;
 import org.springframework.dao.DataAccessException;
 
-import javax.annotation.Nonnull;
 import java.time.Instant;
 
 /**
@@ -49,8 +48,8 @@ public void sendAccountIncrementedNotification() {
 		notificationService.withUser(user).sendDirectMessage(c -> c.sendMessageEmbeds(buildAccountIncrementEmbed(account.getPoints())));
 	}
 
-	public void sendSubmissionDeclinedEmbed(@Nonnull String reason) {
-		notificationService.withUser(user).sendDirectMessage(c -> c.sendMessageEmbeds(buildSubmissionDeclinedEmbed(reason)));
+	public void sendSubmissionDeclinedEmbed() {
+		notificationService.withUser(user).sendDirectMessage(c -> c.sendMessageEmbeds(buildSubmissionDeclinedEmbed()));
 	}
 
 	private @NotNull EmbedBuilder buildQOTWNotificationEmbed() {
@@ -81,16 +80,14 @@ public void sendSubmissionDeclinedEmbed(@Nonnull String reason) {
 				.build();
 	}
 
-	private @NotNull MessageEmbed buildSubmissionDeclinedEmbed(String reasons) {
+	private @NotNull MessageEmbed buildSubmissionDeclinedEmbed() {
 		return this.buildQOTWNotificationEmbed()
 				.setColor(Responses.Type.ERROR.getColor())
 				.setDescription(String.format("""
 								Hey %s,
-								Your QOTW-Submission was **declined** for the following reasons:
-								**`%s`**
-
+								Your QOTW-Submission was **declined**.
 								However, you can try your luck again next week!""",
-						user.getAsMention(), reasons))
+						user.getAsMention()))
 				.build();
 	}
 }

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

@@ -8,10 +8,10 @@
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.MessageEmbed;
 import net.dv8tion.jda.api.entities.MessageHistory;
-import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel;
 import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
 import net.dv8tion.jda.api.interactions.components.ActionRow;
 import net.dv8tion.jda.api.interactions.components.buttons.Button;
+import net.dv8tion.jda.api.requests.restaction.ForumPostAction;
 import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
 import net.dv8tion.jda.api.utils.messages.MessageCreateData;
 import net.javadiscord.javabot.data.config.BotConfig;
@@ -37,7 +37,7 @@
 @Service
 @RequiredArgsConstructor
 public class QOTWCloseSubmissionsJob {
-	private static final String SUBMISSION_PENDING = "\uD83D\uDD52";
+	private static final String SUBMISSION_PENDING = "\uD83D\uDD52 ";
 
 	private final JDA jda;
 	private final NotificationService notificationService;
@@ -65,11 +65,11 @@ public void execute() throws SQLException {
 			questionMessage.editMessageComponents(ActionRow.of(Button.secondary("qotw-submission:closed", "Submissions closed").asDisabled())).queue();
 			notificationService.withGuild(guild)
 					.sendToModerationLog(log ->
-							log.sendMessageFormat("%s%nIt's review time! There are %s threads to review:\n%s",
+							log.sendMessageFormat("%s%nIt's review time! There are **%s** threads to review:%n%n%s",
 									qotwConfig.getQOTWReviewRole().getAsMention(),
 									qotwConfig.getSubmissionChannel().getThreadChannels().size(),
 									qotwConfig.getSubmissionChannel().getThreadChannels().stream()
-											.map(ThreadChannel::getAsMention)
+											.map(t -> "> %s (%d message(s))".formatted(t.getAsMention(), t.getMessageCount() - 2)) // NOTE: Subtract 2 messages which are send by the bot
 											.collect(Collectors.joining("\n")))
 					);
 			qotwConfig.getSubmissionChannel().getThreadChannels().forEach(t ->
@@ -82,11 +82,14 @@ public void execute() throws SQLException {
 					QOTWQuestion question = questionOptional.get();
 					try (MessageCreateData data = new MessageCreateBuilder()
 							.setEmbeds(buildQuestionEmbed(question)).build()) {
-							qotwConfig.getSubmissionsForumChannel()
-									.createForumPost(String.format("#%s — %s", question.getQuestionNumber(), question.getText()), data)
-									.queue(f -> f.getThreadChannel().getManager().setPinned(true).queue());
+						ForumPostAction action = qotwConfig.getSubmissionsForumChannel()
+								.createForumPost(String.format("Week %s — %s", question.getQuestionNumber(), question.getText().replace("*", "")), data);
+						if (qotwConfig.getSubmissionsForumOngoingReviewTag() != null) {
+							action.setTags(qotwConfig.getSubmissionsForumOngoingReviewTag());
 						}
+						action.queue(f -> f.getThreadChannel().getManager().setPinned(true).queue());
 					}
+				}
 			});
 		}
 	}

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

@@ -37,18 +37,21 @@ public class QOTWUserReminderJob {
 	/**
 	 * Checks that there's a question in the QOTW queue ready for posting soon.
 	 */
-	@Scheduled(cron = "* 0 16 * * 5")//Friday 16:00
+	@Scheduled(cron = "0 0 16 * * 5")//Friday 16:00
 	public void execute() {
 		for (Guild guild : jda.getGuilds()) {
 			QOTWConfig config = botConfig.get(guild).getQotwConfig();
 			List<QOTWSubmission> submissions = new SubmissionManager(config, pointsService, questionQueueRepository, notificationService, asyncPool).getActiveSubmissions();
 			for (QOTWSubmission submission : submissions) {
-				UserPreference preference = userPreferenceService.getOrCreate(submission.getAuthor().getIdLong(), Preference.QOTW_REMINDER);
-				if (Boolean.parseBoolean(preference.getState()) && submission.getThread().getMessageCount() <= 1) {
-					submission.getThread()
-							.sendMessageFormat("**Question of the Week Reminder**\nHey %s! You still have some time left to submit your answer!", submission.getAuthor().getAsMention())
-							.queue();
-				}
+				submission.retrieveAuthor(author -> {
+					UserPreference preference = userPreferenceService.getOrCreate(author.getIdLong(), Preference.QOTW_REMINDER);
+					if (Boolean.parseBoolean(preference.getState()) && submission.getThread().getMessageCount() <= 2) {
+						submission.getThread()
+								.sendMessageFormat("**Question of the Week Reminder**\nHey %s! You still have some time left to submit your answer!", submission.getAuthor().getAsMention())
+								.queue();
+					}
+				});
+
 			}
 		}
 	}

src/main/java/net/javadiscord/javabot/systems/qotw/commands/questions_queue/AddQuestionSubcommand.java

@@ -42,18 +42,17 @@ public AddQuestionSubcommand(QuestionQueueRepository questionQueueRepository, Ex
 	}
 
 	@Override
-	protected InteractionCallbackAction<?> handleCommand(SlashCommandInteractionEvent event, long guildId) {
+	protected InteractionCallbackAction<?> handleCommand(@NotNull SlashCommandInteractionEvent event, long guildId) {
 		return event.replyModal(buildQuestionModal());
 	}
 
-	private Modal buildQuestionModal() {
+	private @NotNull Modal buildQuestionModal() {
 		TextInput priorityField = TextInput.create("priority", "Priority (Leave blank for default)", TextInputStyle.SHORT)
 				.setRequired(false)
 				.setValue("0")
 				.build();
-
 		TextInput questionField = TextInput.create("question", "Question Text", TextInputStyle.PARAGRAPH)
-				.setMaxLength(1024)
+				.setMaxLength(85)
 				.build();
 
 		return Modal.create("qotw-add-question", "Create QOTW Question")

src/main/java/net/javadiscord/javabot/systems/qotw/submissions/SubmissionManager.java

@@ -9,12 +9,10 @@
 import net.dv8tion.jda.api.entities.MessageType;
 import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel;
-import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
 import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
 import net.dv8tion.jda.api.interactions.InteractionHook;
 import net.dv8tion.jda.api.interactions.components.ActionRow;
 import net.dv8tion.jda.api.interactions.components.buttons.Button;
-import net.dv8tion.jda.api.requests.RestAction;
 import net.dv8tion.jda.api.requests.restaction.WebhookMessageCreateAction;
 import net.javadiscord.javabot.data.config.guild.QOTWConfig;
 import net.javadiscord.javabot.systems.notification.NotificationService;
@@ -30,7 +28,6 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.Instant;
-import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
@@ -39,7 +36,6 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
 import java.util.function.Consumer;
-import java.util.stream.Collectors;
 
 /**
  * Handles & manages QOTW Submissions by using Discords {@link ThreadChannel}s.
@@ -185,7 +181,8 @@ public void acceptSubmission(InteractionHook hook, @NotNull ThreadChannel thread
 					WebhookUtil.ensureWebhookExists(newestPost.getParentChannel().asForumChannel(), wh ->
 							WebhookUtil.mirrorMessageToWebhook(wh, message, message.getContentRaw(), newestPost.getIdLong()));
 				}
-			}).thenAccept(v -> newestPost.sendMessageEmbeds(buildAuthorEmbed(author)).queue());
+				newestPost.sendMessageEmbeds(buildAuthorEmbed(author, bestAnswer)).queue();
+			});
 		}
 		thread.getManager().setLocked(true).setArchived(true).queue();
 	}
@@ -199,8 +196,7 @@ public void acceptSubmission(InteractionHook hook, @NotNull ThreadChannel thread
 	 */
 	public void declineSubmission(InteractionHook hook, @NotNull ThreadChannel thread, User author) {
 		thread.getManager().setName(SUBMISSION_DECLINED + thread.getName().substring(1)).queue();
-		// TODO: fix reason
-		notificationService.withQOTW(thread.getGuild(), author).sendSubmissionDeclinedEmbed("EMPTY_REASON");
+		notificationService.withQOTW(thread.getGuild(), author).sendSubmissionDeclinedEmbed();
 		Responses.success(hook, "Submission Declined", "Successfully declined submission by " + author.getAsMention()).queue();
 		notificationService.withQOTW(thread.getGuild()).sendSubmissionActionNotification(author, getOrRetrieveSubmission(thread), SubmissionStatus.DECLINE);
 		thread.getManager().setLocked(true).setArchived(true).queue();
@@ -213,9 +209,10 @@ private CompletableFuture<List<Message>> getMessagesByUser(@NotNull ThreadChanne
 				.thenApply(list -> list.stream().filter(m -> m.getAuthor().equals(user)).toList());
 	}
 
-	private @NotNull MessageEmbed buildAuthorEmbed(User user) {
+	private @NotNull MessageEmbed buildAuthorEmbed(@NotNull User user, boolean bestAnswer) {
 		return new EmbedBuilder()
-				.setAuthor("Submission from " + user.getAsTag(), null, user.getAvatarUrl())
+				.setAuthor((bestAnswer ? "\u2B50 " : "") + "Submission from " + user.getAsTag(), null, user.getAvatarUrl())
+				.setColor(bestAnswer ? Responses.Type.WARN.getColor() : Responses.Type.DEFAULT.getColor())
 				.build();
 	}
 

src/main/java/net/javadiscord/javabot/systems/qotw/submissions/subcommands/QOTWReviewSubcommand.java

@@ -18,6 +18,8 @@
 import org.jetbrains.annotations.NotNull;
 import xyz.dynxsty.dih4jda.interactions.commands.application.SlashCommand;
 
+import java.util.Comparator;
+import java.util.Optional;
 import java.util.concurrent.ExecutorService;
 
 /**
@@ -82,6 +84,14 @@ public void execute(@NotNull SlashCommandInteractionEvent event) {
 			} else {
 				manager.declineSubmission(event.getHook(), submissionThread, author);
 			}
+			if (qotwConfig.getSubmissionChannel().getThreadChannels().size() - 1 <= 0) {
+				Optional<ThreadChannel> newestPostOptional = qotwConfig.getSubmissionsForumChannel().getThreadChannels()
+						.stream().max(Comparator.comparing(ThreadChannel::getTimeCreated));
+				newestPostOptional.ifPresent(p -> {
+					p.getManager().setAppliedTags().queue();
+					notificationService.withGuild(qotwConfig.getGuild()).sendToModerationLog(log -> log.sendMessageFormat("All submissions have been reviewed!"));
+				});
+			}
 		});
 	}
 }