Skip to content

Add thread link if submission thread exists already #515

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 3 commits into from
May 25, 2025
+18 −8
Merged

Add thread link if submission thread exists already #515

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9441ed6
Add thread link if submission thread exists already
danthe1st May 25, 2025
bbbe724
move nested record to bottom
danthe1st May 25, 2025
f6490f8
change wording
danthe1st May 25, 2025
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
26 changes: 18 additions & 8 deletions src/main/java/net/discordjug/javabot/systems/qotw/submissions/SubmissionManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,9 @@ public class SubmissionManager {
public WebhookMessageCreateAction<?> handleSubmission(@NotNull ButtonInteractionEvent event, int questionNumber) {
event.deferEdit().queue();
Member member = event.getMember();
if (!canCreateSubmissions(member)) {
return Responses.warning(event.getHook(), "You're not eligible to create a new submission thread.");
CreateSubmissionResult createSubmissionCheckResult = canCreateSubmissions(member);
if (!createSubmissionCheckResult.canCreateSubmissions()) {
return Responses.warning(event.getHook(), "You're not eligible to create a new submission thread because " + createSubmissionCheckResult.errorMessage());
}
config.getSubmissionChannel().createThreadChannel(
String.format(THREAD_NAME, questionNumber, member.getId()), true).queue(
Expand Down Expand Up @@ -174,13 +175,20 @@ public void handleThreadDeletion(@NotNull ButtonInteractionEvent event) {
});
}

private boolean canCreateSubmissions(Member member) {
if (member == null) return false;
if (member.getUser().isBot() || member.getUser().isSystem()) return false;
if (member.isTimedOut() || member.isPending()) return false;
return config.getSubmissionChannel().getThreadChannels()
.stream().noneMatch(p -> p.getName().contains(member.getId()));
private CreateSubmissionResult canCreateSubmissions(Member member) {
if (member == null) return new CreateSubmissionResult(false, "your user cannot be found in this server - please try again later or contact staff members.");
if (member.getUser().isBot() || member.getUser().isSystem()) return new CreateSubmissionResult(false, "your account seems to be marked as a bot.");
if (member.isTimedOut() || member.isPending()) return new CreateSubmissionResult(false, "you are timed out or have not accepted the rules");

Optional<ThreadChannel> existingSubmissionThread = config.getSubmissionChannel().getThreadChannels()
.stream().filter(p -> p.getName().contains(member.getId())).findAny();

return existingSubmissionThread
.map(thread -> new CreateSubmissionResult(false,
"you already have one: " + existingSubmissionThread.get().getJumpUrl()))
.orElse(new CreateSubmissionResult(true, ""));
}


/**
* Accepts a submission.
Expand Down Expand Up @@ -292,4 +300,6 @@ private CompletableFuture<List<Message>> getMessagesByUser(@NotNull ThreadChanne
.setTimestamp(Instant.now())
.build();
}

private record CreateSubmissionResult(boolean canCreateSubmissions, String errorMessage) {}
}