Skip to content

add autocomplete support to docker commands #2

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

Open
granny wants to merge 6 commits into
base: master
Choose a base branch
from
Open

add autocomplete support to docker commands #2

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ef1ac80
add autocomplete support to docker commands
granny Sep 1, 2024
bf70d71
use dockerjava's name filter for filtering
granny Sep 1, 2024
45d0d1d
properly check option value
granny Sep 1, 2024
16b6839
remove unused import
granny Sep 1, 2024
6a8dd39
i need to pay attention more and commit less
granny Sep 1, 2024
1315b48
fix subcommand name check
granny Sep 1, 2024
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
33 changes: 31 additions & 2 deletions src/main/java/me/scarsz/marina/feature/docker/DockerFeature.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
import me.scarsz.marina.exception.InsufficientPermissionException;
import me.scarsz.marina.feature.AbstractFeature;
import net.dv8tion.jda.api.entities.ISnowflake;
import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
import net.dv8tion.jda.api.interactions.AutoCompleteQuery;
import net.dv8tion.jda.api.interactions.commands.OptionMapping;
import net.dv8tion.jda.api.interactions.commands.OptionType;
import net.dv8tion.jda.api.interactions.commands.build.SubcommandData;
Expand All @@ -29,6 +31,8 @@
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;

import static net.dv8tion.jda.api.interactions.commands.Command.Choice;

public class DockerFeature extends AbstractFeature {

private final DockerClient dockerClient;
Expand All @@ -42,10 +46,10 @@ public DockerFeature() {
.addOption(OptionType.STRING, "name", "Name to filter containers by")
)
.addSubcommands(new SubcommandData("restart", "Restart a container")
.addOption(OptionType.STRING, "container", "Container name to restart")
.addOption(OptionType.STRING, "container", "Container name to restart", false, true)
)
.addSubcommands(new SubcommandData("update", "Update a container")
.addOption(OptionType.STRING, "container", "Container name to update", true)
.addOption(OptionType.STRING, "container", "Container name to update", true, true)
)
.queue();
}
Expand Down Expand Up @@ -138,6 +142,31 @@ public void onComplete() {
});
}

@Override
public void onCommandAutoCompleteInteraction(CommandAutoCompleteInteractionEvent event) {
String[] commandPath = event.getFullCommandName().split(" ");
AutoCompleteQuery focusedOption = event.getFocusedOption();

if (!"container".equals(commandPath[0])) {
return; // not under the "container" command
}

if (!("update".equals(commandPath[1]) || "restart".equals(commandPath[1]))) {
return; // not the "update" or "restart" subcommands
}

if (!"container".equals(focusedOption.getName())) {
return; // not the "container" option
}

String optionValue = focusedOption.getValue().isBlank() ? null : focusedOption.getValue();
List<Choice> options = listContainers(optionValue, event.getUser()).stream()
.map(this::getContainerName)
.map(word -> new Choice(word, word)) // map the words to choices
.collect(Collectors.toList());
event.replyChoices(options).queue();
}

// @Override
// public void onSelectionMenu(@NotNull SelectionMenuEvent event) {
// for (String value : event.getValues()) {
Expand Down