Resolved remaining errors

Author: jasonlessenich

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

@@ -3,6 +3,7 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import net.dv8tion.jda.api.entities.Role;
+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.javadiscord.javabot.data.config.GuildConfigItem;
@@ -15,6 +16,7 @@
 public class QOTWConfig extends GuildConfigItem {
 	private long questionChannelId;
 	private long submissionChannelId;
+	private long submissionsForumChannelId;
 	private long questionRoleId;
 	private long qotwReviewRoleId;
 
@@ -26,6 +28,10 @@ public TextChannel getSubmissionChannel() {
 		return this.getGuild().getTextChannelById(this.submissionChannelId);
 	}
 
+	public ForumChannel getSubmissionsForumChannel() {
+		return this.getGuild().getForumChannelById(this.submissionsForumChannelId);
+	}
+
 	public Role getQOTWRole() {
 		return this.getGuild().getRoleById(this.questionRoleId);
 	}

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

@@ -12,7 +12,6 @@
 import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Service;
 
-import java.util.concurrent.ExecutorService;
 import java.util.function.Function;
 
 /**
@@ -23,7 +22,6 @@
 public class NotificationService {
 	private final QOTWPointsService qotwPointsService;
 	private final BotConfig botConfig;
-	private final ExecutorService asyncPool;
 
 	@Contract("_ -> new")
 	public @NotNull GuildNotificationService withGuild(Guild guild) {
@@ -40,7 +38,7 @@ public class NotificationService {
 	}
 
 	public @NotNull QOTWNotificationService withQOTW(Guild guild, User user) {
-		return new QOTWNotificationService(this, qotwPointsService, user, guild, botConfig.getSystems(), asyncPool);
+		return new QOTWNotificationService(this, qotwPointsService, user, guild, botConfig.getSystems());
 	}
 
 	/**

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

@@ -8,6 +8,7 @@
 import net.dv8tion.jda.api.entities.MessageEmbed;
 import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel;
+import net.javadiscord.javabot.systems.qotw.model.QOTWSubmission;
 import net.javadiscord.javabot.systems.qotw.submissions.SubmissionStatus;
 
 import org.jetbrains.annotations.NotNull;
@@ -30,13 +31,14 @@ public class QOTWGuildNotificationService {
 	 * Sends the executed action, performed on a QOTW submission thread, to the {@link Guild}s log channel.
 	 *
 	 * @param reviewedBy       The user which reviewed the QOTW submission thread.
-	 * @param author           The submissions' author.
-	 * @param submissionThread The submission thread itself.
+	 * @param submission	   The {@link QOTWSubmission}.
 	 * @param status           The {@link SubmissionStatus}.
 	 */
-	public void sendSubmissionActionNotification(User reviewedBy, User author, ThreadChannel submissionThread, SubmissionStatus status) {
-		notificationService.withGuild(guild).sendToModerationLog(c -> c.sendMessageEmbeds(buildSubmissionActionEmbed(author, submissionThread, reviewedBy, status)));
-		log.info("{} {} {}'s QOTW Submission", reviewedBy.getAsTag(), status.name().toLowerCase(), author.getAsTag());
+	public void sendSubmissionActionNotification(User reviewedBy, QOTWSubmission submission, SubmissionStatus status) {
+		submission.retrieveAuthor(author -> {
+			notificationService.withGuild(guild).sendToModerationLog(c -> c.sendMessageEmbeds(buildSubmissionActionEmbed(author, submission.getThread(), reviewedBy, status)));
+			log.info("{} {} {}'s QOTW Submission", reviewedBy.getAsTag(), status.name().toLowerCase(), author.getAsTag());
+		});
 	}
 
 	private @NotNull MessageEmbed buildSubmissionActionEmbed(@NotNull User author, ThreadChannel thread, @NotNull User reviewedBy, @NotNull SubmissionStatus status) {

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

@@ -27,8 +27,8 @@ public final class QOTWNotificationService extends QOTWGuildNotificationService
 	private final QOTWAccount account;
 	private final SystemsConfig systemsConfig;
 
-	QOTWNotificationService(NotificationService notificationService, QOTWPointsService pointsService,@NotNull User user, Guild guild, SystemsConfig systemsConfig, ExecutorService asyncPool) {
-		super(notificationService, guild, asyncPool);
+	QOTWNotificationService(NotificationService notificationService, QOTWPointsService pointsService,@NotNull User user, Guild guild, SystemsConfig systemsConfig) {
+		super(notificationService, guild);
 		this.user = user;
 		this.guild = guild;
 		QOTWAccount account;

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

@@ -3,10 +3,10 @@
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.Guild;
 import net.javadiscord.javabot.data.config.BotConfig;
-import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import net.javadiscord.javabot.data.config.guild.QOTWConfig;
-import net.javadiscord.javabot.data.h2db.DbHelper;
+import net.javadiscord.javabot.systems.notification.NotificationService;
 import net.javadiscord.javabot.systems.qotw.dao.QuestionQueueRepository;
+import net.javadiscord.javabot.systems.qotw.model.QOTWSubmission;
 import net.javadiscord.javabot.systems.qotw.submissions.SubmissionManager;
 import net.javadiscord.javabot.systems.user_preferences.UserPreferenceService;
 import net.javadiscord.javabot.systems.user_preferences.model.Preference;
@@ -29,8 +29,8 @@ public class QOTWUserReminderJob {
 	private final JDA jda;
 	private final UserPreferenceService userPreferenceService;
 	private final BotConfig botConfig;
-	private final DbHelper dbHelper;
-	private final QOTWSubmissionRepository qotwSubmissionRepository;
+	private final QOTWPointsService pointsService;
+	private final NotificationService notificationService;
 	private final QuestionQueueRepository questionQueueRepository;
 	private final ExecutorService asyncPool;
 
@@ -41,17 +41,13 @@ public class QOTWUserReminderJob {
 	public void execute() {
 		for (Guild guild : jda.getGuilds()) {
 			QOTWConfig config = botConfig.get(guild).getQotwConfig();
-			List<QOTWSubmission> submissions = new SubmissionManager(config, dbHelper, qotwSubmissionRepository, questionQueueRepository, asyncPool).getActiveSubmissionThreads(guild.getIdLong());
+			List<QOTWSubmission> submissions = new SubmissionManager(config, pointsService, questionQueueRepository, notificationService, asyncPool).getActiveSubmissions();
 			for (QOTWSubmission submission : submissions) {
-				UserPreference preference = userPreferenceService.getOrCreate(submission.getAuthorId(), Preference.QOTW_REMINDER);
-				if (Boolean.parseBoolean(preference.getState())) {
-					TextChannel channel = config.getSubmissionChannel();
-					channel.getThreadChannels().stream().filter(t -> t.getIdLong() == submission.getThreadId()).forEach(t -> {
-						if (t.getMessageCount() <= 1) {
-							t.sendMessageFormat("**Question of the Week Reminder**\nHey <@%s>! You still have some time left to submit your answer!", submission.getAuthorId())
-									.queue();
-						}
-					});
+				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();
 				}
 			}
 		}