Altitude/AltitudeBot
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switched to using CommandData in registerCommand and allow USER commands to work in guilds

Browse Source
This commit is contained in:
Teriuihi 2022-04-11 03:29:59 +02:00
parent de8f2a9356
commit 32102cac3b
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/alttd/util/Util.java
View File

@ -11,7 +11,7 @@ import net.dv8tion.jda.api.JDA;
import net.dv8tion.jda.api.entities.*; import net.dv8tion.jda.api.entities.*;
import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionMapping;
import net.dv8tion.jda.api.interactions.commands.SlashCommandInteraction; import net.dv8tion.jda.api.interactions.commands.SlashCommandInteraction;
import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData; import net.dv8tion.jda.api.interactions.commands.build.CommandData;
import net.dv8tion.jda.api.requests.RestAction; import net.dv8tion.jda.api.requests.RestAction;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@ -96,20 +96,19 @@ public class Util {
.build(); .build();
} }
public static void registerCommand(CommandManager commandManager, JDA jda, SlashCommandData slashCommandData, String commandName) { public static void registerCommand(CommandManager commandManager, JDA jda, CommandData commandData, String commandName) {
for (ScopeInfo info : commandManager.getActiveLocations(commandName)) { for (ScopeInfo info : commandManager.getActiveLocations(commandName)) {
switch (info.getScope()) { switch (info.getScope()) {
case GLOBAL -> jda.updateCommands().addCommands(slashCommandData).queue(); case GLOBAL -> jda.updateCommands().addCommands(commandData).queue();
case GUILD -> { case GUILD, USER -> {
Guild guildById = jda.getGuildById(info.getId()); Guild guildById = jda.getGuildById(info.getId());
if (guildById == null) if (guildById == null)
{ {
Logger.warning("Tried to add command % to invalid guild %.", commandName, String.valueOf(info.getId())); Logger.warning("Tried to add command % to invalid guild %.", commandName, String.valueOf(info.getId()));
continue; continue;
} }
guildById.updateCommands().addCommands(slashCommandData).queue(RestAction.getDefaultSuccess(), Util::handleFailure); guildById.updateCommands().addCommands(commandData).queue(RestAction.getDefaultSuccess(), Util::handleFailure);
} }
case USER -> Logger.warning("Tried to add command % to user, this is not implemented yet since I don't know how this should work.");
} }
} }
} }