Skip to content

Commit 9c504a1

Browse files
Made some late-requested changes
1 parent a72c796 commit 9c504a1

File tree

1 file changed

+27
-33
lines changed

1 file changed

+27
-33
lines changed

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

Lines changed: 27 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import net.javadiscord.javabot.util.Responses;
2626
import net.javadiscord.javabot.util.WebhookUtil;
2727
import org.jetbrains.annotations.NotNull;
28-
import org.springframework.dao.DataAccessException;
2928
import org.springframework.transaction.annotation.Transactional;
3029

3130
import java.time.Instant;
@@ -73,25 +72,21 @@ public WebhookMessageCreateAction<?> handleSubmission(@NotNull ButtonInteraction
7372
thread -> {
7473
thread.addThreadMember(member).queue();
7574
thread.getManager().setInvitable(false).setAutoArchiveDuration(ThreadChannel.AutoArchiveDuration.TIME_1_WEEK).queue();
76-
try {
77-
asyncPool.execute(() -> {
78-
Optional<QOTWQuestion> questionOptional = questionQueueRepository.findByQuestionNumber(questionNumber);
79-
if (questionOptional.isPresent()) {
80-
thread.sendMessage(member.getAsMention())
81-
.setEmbeds(buildSubmissionThreadEmbed(event.getUser(), questionOptional.get(), config))
82-
.setComponents(ActionRow.of(Button.danger("qotw-submission:delete", "Delete Submission")))
83-
.queue(s -> {
84-
}, err -> ExceptionLogger.capture(err, getClass().getSimpleName()));
85-
QOTWSubmission submission = new QOTWSubmission(thread);
86-
submission.setAuthor(member.getUser());
87-
} else {
88-
thread.sendMessage("Could not retrieve current QOTW Question. Please contact an Administrator if you think that this is a mistake.")
89-
.queue();
90-
}
91-
});
92-
} catch (DataAccessException e) {
93-
ExceptionLogger.capture(e, getClass().getSimpleName());
94-
}
75+
asyncPool.execute(() -> {
76+
Optional<QOTWQuestion> questionOptional = questionQueueRepository.findByQuestionNumber(questionNumber);
77+
if (questionOptional.isPresent()) {
78+
thread.sendMessage(member.getAsMention())
79+
.setEmbeds(buildSubmissionThreadEmbed(event.getUser(), questionOptional.get(), config))
80+
.setComponents(ActionRow.of(Button.danger("qotw-submission:delete", "Delete Submission")))
81+
.queue(s -> {
82+
}, err -> ExceptionLogger.capture(err, getClass().getSimpleName()));
83+
QOTWSubmission submission = new QOTWSubmission(thread);
84+
submission.setAuthor(member.getUser());
85+
} else {
86+
thread.sendMessage("Could not retrieve current QOTW Question. Please contact an Administrator if you think that this is a mistake.")
87+
.queue();
88+
}
89+
});
9590
}, e -> log.error("Could not create submission thread for member {}. ", member.getUser().getAsTag(), e)
9691
);
9792
log.info("Opened new Submission Thread for User {}", member.getUser().getAsTag());
@@ -150,20 +145,19 @@ public void acceptSubmission(InteractionHook hook, @NotNull ThreadChannel thread
150145
.stream().max(Comparator.comparing(ThreadChannel::getTimeCreated));
151146
if (newestPostOptional.isPresent()) {
152147
ThreadChannel newestPost = newestPostOptional.get();
153-
getMessagesByUser(thread, author).thenAccept(messages -> {
154-
for (Message message : messages) {
155-
if (message.getAuthor().isBot() || message.getType() != MessageType.DEFAULT) continue;
156-
WebhookUtil.ensureWebhookExists(newestPost.getParentChannel().asForumChannel(), wh -> {
157-
if (message.getContentRaw().length() > 2000) {
158-
WebhookUtil.mirrorMessageToWebhook(wh, message, message.getContentRaw().substring(0, 2000), newestPost.getIdLong());
159-
WebhookUtil.mirrorMessageToWebhook(wh, message, message.getContentRaw().substring(2000), newestPost.getIdLong());
160-
} else {
161-
WebhookUtil.mirrorMessageToWebhook(wh, message, message.getContentRaw(), newestPost.getIdLong());
148+
WebhookUtil.ensureWebhookExists(newestPost.getParentChannel().asForumChannel(), wh ->
149+
getMessagesByUser(thread, author).thenAccept(messages -> {
150+
for (Message message : messages) {
151+
if (message.getAuthor().isBot() || message.getType() != MessageType.DEFAULT) continue;
152+
if (message.getContentRaw().length() > 2000) {
153+
WebhookUtil.mirrorMessageToWebhook(wh, message, message.getContentRaw().substring(0, 2000), newestPost.getIdLong());
154+
WebhookUtil.mirrorMessageToWebhook(wh, message, message.getContentRaw().substring(2000), newestPost.getIdLong());
155+
} else {
156+
WebhookUtil.mirrorMessageToWebhook(wh, message, message.getContentRaw(), newestPost.getIdLong());
157+
}
162158
}
163-
});
164-
}
165-
newestPost.sendMessageEmbeds(buildAuthorEmbed(author, bestAnswer)).queue();
166-
});
159+
newestPost.sendMessageEmbeds(buildAuthorEmbed(author, bestAnswer)).queue();
160+
}));
167161
}
168162
thread.getManager().setLocked(true).setArchived(true).queue();
169163
}

0 commit comments

Comments
 (0)