tueem/Marinara
1
1
Fork 0
Code Issues 2 Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

improve wrapper and general structure #16

Merged
tueem merged 23 commits from improve/structure into dev 2025-03-17 08:26:44 +00:00
Conversation 1 Commits 23 Files Changed 36 +22 -21
1 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8f14b0feb9 - Show all commits

33
lib/src/main/java/net/tomatentum/marinara/interaction/commands/SlashCommandDefinition.java
View File

@@ -51,17 +51,29 @@ public class SlashCommandDefinition {
subCommandGroupMap.put(x.name(), x); subCommandGroupMap.put(x.name(), x);
}); });
return subCommandGroupMap.values().toArray(new SubCommandGroup[0]); return subCommandGroupMap.values().toArray(SubCommandGroup[]::new);
} }
public SubCommand[] getSubCommands(String groupName) { public SubCommand[] getSubCommands() {
List<SubCommand> subCommands; List<SubCommand> subCommands;
if (groupName == null)
subCommands = Arrays.stream(getExecutableDefinitons()) subCommands = Arrays.stream(getExecutableDefinitons())
.filter((x) -> x.subCommandGroup() == null && x.subCommand() != null) .filter((x) -> x.subCommandGroup() == null && x.subCommand() != null)
.map((x) -> x.subCommand()) .map((x) -> x.subCommand())
.toList(); .toList();
else
HashMap<String, SubCommand> subCommandMap = new HashMap<>();
subCommands.forEach((x) -> {
SubCommand current = subCommandMap.get(x.name());
if (current == null || (current.description().isBlank() && !x.description().isBlank()))
subCommandMap.put(x.name(), x);
});
return subCommandMap.values().toArray(SubCommand[]::new);
}
public SubCommand[] getSubCommands(String groupName) {
List<SubCommand> subCommands;
subCommands = Arrays.stream(getExecutableDefinitons()) subCommands = Arrays.stream(getExecutableDefinitons())
.filter((x) -> x.subCommandGroup().name().equals(groupName) && x.subCommand() != null) .filter((x) -> x.subCommandGroup().name().equals(groupName) && x.subCommand() != null)
.map((x) -> x.subCommand()) .map((x) -> x.subCommand())
@@ -74,18 +86,7 @@ public class SlashCommandDefinition {
subCommandMap.put(x.name(), x); subCommandMap.put(x.name(), x);
}); });
return subCommandMap.values().toArray(new SubCommand[0]); return subCommandMap.values().toArray(SubCommand[]::new);
}
public SlashCommand getFullSlashCommand() {
if (isRootCommand())
return getSlashCommand();
for (ExecutableSlashCommandDefinition executableSlashCommandDefinition : executableDefinitons) {
if (executableSlashCommandDefinition.options().length > 0)
return executableSlashCommandDefinition.applicationCommand();
}
return null;
} }
public SlashCommand getSlashCommand() { public SlashCommand getSlashCommand() {