Fix help command, links to source code properly again

Author: duncte123

bot/src/main/java/ml/duncte123/skybot/commands/uncategorized/HelpCommand.java

@@ -29,7 +29,6 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 
 import static me.duncte123.botcommons.messaging.MessageUtils.sendEmbed;
 import static me.duncte123.botcommons.messaging.MessageUtils.sendMsg;
@@ -70,19 +69,20 @@ public void execute(@Nonnull CommandContext ctx) {
         sendHelp(ctx, HelpEmbeds.generateCommandEmbed(prefix, null));
     }
 
-    @SuppressWarnings("ConstantConditions")
     private boolean isCategory(String name) {
         try {
-            final List<CommandCategory> categoryList = Arrays.stream(CommandCategory.values()).filter(it -> name
-                .equalsIgnoreCase(it.getSearch())).collect(Collectors.toList());
+            final List<CommandCategory> categoryList = Arrays.stream(CommandCategory.values())
+                .filter(it -> name.equalsIgnoreCase(it.getSearch()))
+                .toList();
 
             if (!categoryList.isEmpty()) {
                 return true;
             }
 
-            return CommandCategory.valueOf(name.toUpperCase()) != null;
-        }
-        catch (IllegalArgumentException ignored) {
+            // throws exception if not found
+            CommandCategory.valueOf(name.toUpperCase());
+            return true;
+        } catch (IllegalArgumentException ignored) {
             return false;
         }
     }
@@ -100,7 +100,7 @@ private void sendHelp(CommandContext ctx, EmbedBuilder embed) {
 
     private void sendCommandHelp(CommandContext ctx, String toSearch, CommandManager manager, String prefix) {
 
-        final ICommand cmd = manager.getCommand(toSearch);
+        final ICommand<CommandContext> cmd = manager.getCommand(toSearch);
 
         if (cmd != null) {
             sendCommandHelpMessage(ctx, (Command) cmd, prefix, toSearch);
@@ -117,7 +117,7 @@ private void sendCommandHelpMessage(CommandContext ctx, Command cmd, String pref
         final boolean isKotlin = isKotlin(commandClass);
         final String extension = isKotlin ? ".kt" : ".java";
         final String type = isKotlin ? "kotlin" : "java";
-        final String url = String.format("https://github.com/DuncteBot/SkyBot/blob/master/src/main/%s/%s%s", type, clsPath, extension);
+        final String url = String.format("https://github.com/DuncteBot/SkyBot/blob/main/bot/src/main/%s/%s%s", type, clsPath, extension);
 
         final EmbedBuilder builder = EmbedUtils
             .getDefaultEmbed()

bot/src/main/java/ml/duncte123/skybot/utils/HelpEmbeds.java

@@ -68,7 +68,7 @@ public static EmbedBuilder generateCommandEmbed(@Nonnull String prefix, @Nullabl
                 "Privacy policy: [duncte.bot/privacy](https://duncte.bot/privacy)", false);
     }
 
-    /// <editor-fold desc="Reflection magic" defaultstate="collapsed">
+    /// <editor-fold desc="Init junk" defaultstate="collapsed">
     public static void init(final CommandManager manager) {
         final CommandCategory[] categories = CommandCategory.values();
 
@@ -81,7 +81,7 @@ public static void init(final CommandManager manager) {
                 final List<String> cmds = new ArrayList<>();
                 final List<ICommand<CommandContext>> foundCommands = manager.getCommands(category);
 
-                for (final ICommand command : foundCommands) {
+                for (final ICommand<?> command : foundCommands) {
                     cmds.add(command.getName());
 
                     if (command.shouldDisplayAliasesInHelp()) {
@@ -150,9 +150,9 @@ private static MessageEmbed.Field getFieldForCategory(CommandCategory category)
             INLINE
         );
     }
-    /// </editor-fold>
 
     private static String joinCommands(List<String> cmdNames) {
         return "`" + String.join("` | `", cmdNames) + "`";
     }
+    /// </editor-fold>
 }