Skip to content

Commit c6e158e

Browse files
committed
acknowledge interaction immediately for format-code, remove unused code
1 parent 3467109 commit c6e158e

5 files changed

Lines changed: 25 additions & 25 deletions

File tree

src/main/java/net/discordjug/javabot/systems/user_commands/format_code/Code.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@ public String getContent() {
3333
return content;
3434
}
3535

36-
public Language getLanguage() {
37-
return language;
38-
}
39-
4036
/**
4137
* Splits {@link #content} into pieces that each fit within {@link #MAX_SIZE},
4238
* breaking on newlines where possible so lines are not cut in half.

src/main/java/net/discordjug/javabot/systems/user_commands/format_code/FormatAndIndentCodeMessageContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ public void execute(@NotNull MessageContextInteractionEvent event) {
3030

3131
Code code = new Code(Language.JAVA, indented);
3232

33-
FormatCodeDispatcher.sendCode(code, event, event.getTarget());
33+
event.deferReply().queue(_ -> FormatCodeDispatcher.sendCode(code, event, event.getTarget()));
3434
}
3535
}

src/main/java/net/discordjug/javabot/systems/user_commands/format_code/FormatCodeCommand.java

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -56,29 +56,33 @@ public void execute(@NotNull SlashCommandInteractionEvent event) {
5656
String indentation = event.getOption("auto-indent","NULL",OptionMapping::getAsString);
5757

5858
if (idOption == null) {
59-
event.getChannel().getHistory()
60-
.retrievePast(10)
61-
.queue(messages -> {
62-
Message target = messages.stream()
63-
.filter(m -> !m.getAuthor().isBot()).findFirst()
64-
.orElse(null);
65-
if (target != null) {
66-
sendFormattedCode(event, target, language, indentation);
67-
} else {
68-
Responses.errorWithTitle(event, "Message Not Found", "No recent user message could be found. Please specify a message ID.")
69-
.queue();
70-
}
71-
});
59+
event.deferReply().queue(_ -> {
60+
event.getChannel().getHistory()
61+
.retrievePast(10)
62+
.queue(messages -> {
63+
Message target = messages.stream()
64+
.filter(m -> !m.getAuthor().isBot()).findFirst()
65+
.orElse(null);
66+
if (target != null) {
67+
sendFormattedCode(event, target, language, indentation);
68+
} else {
69+
Responses.errorWithTitle(event.getHook(), "Message Not Found", "No recent user message could be found. Please specify a message ID.")
70+
.queue();
71+
}
72+
});
73+
});
7274
} else {
7375
if (Checks.isInvalidLongInput(idOption)) {
7476
Responses.errorWithTitle(event, "Invalid Message ID", "Please provide a valid Discord message ID.")
75-
.queue();
77+
.queue();
7678
return;
7779
}
7880
long messageId = idOption.getAsLong();
79-
event.getChannel().retrieveMessageById(messageId).queue(
80-
target -> sendFormattedCode(event, target, language, indentation),
81-
error -> Responses.errorWithTitle(event, "Message Not Found", "Could not retrieve the message with ID `" + messageId + "`. Make sure the message exists and is accessible.").queue());
81+
event.deferReply().queue(_ -> {
82+
event.getChannel().retrieveMessageById(messageId).queue(
83+
target -> sendFormattedCode(event, target, language, indentation),
84+
error -> Responses.errorWithTitle(event.getHook(), "Message Not Found", "Could not retrieve the message with ID `" + messageId + "`. Make sure the message exists and is accessible.").queue());
85+
});
8286
}
8387
}
8488

src/main/java/net/discordjug/javabot/systems/user_commands/format_code/FormatCodeDispatcher.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class FormatCodeDispatcher {
3535
*/
3636
public static void sendCode(Code code, @Nonnull CommandInteraction event, Message target){
3737
if (code.getContent().isBlank()) {
38-
Responses.errorWithTitle(event, "404 Code not found","There is no code to format in that message.").queue();
38+
Responses.errorWithTitle(event.getHook(), "404 Code not found","There is no code to format in that message.").queue();
3939
return;
4040
}
4141

@@ -49,7 +49,7 @@ public static void sendCode(Code code, @Nonnull CommandInteraction event, Messag
4949
return;
5050
}
5151

52-
Responses.success(event, "Success", "The formatted message is being sent to this channel.")
52+
Responses.success(event.getHook(), "Success", "The formatted message is being sent to this channel.")
5353
.queue(success -> sendChunksInOrder(channel, messages, 0, target,event));
5454
}
5555

src/main/java/net/discordjug/javabot/systems/user_commands/format_code/FormatCodeMessageContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ public void execute(@NotNull MessageContextInteractionEvent event) {
2727

2828
Code code = new Code(Language.JAVA, content);
2929

30-
FormatCodeDispatcher.sendCode(code, event, event.getTarget());
30+
event.deferReply().queue(_ -> FormatCodeDispatcher.sendCode(code, event, event.getTarget()));
3131
}
3232
}

0 commit comments

Comments
 (0)