Improved the private thread's starter message and fixed thread deletion

jasonlessenich · jasonlessenich · commit a4ceee9fc2fc · 2022-02-14T17:41:30.000+01:00
diff --git a/src/main/java/net/javadiscord/javabot/systems/qotw/dao/QuestionQueueRepository.java b/src/main/java/net/javadiscord/javabot/systems/qotw/dao/QuestionQueueRepository.java
@@ -39,6 +39,24 @@ public void save(QOTWQuestion question) throws SQLException {
 		stmt.close();
 	}
 
+	/**
+	 * Gets a {@link QOTWQuestion} by its Question Number.
+	 *
+	 * @param questionNumber The question's number.
+	 * @return The question as an {@link Optional}
+	 * @throws SQLException If an error occurs.
+	 */
+	public Optional<QOTWQuestion> findByQuestionNumber(int questionNumber) throws SQLException {
+		QOTWQuestion question = null;
+		PreparedStatement s = con.prepareStatement("SELECT * FROM qotw_question WHERE question_number = ?");
+		s.setInt(1, questionNumber);
+		var rs = s.executeQuery();
+		if (rs.next()) {
+			question = read(rs);
+		}
+		return Optional.ofNullable(question);
+	}
+
 	/**
 	 * Gets the next Question's week number.
 	 *
diff --git a/src/main/java/net/javadiscord/javabot/systems/qotw/submissions/SubmissionControlsManager.java b/src/main/java/net/javadiscord/javabot/systems/qotw/submissions/SubmissionControlsManager.java
@@ -12,6 +12,7 @@
 import net.javadiscord.javabot.Bot;
 import net.javadiscord.javabot.command.Responses;
 import net.javadiscord.javabot.data.config.guild.QOTWConfig;
+import net.javadiscord.javabot.data.h2db.DbHelper;
 import net.javadiscord.javabot.systems.qotw.subcommands.qotw_points.IncrementSubcommand;
 import net.javadiscord.javabot.systems.qotw.submissions.dao.QOTWSubmissionRepository;
 import net.javadiscord.javabot.systems.qotw.submissions.model.QOTWSubmission;
@@ -178,6 +179,7 @@ private void deleteSubmission(ButtonInteractionEvent event, ThreadChannel thread
 		log.info("{} deleted submission thread {}", event.getUser().getAsTag(), thread.getName());
 		GuildUtils.getLogChannel(event.getGuild()).sendMessageFormat("%s deleted submission thread `%s`", event.getUser().getAsTag(), thread.getName()).queue();
 		this.disableControls(String.format("Deleted by %s", event.getUser().getAsTag()), event.getMessage());
+		DbHelper.doDaoAction(QOTWSubmissionRepository::new, dao -> dao.removeSubmission(thread.getIdLong()));
 		event.getHook().sendMessage("Submission will be deleted in 10 seconds...").setEphemeral(true);
 	}
 
diff --git a/src/main/java/net/javadiscord/javabot/systems/qotw/submissions/SubmissionManager.java b/src/main/java/net/javadiscord/javabot/systems/qotw/submissions/SubmissionManager.java
@@ -14,6 +14,9 @@
 import net.javadiscord.javabot.Bot;
 import net.javadiscord.javabot.command.Responses;
 import net.javadiscord.javabot.data.config.guild.QOTWConfig;
+import net.javadiscord.javabot.data.h2db.DbHelper;
+import net.javadiscord.javabot.systems.qotw.dao.QuestionQueueRepository;
+import net.javadiscord.javabot.systems.qotw.model.QOTWQuestion;
 import net.javadiscord.javabot.systems.qotw.submissions.dao.QOTWSubmissionRepository;
 import net.javadiscord.javabot.systems.qotw.submissions.model.QOTWSubmission;
 
@@ -47,6 +50,7 @@ public WebhookMessageAction<?> handleSubmission(ButtonInteractionEvent event, in
 		config.getSubmissionChannel().createThreadChannel(
 				String.format(THREAD_NAME, questionNumber, member.getEffectiveName()), true).queue(
 				thread -> {
+					thread.getManager().setInvitable(false).setAutoArchiveDuration(ThreadChannel.AutoArchiveDuration.TIME_1_WEEK).queue();
 					try (var con = Bot.dataSource.getConnection()) {
 						var repo = new QOTWSubmissionRepository(con);
 						QOTWSubmission submission = new QOTWSubmission();
@@ -55,12 +59,18 @@ public WebhookMessageAction<?> handleSubmission(ButtonInteractionEvent event, in
 						submission.setGuildId(thread.getGuild().getIdLong());
 						submission.setAuthorId(member.getIdLong());
 						repo.insert(submission);
-
-						thread.getManager().setInvitable(false).setAutoArchiveDuration(ThreadChannel.AutoArchiveDuration.TIME_1_WEEK).queue();
-						thread.sendMessage(String.format("%s %s", config.getQOTWReviewRole(), member.getAsMention()))
-								.setEmbeds(buildSubmissionThreadEmbed(event.getUser(), questionNumber, config))
-								.setActionRows(ActionRow.of(Button.danger("qotw-submission:delete", "Delete Submission")))
-								.queue();
+						DbHelper.doDaoAction(QuestionQueueRepository::new, dao -> {
+							var questionOptional = dao.findByQuestionNumber(questionNumber);
+							if (questionOptional.isPresent()) {
+								thread.sendMessage(String.format("%s %s", config.getQOTWReviewRole(), member.getAsMention()))
+										.setEmbeds(buildSubmissionThreadEmbed(event.getUser(), questionOptional.get(), config))
+										.setActionRows(ActionRow.of(Button.danger("qotw-submission:delete", "Delete Submission")))
+										.queue();
+							} else {
+								thread.sendMessage("Could not retrieve current QOTW Question. Please contact an Administrator if you think that this is a mistake.")
+										.queue();
+							}
+						});
 					} catch (SQLException e) {
 						e.printStackTrace();
 					}
@@ -118,15 +128,24 @@ public boolean hasActiveSubmissionThreads(long authorId) {
 		}
 	}
 
-	private MessageEmbed buildSubmissionThreadEmbed(User createdBy, long questionNumber, QOTWConfig config) {
+	private MessageEmbed buildSubmissionThreadEmbed(User createdBy, QOTWQuestion question, QOTWConfig config) {
 		return new EmbedBuilder()
 				.setColor(Bot.config.get(config.getGuild()).getSlashCommand().getDefaultColor())
 				.setAuthor(createdBy.getAsTag(), null, createdBy.getEffectiveAvatarUrl())
-				.setTitle(String.format("Question of the Week #%s", questionNumber))
-				.setDescription(String.format("Hey, %s! Please submit your answer into this thread." +
-								"\nYou can even send multiple messages, if you want to. This whole thread counts as your submission." +
-								"\nThe %s will review your submission once a new question appears.",
-						createdBy.getAsMention(), config.getQOTWReviewRole().getAsMention()))
+				.setTitle(String.format("Question of the Week #%s", question.getQuestionNumber()))
+				.setDescription(String.format("""
+								%s
+								                        
+								Hey, %s! Please submit your answer into this private thread.
+								The %s will review your submission once a new question appears.""",
+						question.getText(), createdBy.getAsMention(), config.getQOTWReviewRole().getAsMention()))
+				.addField("Note",
+						"""
+								To maximize your chances of getting this weeks QOTW Point make sure to:
+								&mdash; Provide a **Code example** (if possible)
+								&mdash; Try to answer the question as detailed as possible.
+								
+								Staff usually wont reply in here.""", false)
 				.setTimestamp(Instant.now())
 				.build();
 	}
