Skip to content

Commit d2046be

Browse files
jasonlessenichjasonlessenich
committed
fixed Interactions
1 parent 2068099 commit d2046be

3 files changed

Lines changed: 14 additions & 14 deletions

File tree

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ private void acceptSubmission(ButtonClickEvent event, ThreadChannel thread) {
127127
new IncrementSubcommand().correct(member, true);
128128
thread.getManager().setName(SUBMISSION_ACCEPTED + thread.getName().substring(1)).setArchived(true).queueAfter(5, TimeUnit.SECONDS);
129129
log.info("{} accepted {}'s submission", event.getUser().getAsTag(), member.getUser().getAsTag());
130-
GuildUtils.getLogChannel(event.getGuild()).sendMessageFormat("%s accepted %s's submission", event.getUser().getAsTag(), member.getUser().getAsTag()).queue();
130+
GuildUtils.getLogChannel(event.getGuild()).sendMessageFormat("%s\n%s accepted %s's submission", thread.getAsMention(), event.getUser().getAsTag(), member.getUser().getAsTag()).queue();
131131
this.disableControls(String.format("Accepted by %s", event.getUser().getAsTag()), event.getMessage());
132132
Responses.success(event.getHook(), "Submission Accepted", "Successfully accepted submission by " + member.getAsMention()).queue();
133133
}
@@ -156,15 +156,16 @@ private void declineSelectSubmission(SelectionMenuEvent event, ThreadChannel thr
156156
return;
157157
}
158158
member.getUser().openPrivateChannel().queue(
159-
c -> c.sendMessageEmbeds(buildSubmissionDeclinedEmbed(member.getUser(), reasons)).queue(),
160-
e -> {
161-
});
159+
c -> c.sendMessageEmbeds(buildSubmissionDeclinedEmbed(member.getUser(), reasons)).queue(
160+
s -> { },
161+
e -> log.info("Could not send submission notification to user {}", event.getUser().getAsTag())),
162+
e -> { });
162163
thread.getManager().setName(SUBMISSION_DECLINED + thread.getName().substring(1)).setArchived(true).queueAfter(5, TimeUnit.SECONDS);
163164
log.info("{} declined {}'s submission for: {}", event.getUser().getAsTag(), member.getUser().getAsTag(), reasons);
164-
GuildUtils.getLogChannel(event.getGuild()).sendMessageFormat("%s declined %s's submission for: `%s`", event.getUser().getAsTag(), member.getUser().getAsTag(), reasons).queue();
165+
GuildUtils.getLogChannel(event.getGuild()).sendMessageFormat("%s\n%s declined %s's submission for: `%s`", thread.getAsMention(), event.getUser().getAsTag(), member.getUser().getAsTag(), reasons).queue();
165166
this.disableControls(String.format("Declined by %s", event.getUser().getAsTag()), event.getMessage());
166167
Responses.success(event.getHook(), "Submission Declined",
167-
String.format("Successfully declined submission by %s for the following reasons:\n`%s`" + member.getAsMention(), reasons)).queue();
168+
String.format("Successfully declined submission by %s for the following reasons:\n`%s`", member.getAsMention(), reasons)).queue();
168169
}
169170
);
170171
} catch (SQLException e) {
@@ -208,7 +209,7 @@ private List<ActionRow> buildInteractionControls() {
208209
}
209210

210211
private SelectionMenu buildDeclineMenu() {
211-
return SelectionMenu.create("submission-controls:decline")
212+
return SelectionMenu.create("submission-controls-select:decline")
212213
.setPlaceholder("Select a reason for declining this submission.")
213214
.setRequiredRange(1, 3)
214215
.addOption("Wrong Answer", "Wrong Answer", "The content of the submission was not correct.")

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class SubmissionManager {
2929
/**
3030
* The submission thread's name.
3131
*/
32-
public static final String THREAD_NAME = "#%s | %s";
32+
public static final String THREAD_NAME = "%s — %s";
3333
private final QOTWConfig config;
3434

3535
/**
@@ -45,7 +45,7 @@ public WebhookMessageAction<?> handleSubmission(ButtonClickEvent event, int ques
4545
return Responses.warning(event.getHook(), "You're not eligible to create a new submission thread.");
4646
}
4747
config.getSubmissionChannel().createThreadChannel(
48-
String.format(THREAD_NAME, questionNumber, member.getUser().getName()), true).queue(
48+
String.format(THREAD_NAME, questionNumber, member.getEffectiveName()), true).queue(
4949
thread -> {
5050
try (var con = Bot.dataSource.getConnection()) {
5151
var repo = new QOTWSubmissionRepository(con);
@@ -57,9 +57,8 @@ public WebhookMessageAction<?> handleSubmission(ButtonClickEvent event, int ques
5757
repo.insert(submission);
5858

5959
thread.getManager().setInvitable(false).setAutoArchiveDuration(ThreadChannel.AutoArchiveDuration.TIME_1_WEEK).queue();
60-
thread.addThreadMember(member).queue();
61-
event.getGuild().getMembersWithRoles(config.getQOTWReviewRole()).forEach(m -> thread.addThreadMember(m).queue());
62-
thread.sendMessageEmbeds(buildSubmissionThreadEmbed(event.getUser(), questionNumber, config))
60+
thread.sendMessage(String.format("%s %s", config.getQOTWReviewRole(), member.getAsMention()))
61+
.setEmbeds(buildSubmissionThreadEmbed(event.getUser(), questionNumber, config))
6362
.setActionRows(ActionRow.of(Button.danger("qotw-submission:delete", "Delete Submission")))
6463
.queue();
6564
} catch (SQLException e) {

‎src/main/java/net/javadiscord/javabot/systems/qotw/submissions/dao/QOTWSubmissionRepository.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public void markReviewed(QOTWSubmission submission) throws SQLException {
6363
UPDATE qotw_submissions
6464
SET reviewed = TRUE
6565
WHERE thread_id = ?""")) {
66-
stmt.setLong(2, submission.getThreadId());
66+
stmt.setLong(1, submission.getThreadId());
6767
stmt.executeUpdate();
6868
}
6969
}
@@ -79,7 +79,7 @@ public void markAccepted(QOTWSubmission submission) throws SQLException {
7979
UPDATE qotw_submissions
8080
SET accepted = TRUE
8181
WHERE thread_id = ?""")) {
82-
stmt.setLong(2, submission.getThreadId());
82+
stmt.setLong(1, submission.getThreadId());
8383
stmt.executeUpdate();
8484
}
8585
}

0 commit comments

Comments
 (0)