Skip to content

Commit b097708

Browse files
authored
fixed dismiss buttons (#1065)
* fixed dismiss button in Tex command, Tags command and File sharing listener
1 parent e9b2989 commit b097708

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

application/src/main/java/org/togetherjava/tjbot/features/code/CodeMessageHandler.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,14 +149,16 @@ private Button createButtonForAction(CodeAction action, long originalMessageId)
149149
@Override
150150
public void onButtonClick(ButtonInteractionEvent event, List<String> args) {
151151
long originalMessageId = Long.parseLong(args.get(0));
152+
153+
event.deferEdit().queue();
154+
152155
// The third arg indicates a non-code-action button
153156
if (args.size() >= 3 && DELETE_CUE.equals(args.get(2))) {
154157
deleteCodeReply(event, originalMessageId);
155158
return;
156159
}
157160

158161
CodeAction codeAction = getActionOfEvent(event);
159-
event.deferEdit().queue();
160162

161163
// User decided for an action, apply it to the code
162164
event.getChannel()
@@ -189,7 +191,7 @@ private void deleteCodeReply(ButtonInteractionEvent event, long originalMessageI
189191
event.getUser().getId(), originalMessageId, event.getChannel().getName());
190192

191193
originalMessageToCodeReply.invalidate(originalMessageId);
192-
event.getMessage().delete().queue();
194+
event.getHook().deleteOriginal().queue();
193195
}
194196

195197
private CodeAction getActionOfEvent(ButtonInteractionEvent event) {

application/src/main/java/org/togetherjava/tjbot/features/filesharing/FileSharingMessageListener.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,8 @@ public void onButtonClick(ButtonInteractionEvent event, List<String> args) {
111111

112112
try {
113113
new GitHubBuilder().withOAuthToken(githubApiKey).build().getGist(gistId).delete();
114-
event.getMessage().delete().queue();
114+
event.deferEdit().queue();
115+
event.getHook().deleteOriginal().queue();
115116
} catch (IOException e) {
116117
logger.warn("Failed to delete gist with id {}", gistId, e);
117118
}

application/src/main/java/org/togetherjava/tjbot/features/mathcommands/TeXCommand.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ public void onButtonClick(final ButtonInteractionEvent event, final List<String>
170170
.queue();
171171
return;
172172
}
173-
event.getMessage().delete().queue();
173+
event.deferEdit().queue();
174+
event.getHook().deleteOriginal().queue();
174175
}
175176
}

0 commit comments

Comments
 (0)