The bot now just removes permissions instead of removing the thread owner from the submission thread

Author: jasonlessenich

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

@@ -2,6 +2,7 @@
 
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.JDA;
+import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.MessageChannel;
 import net.dv8tion.jda.api.interactions.components.ActionRow;
@@ -15,6 +16,7 @@
 import org.quartz.JobExecutionException;
 
 import java.sql.SQLException;
+import java.util.Collections;
 
 /**
  * Job which disables the Submission button.
@@ -27,6 +29,9 @@ protected void execute(JobExecutionContext context, JDA jda) throws JobExecution
 			// Disable 'Submit your Answer' button on latest QOTW
 			var config = Bot.config.get(guild);
 			var qotwConfig = config.getQotw();
+			qotwConfig.getSubmissionChannel().getManager()
+					.putRolePermissionOverride(guild.getIdLong(), Collections.emptySet(), Collections.singleton(Permission.MESSAGE_SEND_IN_THREADS))
+					.queue();
 			if (config.getModeration().getLogChannel() == null) continue;
 			if (qotwConfig.getSubmissionChannel() == null || qotwConfig.getQuestionChannel() == null) continue;
 			var message = getLatestQOTWMessage(qotwConfig.getQuestionChannel(), qotwConfig, jda);

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

@@ -3,6 +3,7 @@
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.EmbedBuilder;
 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.MessageEmbed;
 import net.dv8tion.jda.api.entities.NewsChannel;
@@ -20,6 +21,7 @@
 
 import java.sql.SQLException;
 import java.time.OffsetDateTime;
+import java.util.Collections;
 
 /**
  * Job which posts a new question to the QOTW channel.
@@ -44,6 +46,9 @@ protected void execute(JobExecutionContext context, JDA jda) throws JobExecution
 					QOTWQuestion question = nextQuestion.get();
 					QOTWConfig qotw = config.getQotw();
 					qotw.getSubmissionChannel().getThreadChannels().forEach(thread -> thread.getManager().setArchived(true).queue());
+					qotw.getSubmissionChannel().getManager()
+							.putRolePermissionOverride(guild.getIdLong(), Collections.singleton(Permission.MESSAGE_SEND_IN_THREADS), Collections.emptySet())
+							.queue();
 					if (question.getQuestionNumber() == null) {
 						question.setQuestionNumber(repo.getNextQuestionNumber());
 					}

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

@@ -90,18 +90,7 @@ public void sendControls() {
 						Button.danger("qotw-submission:controls:decline", "Decline"),
 						Button.secondary("qotw-submission:controls:delete", "🗑️")
 				).queue();
-		this.removeThreadOwner(thread.getJDA(), thread);
 		log.info("Sent Submission Controls to thread {}", thread.getName());
-
-	}
-
-	private void removeThreadOwner(JDA jda, ThreadChannel thread) {
-		DbHelper.doDaoAction(QOTWSubmissionRepository::new, dao -> {
-			Optional<QOTWSubmission> submissionOptional = dao.getSubmissionByThreadId(thread.getIdLong());
-			submissionOptional.ifPresent(submission -> jda.retrieveUserById(submission.getAuthorId()).queue(
-					author -> thread.removeThreadMember(author).queue()
-			));
-		});
 	}
 
 	/**