From fa205d7ff23a9e2d673669e9f3ccb27a1e43bce4 Mon Sep 17 00:00:00 2001 From: Liam Date: Fri, 28 Jun 2024 19:03:02 +0100 Subject: [PATCH] allow banner and avatar command to be global --- .../cc/fascinated/bat/command/impl/avatar/AvatarCommand.java | 2 +- .../cc/fascinated/bat/command/impl/banner/BannerCommand.java | 2 +- .../cc/fascinated/bat/command/impl/banner/GuildSubCommand.java | 1 - .../cc/fascinated/bat/command/impl/banner/UserSubCommand.java | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/cc/fascinated/bat/command/impl/avatar/AvatarCommand.java b/src/main/java/cc/fascinated/bat/command/impl/avatar/AvatarCommand.java index 3af8dac..2349311 100644 --- a/src/main/java/cc/fascinated/bat/command/impl/avatar/AvatarCommand.java +++ b/src/main/java/cc/fascinated/bat/command/impl/avatar/AvatarCommand.java @@ -11,7 +11,7 @@ import org.springframework.stereotype.Component; * @author Nick (okNick) */ @Component -@CommandInfo(name = "avatar", description = "View the avatar of the guild or a user") +@CommandInfo(name = "avatar", description = "View the avatar of the guild or a user", guildOnly = false) public class AvatarCommand extends BatCommand { @Autowired public AvatarCommand(@NonNull ApplicationContext context) { diff --git a/src/main/java/cc/fascinated/bat/command/impl/banner/BannerCommand.java b/src/main/java/cc/fascinated/bat/command/impl/banner/BannerCommand.java index 6603ea0..83b59ae 100644 --- a/src/main/java/cc/fascinated/bat/command/impl/banner/BannerCommand.java +++ b/src/main/java/cc/fascinated/bat/command/impl/banner/BannerCommand.java @@ -11,7 +11,7 @@ import org.springframework.stereotype.Component; * @author Nick (okNick) */ @Component -@CommandInfo(name = "banner", description = "View the banner of the guild or a user") +@CommandInfo(name = "banner", description = "View the banner of the guild or a user", guildOnly = false) public class BannerCommand extends BatCommand { @Autowired public BannerCommand(@NonNull ApplicationContext context) { diff --git a/src/main/java/cc/fascinated/bat/command/impl/banner/GuildSubCommand.java b/src/main/java/cc/fascinated/bat/command/impl/banner/GuildSubCommand.java index 617e487..144929c 100644 --- a/src/main/java/cc/fascinated/bat/command/impl/banner/GuildSubCommand.java +++ b/src/main/java/cc/fascinated/bat/command/impl/banner/GuildSubCommand.java @@ -21,7 +21,6 @@ public class GuildSubCommand extends BatSubCommand { @Override public void execute(BatGuild guild, @NonNull BatUser user, @NonNull MessageChannel channel, Member member, @NonNull SlashCommandInteraction interaction) { ImageProxy banner = guild.getDiscordGuild().getBanner(); - if (banner == null) { interaction.replyEmbeds(EmbedUtils.errorEmbed() .setDescription("%s does not have a banner!".formatted(guild.getName())) diff --git a/src/main/java/cc/fascinated/bat/command/impl/banner/UserSubCommand.java b/src/main/java/cc/fascinated/bat/command/impl/banner/UserSubCommand.java index 08dfc65..0b4529c 100644 --- a/src/main/java/cc/fascinated/bat/command/impl/banner/UserSubCommand.java +++ b/src/main/java/cc/fascinated/bat/command/impl/banner/UserSubCommand.java @@ -38,7 +38,6 @@ public class UserSubCommand extends BatSubCommand { User target = userOption.getAsUser(); ImageProxy banner = target.retrieveProfile().complete().getBanner(); - if (banner == null) { interaction.replyEmbeds(EmbedUtils.errorEmbed() .setDescription("%s does not have a banner!".formatted(target.getName()))