Merge pull request #404 from danthe1st/fix-qotw-reviewedby-log

make QOTW review log show reviewer in reviewer field

Author: MoonTM-GIT

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

@@ -129,9 +129,9 @@ public void handleSelectReview(StringSelectInteractionEvent event, String thread
 		final QOTWSubmission submission = new QOTWSubmission(submissionThread);
 		submission.retrieveAuthor(author -> {
 			switch (status) {
-				case ACCEPT_BEST -> acceptSubmission(submissionThread, author, true);
-				case ACCEPT -> acceptSubmission(submissionThread, author, false);
-				default -> declineSubmission(submissionThread, author, status);
+				case ACCEPT_BEST -> acceptSubmission(submissionThread, author, event.getMember(), true);
+				case ACCEPT -> acceptSubmission(submissionThread, author, event.getMember(), false);
+				default -> declineSubmission(submissionThread, author, event.getMember(), status);
 			}
 			if (config.getSubmissionChannel().getThreadChannels().size() <= 1) {
 				Optional<ThreadChannel> newestPostOptional = config.getSubmissionsForumChannel().getThreadChannels()
@@ -185,17 +185,18 @@ private boolean canCreateSubmissions(Member member) {
 	 *
 	 * @param thread     The submission's {@link ThreadChannel}.
 	 * @param author     The submissions' author.
+	 * @param reviewedBy The reviewer.
 	 * @param bestAnswer Whether the submission is among the best answers for this week.
 	 */
-	public void acceptSubmission(@NotNull ThreadChannel thread, @NotNull User author, boolean bestAnswer) {
+	public void acceptSubmission(@NotNull ThreadChannel thread, @NotNull User author, Member reviewedBy, boolean bestAnswer) {
 		thread.getManager().setName(SUBMISSION_ACCEPTED + thread.getName().substring(1)).queue();
 		pointsService.increment(author.getIdLong());
 		notificationService.withQOTW(thread.getGuild(), author).sendAccountIncrementedNotification();
 		if (bestAnswer) {
 			pointsService.increment(author.getIdLong());
 			notificationService.withQOTW(thread.getGuild(), author).sendBestAnswerNotification();
 		}
-		notificationService.withQOTW(thread.getGuild()).sendSubmissionActionNotification(author, new QOTWSubmission(thread), bestAnswer ? SubmissionStatus.ACCEPT_BEST : SubmissionStatus.ACCEPT);
+		notificationService.withQOTW(thread.getGuild()).sendSubmissionActionNotification(reviewedBy.getUser(), new QOTWSubmission(thread), bestAnswer ? SubmissionStatus.ACCEPT_BEST : SubmissionStatus.ACCEPT);
 		Optional<ThreadChannel> newestPostOptional = config.getSubmissionsForumChannel().getThreadChannels()
 				.stream().max(Comparator.comparing(ThreadChannel::getTimeCreated));
 		if (newestPostOptional.isPresent()) {
@@ -225,12 +226,13 @@ public void acceptSubmission(@NotNull ThreadChannel thread, @NotNull User author
 	 *
 	 * @param thread The submission's {@link ThreadChannel}.
 	 * @param author The submissions' author.
+	 * @param reviewedBy The reviewer
 	 * @param status The {@link SubmissionStatus}.
 	 */
-	public void declineSubmission(@NotNull ThreadChannel thread, User author, SubmissionStatus status) {
+	public void declineSubmission(@NotNull ThreadChannel thread, User author, Member reviewedBy, SubmissionStatus status) {
 		thread.getManager().setName(SUBMISSION_DECLINED + thread.getName().substring(1)).queue();
 		notificationService.withQOTW(thread.getGuild(), author).sendSubmissionDeclinedEmbed(status);
-		notificationService.withQOTW(thread.getGuild()).sendSubmissionActionNotification(author, new QOTWSubmission(thread), status);
+		notificationService.withQOTW(thread.getGuild()).sendSubmissionActionNotification(reviewedBy.getUser(), new QOTWSubmission(thread), status);
 		thread.getManager().setLocked(true).setArchived(true).queue();
 	}
 

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

@@ -81,12 +81,12 @@ public void execute(@NotNull SlashCommandInteractionEvent event) {
 		submission.retrieveAuthor(author -> {
 			SubmissionManager manager = new SubmissionManager(qotwConfig, pointsService, questionQueueRepository, notificationService, asyncPool);
 			if (state.contains("ACCEPT")) {
-				manager.acceptSubmission(submissionThread, author, state.equals("ACCEPT_BEST"));
+				manager.acceptSubmission(submissionThread, author, event.getMember(), state.equals("ACCEPT_BEST"));
 				Responses.success(event.getHook(), "Submission Accepted", "Successfully accepted submission by " + author.getAsMention()).queue();
 			} else {
 				// just do a "wrong answer" for now. this command is going to be removed
 				// in the near future anyway
-				manager.declineSubmission(submissionThread, author, SubmissionStatus.DECLINE_WRONG_ANSWER);
+				manager.declineSubmission(submissionThread, author, event.getMember(), SubmissionStatus.DECLINE_WRONG_ANSWER);
 				Responses.success(event.getHook(), "Submission Declined", "Successfully declined submission by " + author.getAsMention()).queue();
 			}
 			if (qotwConfig.getSubmissionChannel().getThreadChannels().size() <= 1) {