Further Improve QOTW Submissions (#272)

Closes #271

This PR attempts to further improve the QOTW functionality, by only adding QOTW Reviewers once the Review Phase has started. This also fixes an issue regarding QOTW Notifications, which would always show the "Reasons" field, even if they were empty.

Author: jasonlessenich

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

@@ -145,7 +145,7 @@ private MessageEmbed buildSubmissionActionEmbed(User author, ThreadChannel threa
 		if (thread != null && status != SubmissionStatus.DELETED) {
 			builder.addField("Thread", thread.getAsMention(), true);
 		}
-		if (reasons != null) {
+		if (reasons != null && reasons.length > 0) {
 			builder.addField("Reason(s)", String.join(", ", reasons), true);
 		}
 		return builder.build();

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

@@ -27,9 +27,9 @@
  */
 @Slf4j
 public class SubmissionControlsManager {
-	private final String SUBMISSION_ACCEPTED = "\u2705";
-	private final String SUBMISSION_DECLINED = "\u274C";
-	private final String SUBMISSION_PENDING = "\uD83D\uDD52";
+	private static final String SUBMISSION_ACCEPTED = "\u2705";
+	private static final String SUBMISSION_DECLINED = "\u274C";
+	private static final String SUBMISSION_PENDING = "\uD83D\uDD52";
 
 	private final Guild guild;
 	private final QOTWConfig config;
@@ -77,6 +77,13 @@ public SubmissionControlsManager(Guild guild, ThreadChannel channel) {
 	public void sendControls() {
 		ThreadChannel thread = this.guild.getThreadChannelById(this.submission.getThreadId());
 		if (thread == null) return;
+		// The Thread's starting message
+		if (thread.getMessageCount() <= 1) {
+			new QOTWNotificationService(guild)
+					.sendSubmissionActionNotification(guild.getJDA().getSelfUser(), thread, SubmissionStatus.DELETED, "Empty Submission");
+			thread.delete().queue();
+			return;
+		}
 		thread.getManager().setName(String.format("%s %s", SUBMISSION_PENDING, thread.getName())).queue();
 		thread.sendMessage(config.getQOTWReviewRole().getAsMention())
 				.setEmbeds(new EmbedBuilder()

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

@@ -64,7 +64,7 @@ public WebhookMessageAction<?> handleSubmission(ButtonInteractionEvent event, in
 						DbHelper.doDaoAction(QuestionQueueRepository::new, dao -> {
 							var questionOptional = dao.findByQuestionNumber(questionNumber);
 							if (questionOptional.isPresent()) {
-								thread.sendMessage(String.format("%s %s", config.getQOTWReviewRole(), member.getAsMention()))
+								thread.sendMessage(member.getAsMention())
 										.setEmbeds(buildSubmissionThreadEmbed(event.getUser(), questionOptional.get(), config))
 										.setActionRows(ActionRow.of(Button.danger("qotw-submission:delete", "Delete Submission")))
 										.queue();

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

@@ -55,11 +55,11 @@ public InteractionCallbackAction<InteractionHook> handleSlashCommandInteraction(
 			}
 			QOTWSubmission submission = submissionOptional.get();
 			if (submission.getStatus() != SubmissionStatus.ACCEPTED) {
-				Responses.error(event.getHook(), String.format("Submission must be reviewed and accepted!", threadId)).queue();
+				Responses.error(event.getHook(), "The Submission must be reviewed and accepted!").queue();
 				return;
 			}
 			if (config.getQotw().getQuestionChannel().getThreadChannels().stream().anyMatch(thread -> thread.getName().equals(submissionThread.getName()))) {
-				Responses.error(event.getHook(), String.format("Submission was already marked as the best answer.", threadId)).queue();
+				Responses.error(event.getHook(), "The Submission was already marked as one of the best answers.").queue();
 				return;
 			}
 			List<Message> messages = this.getSubmissionContent(submissionThread);
@@ -98,7 +98,7 @@ private MessageEmbed buildBestAnswerEmbed(Member member) {
 				.setAuthor(member.getUser().getAsTag(), null, member.getEffectiveAvatarUrl())
 				.setTitle("Best Answer")
 				.setColor(Bot.config.get(member.getGuild()).getSlashCommand().getDefaultColor())
-				.setDescription(String.format("%s's submission was marked as the **best answer.**", member.getAsMention()))
+				.setDescription(String.format("%s's submission was marked as one of the **best answers** (+1 QOTW-Point)", member.getAsMention()))
 				.build();
 	}