Merge pull request #388 from danthe1st/ensure-qotw-review

ensure QOTW review

Author: MoonTM-GIT

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

@@ -5,6 +5,7 @@
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.MessageEmbed;
 import net.dv8tion.jda.api.entities.MessageHistory;
@@ -87,6 +88,9 @@ public void execute() throws SQLException {
 								.addActionRow(buildSubmissionSelectMenu(jda, submission.getIdLong()))
 								.queue();
 						});
+						for (Member member : guild.getMembersWithRoles(qotwConfig.getQOTWReviewRole())) {
+							thread.addThreadMember(member).queue();
+						}
 					}
 				});
 			if (qotwConfig.getSubmissionsForumChannel() == null) continue;

src/main/java/net/javadiscord/javabot/systems/qotw/jobs/QOTWReviewReminderJob.java

@@ -0,0 +1,48 @@
+package net.javadiscord.javabot.systems.qotw.jobs;
+
+import lombok.RequiredArgsConstructor;
+import net.dv8tion.jda.api.JDA;
+import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.entities.Message;
+import net.javadiscord.javabot.data.config.BotConfig;
+import net.javadiscord.javabot.data.config.GuildConfig;
+import net.javadiscord.javabot.systems.notification.NotificationService;
+
+import java.util.EnumSet;
+
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+
+/**
+ * Job which reminds reviewers to review QOTW if this has not been done already.
+ */
+@Service
+@RequiredArgsConstructor
+public class QOTWReviewReminderJob {
+	private final JDA jda;
+	private final NotificationService notificationService;
+	private final BotConfig botConfig;
+
+	/**
+	 * Reminds reviewers to review QOTW if this has not been done already.
+	 */
+	@Scheduled(cron = "0 0 7 * * 1") // Monday, 07:00  UTC
+	public void execute() {
+		for (Guild guild : jda.getGuilds()) {
+			GuildConfig guildConfig = botConfig.get(guild);
+			if (guildConfig.getModerationConfig().getLogChannel() == null || guildConfig.getQotwConfig().getSubmissionChannel()==null) {
+				continue;
+			}
+			if (!guildConfig.getQotwConfig().getSubmissionChannel().getThreadChannels().isEmpty()) {
+				notificationService
+					.withGuild(guild)
+					.sendToModerationLog(channel ->
+						channel
+							.sendMessageFormat("%s\n**Reminder**\nThe QOTW has not been reviewed yet.",
+									guildConfig.getQotwConfig().getQOTWReviewRole().getAsMention())
+							.setAllowedMentions(EnumSet.of(Message.MentionType.ROLE))
+					);
+			}
+		}
+	}
+}

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

@@ -148,6 +148,10 @@ public void handleSelectReview(StringSelectInteractionEvent event, String thread
 							}
 						});
 				});
+				MessageChannelUnion reviewChannel = event.getChannel();
+				if (reviewChannel.getType().isThread()) {
+					reviewChannel.asThreadChannel().getManager().setArchived(true).queue();
+				}
 			}
 			event.getHook().editOriginalComponents(ActionRow.of(Button.secondary("dummy", "%s by %s".formatted(status.getVerb(), event.getUser().getAsTag())).asDisabled())).queue();
 		});