Use embeds and fix not using command data
This commit is contained in:
parent
6b60ba4a34
commit
9f389a8a12
|
|
@ -25,9 +25,9 @@ import java.util.concurrent.TimeUnit;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
public class CommandLink extends DiscordCommand {
|
public class CommandLink extends DiscordCommand {
|
||||||
|
private final CommandData commandData;
|
||||||
public CommandLink(JDA jda) {
|
public CommandLink(JDA jda) {
|
||||||
CommandData commandData = Commands.slash(getName(), "Create an auction")
|
commandData = Commands.slash(getName(), "Link your Discord and Altitude Minecraft accounts")
|
||||||
.addOption(OptionType.NUMBER, "code", "The code you got from doing /discord link on Altitude in Minecraft", true)
|
.addOption(OptionType.NUMBER, "code", "The code you got from doing /discord link on Altitude in Minecraft", true)
|
||||||
.setDefaultPermissions(DefaultMemberPermissions.ENABLED);
|
.setDefaultPermissions(DefaultMemberPermissions.ENABLED);
|
||||||
|
|
||||||
|
|
@ -43,13 +43,13 @@ public class CommandLink extends DiscordCommand {
|
||||||
public void execute(SlashCommandInteractionEvent event) {
|
public void execute(SlashCommandInteractionEvent event) {
|
||||||
Member member = event.getMember();
|
Member member = event.getMember();
|
||||||
if (member == null) {
|
if (member == null) {
|
||||||
handleError("Unable to find you", event);
|
Utilities.commandErrAutoRem("Unable to find you", event);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
UUID uuid = getUUID(event.getOption("link", OptionMapping::getAsInt));
|
UUID uuid = getUUID(event.getOption("link", OptionMapping::getAsInt));
|
||||||
if (uuid == null) {
|
if (uuid == null) {
|
||||||
handleError("This is not a valid link code, please check Minecraft and try again", event);
|
Utilities.commandErrAutoRem("This is not a valid link code, please check Minecraft and try again", event);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -87,7 +87,7 @@ public class CommandLink extends DiscordCommand {
|
||||||
Guild guild = event.getGuild();
|
Guild guild = event.getGuild();
|
||||||
Member member = event.getMember();
|
Member member = event.getMember();
|
||||||
if (guild == null || member == null) {
|
if (guild == null || member == null) {
|
||||||
handleError("Unable to find guild", event);
|
Utilities.commandErrAutoRem("Unable to find guild", event);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (player != null || user != null)
|
if (player != null || user != null)
|
||||||
|
|
@ -133,15 +133,9 @@ public class CommandLink extends DiscordCommand {
|
||||||
return DiscordLink.getPlugin().getCache().getUUID(String.valueOf(code));
|
return DiscordLink.getPlugin().getCache().getUUID(String.valueOf(code));
|
||||||
}
|
}
|
||||||
|
|
||||||
private void handleError(String text, SlashCommandInteractionEvent event) {
|
|
||||||
event.replyEmbeds(Utilities.genericErrorEmbed("Error", text))
|
|
||||||
.setEphemeral(true)
|
|
||||||
.queue(res -> res.deleteOriginal().queueAfter(5, TimeUnit.SECONDS));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public CommandData getCommandData() {
|
public CommandData getCommandData() {
|
||||||
return null;
|
return commandData;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user