Skip to content

Removal of ALL subcommand on RoleSelectCommand #389

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 1 commit into from
Feb 21, 2022
Merged

Removal of ALL subcommand on RoleSelectCommand #389

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 3 additions & 27 deletions application/src/main/java/org/togetherjava/tjbot/commands/basic/RoleSelectCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import net.dv8tion.jda.api.interactions.commands.OptionMapping;
import net.dv8tion.jda.api.interactions.commands.OptionType;
import net.dv8tion.jda.api.interactions.commands.build.OptionData;
import net.dv8tion.jda.api.interactions.commands.build.SubcommandData;
import net.dv8tion.jda.api.interactions.components.ActionRow;
import net.dv8tion.jda.api.interactions.components.ComponentInteraction;
import net.dv8tion.jda.api.interactions.components.selections.SelectOption;
Expand Down Expand Up @@ -44,9 +43,6 @@ public final class RoleSelectCommand extends SlashCommandAdapter {

private static final Logger logger = LoggerFactory.getLogger(RoleSelectCommand.class);

private static final String ALL_OPTION = "all";
private static final String CHOOSE_OPTION = "choose";

private static final String TITLE_OPTION = "title";
private static final String DESCRIPTION_OPTION = "description";

Expand All @@ -65,15 +61,7 @@ public RoleSelectCommand() {
super("role-select", "Sends a message where users can select their roles",
SlashCommandVisibility.GUILD);

SubcommandData allRoles =
new SubcommandData(ALL_OPTION, "Lists all the rolls in the server for users")
.addOptions(messageOptions);

SubcommandData selectRoles =
new SubcommandData(CHOOSE_OPTION, "Choose the roles for users to select")
.addOptions(messageOptions);

getData().addSubcommands(allRoles, selectRoles);
getData().addOptions(messageOptions);
}

@NotNull
Expand Down Expand Up @@ -107,14 +95,8 @@ public void onSlashCommand(@NotNull final SlashCommandEvent event) {

SelectionMenu.Builder menu =
SelectionMenu.create(generateComponentId(Lifespan.PERMANENT, member.getId()));
boolean isEphemeral = false;

if (CHOOSE_OPTION.equals(event.getSubcommandName())) {
addMenuOptions(event, menu, "Select the roles to display", 1);
isEphemeral = true;
} else {
addMenuOptions(event, menu, "Select your roles", 0);
}
addMenuOptions(event, menu, "Select the roles to display", 1);

// Handle Optional arguments
OptionMapping titleOption = event.getOption(TITLE_OPTION);
Expand All @@ -126,13 +108,7 @@ public void onSlashCommand(@NotNull final SlashCommandEvent event) {
MessageBuilder messageBuilder = new MessageBuilder(makeEmbed(title, description))
.setActionRows(ActionRow.of(menu.build()));

if (isEphemeral) {
event.reply(messageBuilder.build()).setEphemeral(true).queue();
} else {
event.getChannel().sendMessage(messageBuilder.build()).queue();

event.reply("Message sent successfully!").setEphemeral(true).queue();
}
event.reply(messageBuilder.build()).setEphemeral(true).queue();
}

/**
Expand Down