Skip to content

fix QOTW sample answer race condition #501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 29, 2024
Merged

fix QOTW sample answer race condition #501

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 48 additions & 34 deletions src/main/java/net/discordjug/javabot/systems/qotw/jobs/QOTWCloseSubmissionsJob.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import net.discordjug.javabot.systems.qotw.model.QOTWSubmission;
import net.discordjug.javabot.systems.qotw.submissions.SubmissionManager;
import net.discordjug.javabot.systems.qotw.submissions.SubmissionStatus;
import net.discordjug.javabot.util.ExceptionLogger;
import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.JDA;
import net.dv8tion.jda.api.Permission;
Expand Down Expand Up @@ -45,6 +46,7 @@
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutorService;

/**
Expand Down Expand Up @@ -81,46 +83,58 @@ public void execute() throws SQLException {
if (qotwConfig.getSubmissionChannel() == null || qotwConfig.getQuestionChannel() == null) continue;
Message questionMessage = getLatestQOTWMessage(qotwConfig.getQuestionChannel(), qotwConfig, jda);
questionMessage.editMessageComponents(ActionRow.of(Button.secondary("qotw-submission:closed", "Submissions closed").asDisabled())).queue();
logChannel
.sendMessageFormat("%s%nIt's review time! There are **%s** threads to review",
qotwConfig.getQOTWReviewRole().getAsMention(),
qotwConfig.getSubmissionChannel().getThreadChannels().size())
.flatMap(msg -> msg.createThreadChannel("QOTW review"))
.queue(thread -> {
for (ThreadChannel submission : qotwConfig.getSubmissionChannel().getThreadChannels()) {
submission.getManager().setName(SUBMISSION_PENDING + submission.getName()).queue();
// remove the author
final QOTWSubmission s = new QOTWSubmission(submission);
s.retrieveAuthor(author -> {
submission.removeThreadMember(author).queue();
if (author.getIdLong() == qotwConfig.getQotwSampleAnswerUserId()) {
SubmissionManager manager = new SubmissionManager(botConfig.get(guild).getQotwConfig(), pointsService, questionQueueRepository, notificationService, asyncPool);
manager.copySampleAnswerSubmission(submission, author);
} else {
thread
.sendMessage("%s by %s".formatted(submission.getAsMention(), author.getAsMention()))
.addActionRow(buildSubmissionSelectMenu(jda, submission.getIdLong()))
.queue();
}
});
for (Member member : guild.getMembersWithRoles(qotwConfig.getQOTWReviewRole())) {
thread.addThreadMember(member).queue();
if (qotwConfig.getSubmissionsForumChannel() == null) {
sendReviewInformation(guild, qotwConfig, logChannel);
} else {
CompletableFuture.runAsync(() -> {

MessageEmbed embed = questionMessage.getEmbeds().get(0);
Optional<QOTWQuestion> questionOptional = questionQueueRepository.findByQuestionNumber(getQuestionNumberFromEmbed(embed));
if (questionOptional.isPresent()) {
QOTWQuestion question = questionOptional.get();
try (MessageCreateData data = new MessageCreateBuilder()
.setEmbeds(buildQuestionEmbed(question)).build()) {
createPinnedAnswerForum(qotwConfig, question, data);
}
}
}, asyncPool).whenComplete((success, ex) -> {
if (ex != null) {
ExceptionLogger.capture(ex, getClass().getName());
}
sendReviewInformation(guild, qotwConfig, logChannel);
});
if (qotwConfig.getSubmissionsForumChannel() == null) continue;
asyncPool.execute(() -> {
MessageEmbed embed = questionMessage.getEmbeds().get(0);
Optional<QOTWQuestion> questionOptional = questionQueueRepository.findByQuestionNumber(getQuestionNumberFromEmbed(embed));
if (questionOptional.isPresent()) {
QOTWQuestion question = questionOptional.get();
try (MessageCreateData data = new MessageCreateBuilder()
.setEmbeds(buildQuestionEmbed(question)).build()) {
createPinnedAnswerForum(qotwConfig, question, data);
}
}
}

private void sendReviewInformation(Guild guild, QOTWConfig qotwConfig, TextChannel logChannel) {
logChannel
.sendMessageFormat("%s%nIt's review time! There are **%s** threads to review",
qotwConfig.getQOTWReviewRole().getAsMention(),
qotwConfig.getSubmissionChannel().getThreadChannels().size())
.flatMap(msg -> msg.createThreadChannel("QOTW review"))
.queue(thread -> {
for (ThreadChannel submission : qotwConfig.getSubmissionChannel().getThreadChannels()) {
submission.getManager().setName(SUBMISSION_PENDING + submission.getName()).queue();
// remove the author
final QOTWSubmission s = new QOTWSubmission(submission);
s.retrieveAuthor(author -> {
submission.removeThreadMember(author).queue();
if (author.getIdLong() == qotwConfig.getQotwSampleAnswerUserId()) {
SubmissionManager manager = new SubmissionManager(botConfig.get(guild).getQotwConfig(), pointsService, questionQueueRepository, notificationService, asyncPool);
manager.copySampleAnswerSubmission(submission, author);
} else {
thread
.sendMessage("%s by %s".formatted(submission.getAsMention(), author.getAsMention()))
.addActionRow(buildSubmissionSelectMenu(jda, submission.getIdLong()))
.queue();
}
});
for (Member member : guild.getMembersWithRoles(qotwConfig.getQOTWReviewRole())) {
thread.addThreadMember(member).queue();
}
}
});
}
}

private void createPinnedAnswerForum(QOTWConfig qotwConfig, QOTWQuestion question, MessageCreateData data) {
Expand Down