Skip to content

Commit 080b17c

Browse files
committed
update to 5.1.0
fixed blank slash options
1 parent a324a55 commit 080b17c

File tree

6 files changed

+21
-9
lines changed

6 files changed

+21
-9
lines changed

internal/src/main/java/me/koply/kcommando/internal/boxes/SlashBox.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ public SlashBox(Object instance, Method method, Class<?> clazz, HandleSlash info
1616
}
1717

1818
public Optional<Perm> getPerm() {
19-
return Optional.of(method.getAnnotation(Perm.class));
19+
Perm annotation = method.getAnnotation(Perm.class);
20+
return annotation == null ? Optional.empty() : Optional.of(annotation);
2021
}
2122

2223
}

javacord-integration/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<artifactId>javacord-integration</artifactId>
1414

1515
<properties>
16-
<javacord.version>3.7.0</javacord.version>
16+
<javacord.version>3.8.0</javacord.version>
1717
</properties>
1818

1919
<dependencies>

jda-integration/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</repositories>
2222

2323
<properties>
24-
<jda.version>5.0.0-alpha.21</jda.version>
24+
<jda.version>5.0.0-beta.11</jda.version>
2525
</properties>
2626

2727
<dependencies>

jda-integration/src/main/java/me/koply/kcommando/integration/impl/jda/JDAIntegration.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ public JDAIntegration(JDA api) {
3131
this.api = api;
3232
}
3333

34+
@Override
3435
public void registerCommandHandler(CommandHandler handler) {
3536
api.addEventListener(new CommandListener(handler));
3637
}
@@ -55,17 +56,22 @@ public void registerSlashCommand(SlashBox box) {
5556

5657
Option[] options = info.options();
5758
OptionData[] optionDatas = new OptionData[options.length];
59+
int filledDatas = 0;
5860
for (int i = 0; i < options.length; i++) {
5961
if (options[i].type() == me.koply.kcommando.internal.OptionType.UNKNOWN) continue;
6062
OptionType type = OptionType.fromKey(options[i].type().value);
6163
optionDatas[i] = new OptionData(type, options[i].name(), options[i].desc(), options[i].required());
64+
filledDatas++;
6265
}
6366

67+
OptionData[] rolledOptionDatas = new OptionData[filledDatas];
68+
System.arraycopy(optionDatas, 0, rolledOptionDatas, 0, filledDatas);
69+
6470
boolean guildOnly = !info.enabledInDms();
6571

6672
CommandData data = new CommandDataImpl(name, desc)
67-
.addOptions(optionDatas)
68-
.setGuildOnly(guildOnly);
73+
.setGuildOnly(guildOnly)
74+
.addOptions(rolledOptionDatas);
6975

7076
box.getPerm().ifPresent(perm -> data.setDefaultPermissions(DefaultMemberPermissions.enabledFor(Util.getPermissions(perm.value()))));
7177

jda-integration/src/main/test/me/koply/aaa/Test.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,11 @@ public static void slash(SlashCommandInteractionEvent e) {
8686
e.getHook().sendMessage("Bu bir cevap mı bilmiyorum. -> " + val).queue();
8787
}
8888

89+
@HandleSlash(name = "amogus", desc = "amogus", guildId = 674334330444709904L)
90+
public static void nonoptions(SlashCommandInteractionEvent e) {
91+
e.reply("yes man u got that").queue();
92+
}
93+
8994
@Override
9095
public void onSlashCommandInteraction(@NotNull SlashCommandInteractionEvent event) {
9196
System.out.println("slash command timez " + event.getName() + " - " + event.getCommandId());

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
<version>5.1.0</version>
1111

1212
<scm>
13-
<connection>scm:git:git://github.com/MusaBrt/KCommando.git</connection>
14-
<developerConnection>scm:git:ssh://github.com/MusaBrt/KCommando.git</developerConnection>
15-
<url>https://github.com/MusaBrt/KCommando</url>
13+
<connection>scm:git:git://github.com/koply/KCommando.git</connection>
14+
<developerConnection>scm:git:ssh://github.com/koply/KCommando.git</developerConnection>
15+
<url>https://github.com/koply/KCommando</url>
1616
</scm>
1717
<modules>
1818
<module>all</module>
@@ -25,7 +25,7 @@
2525

2626
<name>KCommando</name>
2727
<description>Annotation based command handler wrapper for JDA &amp; Javacord.</description>
28-
<url>https://github.com/MusaBrt/KCommando</url>
28+
<url>https://github.com/koply/KCommando</url>
2929

3030
<properties>
3131
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

0 commit comments

Comments
 (0)