Sheldan/abstracto
1
0
Fork 0
mirror of https://github.com/Sheldan/abstracto.git synced 2026-01-28 19:35:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

[AB-xxx] never using the interaction in echo when a channel is provided

Browse Source
This commit is contained in:
Sheldan
2023-09-09 23:57:23 +02:00
parent 915eb8ced9
commit 14f35caede
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/utility/Echo.java
View File

@@ -67,8 +67,10 @@ public class Echo extends AbstractConditionableCommand {
String message = slashCommandParameterService.getCommandOption(INPUT_PARAMETER, event, String.class); String message = slashCommandParameterService.getCommandOption(INPUT_PARAMETER, event, String.class);
GuildMessageChannel messageChannel; GuildMessageChannel messageChannel;
boolean redirect = false;
if (slashCommandParameterService.hasCommandOption(TARGET_CHANNEL_PARAMETER, event)) { if (slashCommandParameterService.hasCommandOption(TARGET_CHANNEL_PARAMETER, event)) {
messageChannel = slashCommandParameterService.getCommandOption(TARGET_CHANNEL_PARAMETER, event, GuildMessageChannel.class); messageChannel = slashCommandParameterService.getCommandOption(TARGET_CHANNEL_PARAMETER, event, GuildMessageChannel.class);
redirect = true;
} else { } else {
messageChannel = event.getGuildChannel(); messageChannel = event.getGuildChannel();
} }
@@ -78,11 +80,10 @@ public class Echo extends AbstractConditionableCommand {
.text(message) .text(message)
.build(); .build();
if (messageChannel.equals(event.getMessageChannel())) { if (messageChannel.equals(event.getMessageChannel()) && !redirect) {
return interactionService.replyMessage(TEMPLATE_NAME, model, event) return interactionService.replyMessage(TEMPLATE_NAME, model, event)
.thenApply(unused -> CommandResult.fromSuccess()); .thenApply(unused -> CommandResult.fromSuccess());
} else { } else {
EchoRedirectResponseModel redirectResponseModel = EchoRedirectResponseModel EchoRedirectResponseModel redirectResponseModel = EchoRedirectResponseModel
.builder() .builder()
.channel(ChannelDisplay.fromChannel(messageChannel)) .channel(ChannelDisplay.fromChannel(messageChannel))