cleanup

src/main/java/cc/fascinated/bat/features/autorole/command/AddSubCommand.java

@@ -43,12 +43,7 @@ public class AddSubCommand extends BatCommand {
         }
 
         OptionMapping option = event.getOption("role");
-        if (option == null) {
+        assert option != null;
-            event.replyEmbeds(EmbedUtils.errorEmbed()
-                    .setDescription("Please provide a role to add")
-                    .build()).queue();
-            return;
-        }
         Role role = option.getAsRole();
 
         // Check if the role is already in the auto roles list

src/main/java/cc/fascinated/bat/features/autorole/command/RemoveSubCommand.java

@@ -32,12 +32,7 @@ public class RemoveSubCommand extends BatCommand {
     public void execute(BatGuild guild, @NonNull BatUser user, @NonNull MessageChannel channel, Member member, @NonNull SlashCommandInteraction event) {
         AutoRoleProfile profile = guild.getProfile(AutoRoleProfile.class);
         OptionMapping option = event.getOption("role");
-        if (option == null) {
+        assert option != null;
-            event.replyEmbeds(EmbedUtils.errorEmbed()
-                    .setDescription("Please provide a role to remove")
-                    .build()).queue();
-            return;
-        }
 
         Role role = option.getAsRole();
         if (!profile.hasRole(role.getId())) {

src/main/java/cc/fascinated/bat/features/base/BaseFeature.java

@@ -9,13 +9,12 @@ import cc.fascinated.bat.features.base.commands.fun.image.ImageCommand;
 import cc.fascinated.bat.features.base.commands.general.*;
 import cc.fascinated.bat.features.base.commands.general.avatar.AvatarCommand;
 import cc.fascinated.bat.features.base.commands.general.banner.BannerCommand;
-import cc.fascinated.bat.features.base.commands.utility.lookup.LookupCommand;
-import cc.fascinated.bat.features.base.commands.utility.lookup.UserSubCommand;
 import cc.fascinated.bat.features.base.commands.server.MemberCountCommand;
 import cc.fascinated.bat.features.base.commands.server.PremiumCommand;
 import cc.fascinated.bat.features.base.commands.server.channel.ChannelCommand;
 import cc.fascinated.bat.features.base.commands.server.feature.FeatureCommand;
 import cc.fascinated.bat.features.base.commands.utility.PastebinCommand;
+import cc.fascinated.bat.features.base.commands.utility.lookup.LookupCommand;
 import cc.fascinated.bat.service.CommandService;
 import lombok.NonNull;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/cc/fascinated/bat/features/base/commands/fun/EightBallCommand.java

@@ -51,11 +51,10 @@ public class EightBallCommand extends BatCommand {
     @Override
     public void execute(BatGuild guild, @NonNull BatUser user, @NonNull MessageChannel channel, Member member, @NonNull SlashCommandInteraction event) {
         OptionMapping questionOption = event.getOption("question");
-        if (questionOption == null) {
+        assert questionOption != null;
-            return;
-        }
         String question = questionOption.getAsString();
         String response = responses[(int) (Math.random() * responses.length)];
+
         event.replyEmbeds(EmbedUtils.successEmbed()
                         .setDescription("You asked: `%s`\n\n:8ball: The magic 8ball says: `%s`".formatted(question, response))
                         .build())

src/main/java/cc/fascinated/bat/features/base/commands/general/avatar/GuildSubCommand.java

@@ -22,7 +22,6 @@ public class GuildSubCommand extends BatCommand {
     @Override
     public void execute(BatGuild guild, @NonNull BatUser user, @NonNull MessageChannel channel, Member member, @NonNull SlashCommandInteraction event) {
         ImageProxy icon = guild.getDiscordGuild().getIcon();
-
         if (icon == null) {
             event.replyEmbeds(EmbedUtils.errorEmbed()
                             .setDescription("**%s** does not have an avatar!".formatted(guild.getName()))

src/main/java/cc/fascinated/bat/features/base/commands/general/avatar/UserSubCommand.java

@@ -29,15 +29,9 @@ public class UserSubCommand extends BatCommand {
     @Override
     public void execute(BatGuild guild, @NonNull BatUser user, @NonNull MessageChannel channel, Member member, @NonNull SlashCommandInteraction event) {
         OptionMapping userOption = event.getOption("user");
-        if (userOption == null) {
+        assert userOption != null;
-            event.replyEmbeds(EmbedUtils.errorEmbed()
-                            .setDescription("You must provide a user to view the avatar of!")
-                            .build())
-                    .queue();
-            return;
-        }
-
         User target = userOption.getAsUser();
+
         event.replyEmbeds(EmbedUtils.genericEmbed()
                 .setAuthor("%s's Avatar".formatted(target.getName()), null, target.getEffectiveAvatarUrl())
                 .setImage(target.getEffectiveAvatarUrl())

src/main/java/cc/fascinated/bat/features/base/commands/general/banner/UserSubCommand.java

@@ -30,14 +30,7 @@ public class UserSubCommand extends BatCommand {
     @Override
     public void execute(BatGuild guild, @NonNull BatUser user, @NonNull MessageChannel channel, Member member, @NonNull SlashCommandInteraction event) {
         OptionMapping userOption = event.getOption("user");
-        if (userOption == null) {
+        assert userOption != null;
-            event.replyEmbeds(EmbedUtils.errorEmbed()
-                            .setDescription("You must provide a user to view the banner of!")
-                            .build())
-                    .queue();
-            return;
-        }
-
         User target = userOption.getAsUser();
         ImageProxy banner = target.retrieveProfile().complete().getBanner();
         if (banner == null) {

src/main/java/cc/fascinated/bat/features/base/commands/utility/lookup/UserSubCommand.java

@@ -1,7 +1,6 @@
 package cc.fascinated.bat.features.base.commands.utility.lookup;
 
 import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.Category;
 import cc.fascinated.bat.command.CommandInfo;
 import cc.fascinated.bat.common.EmbedDescriptionBuilder;
 import cc.fascinated.bat.common.EmbedUtils;

src/main/java/cc/fascinated/bat/features/birthday/command/MessageSubCommand.java

@@ -33,14 +33,9 @@ public class MessageSubCommand extends BatCommand {
     public void execute(BatGuild guild, @NonNull BatUser user, @NonNull MessageChannel channel, Member member, @NonNull SlashCommandInteraction event) {
         BirthdayProfile profile = guild.getBirthdayProfile();
         OptionMapping messageOption = event.getOption("message");
-        if (messageOption == null) {
+        assert messageOption != null;
-            event.replyEmbeds(EmbedUtils.errorEmbed()
-                    .setDescription("You must provide a message")
-                    .build()).queue();
-            return;
-        }
-
         String message = messageOption.getAsString();
+
         if (message.length() > 2000) {
             event.replyEmbeds(EmbedUtils.errorEmbed()
                     .setDescription("The message must be less than 2000 characters")

src/main/java/cc/fascinated/bat/features/birthday/command/PrivateSubCommand.java

@@ -33,14 +33,9 @@ public class PrivateSubCommand extends BatCommand {
     public void execute(BatGuild guild, @NonNull BatUser user, @NonNull MessageChannel channel, Member member, @NonNull SlashCommandInteraction event) {
         BirthdayProfile profile = guild.getBirthdayProfile();
         OptionMapping enabledOption = event.getOption("enabled");
-        if (enabledOption == null) {
+        assert enabledOption != null;
-            event.replyEmbeds(EmbedUtils.errorEmbed()
-                    .setDescription("You must provide whether your birthday is private or not")
-                    .build()).queue();
-            return;
-        }
-
         boolean enabled = enabledOption.getAsBoolean();
+
         UserBirthday birthday = profile.getBirthday(user.getId());
         if (birthday == null) {
             event.replyEmbeds(EmbedUtils.errorEmbed()

src/main/java/cc/fascinated/bat/features/birthday/command/SetSubCommand.java

@@ -46,13 +46,9 @@ public class SetSubCommand extends BatCommand {
         }
 
         OptionMapping birthdayOption = event.getOption("birthday");
-        if (birthdayOption == null) {
+        assert birthdayOption != null;
-            event.replyEmbeds(EmbedUtils.errorEmbed()
-                    .setDescription("You must provide a birthday")
-                    .build()).queue();
-            return;
-        }
         String birthdayString = birthdayOption.getAsString();
+
         Date birthday = parseBirthday(birthdayString);
         if (birthday == null) {
             event.replyEmbeds(EmbedUtils.errorEmbed()

src/main/java/cc/fascinated/bat/features/counter/command/RemoveSubCommand.java

@@ -34,9 +34,7 @@ public class RemoveSubCommand extends BatCommand {
     @Override
     public void execute(BatGuild guild, @NonNull BatUser user, @NonNull MessageChannel channel, Member member, @NonNull SlashCommandInteraction event) {
         OptionMapping channelOption = event.getOption("channel");
-        if (channelOption == null) {
+        assert channelOption != null;
-            return;
-        }
         GuildChannelUnion targetChannel = channelOption.getAsChannel();
         if (targetChannel.getType() != ChannelType.TEXT) {
             event.replyEmbeds(EmbedUtils.errorEmbed()

src/main/java/cc/fascinated/bat/features/counter/command/SetBreakingSubCommand.java

@@ -34,10 +34,10 @@ public class SetBreakingSubCommand extends BatCommand {
     @Override
     public void execute(BatGuild guild, @NonNull BatUser user, @NonNull MessageChannel channel, Member member, @NonNull SlashCommandInteraction event) {
         OptionMapping channelOption = event.getOption("channel");
+        assert channelOption != null;
         OptionMapping breakableOption = event.getOption("breakable");
-        if (channelOption == null || breakableOption == null) {
+        assert breakableOption != null;
-            return;
+
-        }
         GuildChannelUnion targetChannel = channelOption.getAsChannel();
         if (targetChannel.getType() != ChannelType.TEXT) {
             event.replyEmbeds(EmbedUtils.errorEmbed()

src/main/java/cc/fascinated/bat/features/counter/command/SetSubCommand.java

@@ -34,10 +34,10 @@ public class SetSubCommand extends BatCommand {
     @Override
     public void execute(BatGuild guild, @NonNull BatUser user, @NonNull MessageChannel channel, Member member, @NonNull SlashCommandInteraction event) {
         OptionMapping channelOption = event.getOption("channel");
+        assert channelOption != null;
         OptionMapping countOption = event.getOption("count");
-        if (channelOption == null || countOption == null) {
+        assert countOption != null;
-            return;
+
-        }
         GuildChannelUnion targetChannel = channelOption.getAsChannel();
         if (targetChannel.getType() != ChannelType.TEXT) {
             event.replyEmbeds(EmbedUtils.errorEmbed()

src/main/java/cc/fascinated/bat/features/counter/command/SetupSubCommand.java

@@ -33,10 +33,9 @@ public class SetupSubCommand extends BatCommand {
     @Override
     public void execute(BatGuild guild, @NonNull BatUser user, @NonNull MessageChannel channel, Member member, @NonNull SlashCommandInteraction event) {
         OptionMapping channelOption = event.getOption("channel");
+        assert channelOption != null;
         OptionMapping breakableOption = event.getOption("breakable");
-        if (channelOption == null || breakableOption == null) {
+        assert breakableOption != null;
-            return;
-        }
 
         GuildChannelUnion targetChannel = channelOption.getAsChannel();
         if (targetChannel.getType() != ChannelType.TEXT) {

src/main/java/cc/fascinated/bat/features/drag/command/RequestSubCommand.java

@@ -77,7 +77,7 @@ public class RequestSubCommand extends BatCommand implements EventListener {
         }
 
         OptionMapping userOption = event.getOption("user");
-        if (userOption == null) return;
+        assert userOption != null;
 
         // Check if the user is in a voice channel
         Member target = userOption.getAsMember();

src/main/java/cc/fascinated/bat/features/leveling/command/ChannelSubCommand.java

@@ -37,9 +37,8 @@ public class ChannelSubCommand extends BatCommand {
     @Override
     public void execute(BatGuild guild, @NonNull BatUser user, @NonNull MessageChannel channel, Member member, @NonNull SlashCommandInteraction event) {
         OptionMapping channelOption = event.getOption("channel");
-        if (channelOption == null) {
+        assert channelOption != null;
-            return;
+
-        }
         GuildChannelUnion channelUnion = channelOption.getAsChannel();
         TextChannel textChannel = channelUnion.asTextChannel();
         LevelingProfile profile = guild.getLevelingProfile();

src/main/java/cc/fascinated/bat/features/leveling/command/ResetSubCommand.java

@@ -37,9 +37,8 @@ public class ResetSubCommand extends BatCommand {
     @Override
     public void execute(BatGuild guild, @NonNull BatUser user, @NonNull MessageChannel channel, Member member, @NonNull SlashCommandInteraction event) {
         OptionMapping userOption = event.getOption("user");
-        if (userOption == null) {
+        assert userOption != null;
-            return;
+
-        }
         User target = userOption.getAsUser();
         LevelingProfile profile = guild.getLevelingProfile();
         UserLevel level = profile.getUserLevel(target.getId());

src/main/java/cc/fascinated/bat/features/logging/command/RemoveSubCommand.java

@@ -34,9 +34,8 @@ public class RemoveSubCommand extends BatCommand {
     @Override
     public void execute(BatGuild guild, @NonNull BatUser user, @NonNull MessageChannel channel, Member member, @NonNull SlashCommandInteraction event) {
         OptionMapping typeOption = event.getOption("type");
-        if (typeOption == null) {
+        assert typeOption != null;
-            return;
+
-        }
         String type = typeOption.getAsString();
         LogProfile profile = guild.getLogProfile();
 

src/main/java/cc/fascinated/bat/features/logging/command/SetSubCommand.java

@@ -38,13 +38,10 @@ public class SetSubCommand extends BatCommand {
     @Override
     public void execute(BatGuild guild, @NonNull BatUser user, @NonNull MessageChannel channel, Member member, @NonNull SlashCommandInteraction event) {
         OptionMapping typeOption = event.getOption("type");
-        if (typeOption == null) {
+        assert typeOption != null;
-            return;
-        }
         OptionMapping channelOption = event.getOption("channel");
-        if (channelOption == null) {
+        assert channelOption != null;
-            return;
+
-        }
         String type = typeOption.getAsString();
         TextChannel targetChannel = channelOption.getAsChannel().asTextChannel();
         LogProfile profile = guild.getLogProfile();

src/main/java/cc/fascinated/bat/features/minecraft/command/minecraft/LookupPlayerSubCommand.java

@@ -36,11 +36,9 @@ public class LookupPlayerSubCommand extends BatCommand {
     @Override
     public void execute(BatGuild guild, @NonNull BatUser user, @NonNull MessageChannel channel, Member member, @NonNull SlashCommandInteraction event) {
         OptionMapping playerOption = event.getOption("player");
-        if (playerOption == null) {
+        assert playerOption != null;
-            return;
-        }
-        String player = playerOption.getAsString();
 
+        String player = playerOption.getAsString();
         CachedPlayer cachedPlayer = McUtilsAPI.getPlayer(player);
         if (cachedPlayer == null) {
             event.reply("The player `%s` could not be found".formatted(player)).queue();

src/main/java/cc/fascinated/bat/features/minecraft/command/minecraft/LookupServerSubCommand.java

@@ -40,13 +40,12 @@ public class LookupServerSubCommand extends BatCommand {
     @Override
     public void execute(BatGuild guild, @NonNull BatUser user, @NonNull MessageChannel channel, Member member, @NonNull SlashCommandInteraction event) {
         OptionMapping platformOption = event.getOption("platform");
+        assert platformOption != null;
         OptionMapping hostOption = event.getOption("host");
-        if (platformOption == null || hostOption == null) {
+        assert hostOption != null;
-            return;
+
-        }
         String platform = platformOption.getAsString();
         String host = hostOption.getAsString();
-
         MinecraftServer server;
         try {
             if (platform.equalsIgnoreCase("java")) {

src/main/java/cc/fascinated/bat/features/minecraft/command/serverwatcher/AddSubCommand.java

@@ -43,16 +43,16 @@ public class AddSubCommand extends BatCommand {
     @Override
     public void execute(BatGuild guild, @NonNull BatUser user, @NonNull MessageChannel channel, Member member, @NonNull SlashCommandInteraction event) {
         OptionMapping platformOption = event.getOption("platform");
+        assert platformOption != null;
         OptionMapping hostOption = event.getOption("host");
+        assert hostOption != null;
         OptionMapping channelOption = event.getOption("channel");
-        if (platformOption == null || hostOption == null || channelOption == null) {
+        assert channelOption != null;
-            return;
+
-        }
         String platform = platformOption.getAsString();
         String host = hostOption.getAsString();
         GuildChannelUnion channelUnion = channelOption.getAsChannel();
         TextChannel textChannel = channelUnion.asTextChannel();
-
         MinecraftServer server;
         try {
             if (platform.equalsIgnoreCase("java")) {

src/main/java/cc/fascinated/bat/features/minecraft/command/serverwatcher/RemoveSubCommand.java

@@ -38,10 +38,10 @@ public class RemoveSubCommand extends BatCommand {
     @Override
     public void execute(BatGuild guild, @NonNull BatUser user, @NonNull MessageChannel channel, Member member, @NonNull SlashCommandInteraction event) {
         OptionMapping platformOption = event.getOption("platform");
+        assert platformOption != null;
         OptionMapping hostOption = event.getOption("host");
-        if (platformOption == null || hostOption == null) {
+        assert hostOption != null;
-            return;
+
-        }
         String platform = platformOption.getAsString();
         String host = hostOption.getAsString();
 

src/main/java/cc/fascinated/bat/features/moderation/command/PurgeCommand.java

@@ -36,9 +36,8 @@ public class PurgeCommand extends BatCommand {
     @Override
     public void execute(BatGuild guild, @NonNull BatUser user, @NonNull MessageChannel channel, Member member, @NonNull SlashCommandInteraction event) {
         OptionMapping amountOption = event.getOption("amount");
-        if (amountOption == null) {
+        assert amountOption != null;
-            return;
+
-        }
         int amount = amountOption.getAsInt();
         if (amount < 2 || amount > 100) {
             event.replyEmbeds(EmbedUtils.errorEmbed()

src/main/java/cc/fascinated/bat/features/reminder/command/SetSubCommand.java

@@ -45,13 +45,9 @@ public class SetSubCommand extends BatCommand {
         }
 
         OptionMapping reminderOption = event.getOption("reminder");
-        if (reminderOption == null) {
+        assert reminderOption != null;
-            return;
-        }
         OptionMapping timeOption = event.getOption("time");
-        if (timeOption == null) {
+        assert timeOption != null;
-            return;
-        }
 
         String reminderText = reminderOption.getAsString();
         long time = TimeUtils.fromString(timeOption.getAsString());

src/main/java/cc/fascinated/bat/features/scoresaber/command/scoresaber/LinkSubCommand.java

@@ -33,17 +33,10 @@ public class LinkSubCommand extends BatCommand {
 
     @Override
     public void execute(BatGuild guild, @NonNull BatUser user, @NonNull MessageChannel channel, Member member, @NonNull SlashCommandInteraction event) {
-        OptionMapping option = event.getOption("link");
+        OptionMapping linkOption = event.getOption("link");
-        if (option == null) {
+        assert linkOption != null;
-            event.replyEmbeds(EmbedUtils.errorEmbed()
-                    .setDescription("Please provide a ScoreSaber profile link")
-                    .build())
-                    .setEphemeral(true)
-                    .queue();
-            return;
-        }
 
-        String link = option.getAsString();
+        String link = linkOption.getAsString();
         if (!link.contains("scoresaber.com/u/")) {
             event.replyEmbeds(EmbedUtils.errorEmbed()
                     .setDescription("Invalid ScoreSaber profile link")

src/main/java/cc/fascinated/bat/features/scoresaber/command/scoresaber/UserSubCommand.java

@@ -35,11 +35,10 @@ public class UserSubCommand extends BatCommand {
 
     @Override
     public void execute(BatGuild guild, @NonNull BatUser user, @NonNull MessageChannel channel, Member member, @NonNull SlashCommandInteraction event) {
-        OptionMapping option = event.getOption("user");
+        OptionMapping userOption = event.getOption("user");
-        if (option == null) {
+        assert userOption != null;
-            return;
+
-        }
+        BatUser target = userService.getUser(userOption.getAsUser().getId());
-        BatUser target = userService.getUser(option.getAsUser().getId());
         if (target == null) {
             event.replyEmbeds(EmbedUtils.errorEmbed()
                             .setDescription("Unknown user")