From e8ecea64bb1e8fffb440a12a1e46db2b78868fa4 Mon Sep 17 00:00:00 2001
From: Vankka <vankka.main@gmail.com>
Date: Tue, 12 Apr 2022 12:39:06 +0300
Subject: [PATCH] Fix commodore suggestions not working

---
 .../game/handler/CommodoreHandler.java        | 58 +++++++++++++------
 1 file changed, 40 insertions(+), 18 deletions(-)

diff --git a/bukkit/src/main/java/com/discordsrv/bukkit/command/game/handler/CommodoreHandler.java b/bukkit/src/main/java/com/discordsrv/bukkit/command/game/handler/CommodoreHandler.java
index 772a22b4..0930f473 100644
--- a/bukkit/src/main/java/com/discordsrv/bukkit/command/game/handler/CommodoreHandler.java
+++ b/bukkit/src/main/java/com/discordsrv/bukkit/command/game/handler/CommodoreHandler.java
@@ -21,38 +21,35 @@ package com.discordsrv.bukkit.command.game.handler;
 import com.discordsrv.bukkit.BukkitDiscordSRV;
 import com.discordsrv.common.command.game.abstraction.GameCommand;
 import com.discordsrv.common.command.game.handler.util.BrigadierUtil;
-import com.mojang.brigadier.tree.CommandNode;
+import com.discordsrv.common.command.game.sender.ICommandSender;
 import com.mojang.brigadier.tree.LiteralCommandNode;
 import me.lucko.commodore.Commodore;
 import me.lucko.commodore.CommodoreProvider;
 import org.bukkit.command.PluginCommand;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.function.Function;
+
 /**
  * No avoiding basic handler on bukkit. Unfortunately it isn't possible to use brigadier for executing.
  */
 public class CommodoreHandler extends AbstractBukkitCommandExecutor {
 
     private final Commodore commodore;
+    private final Function<?, ICommandSender> senderFunction;
 
     public CommodoreHandler(BukkitDiscordSRV discordSRV) {
         super(discordSRV);
         this.commodore = CommodoreProvider.getCommodore(discordSRV.plugin());
+        this.senderFunction = wrapper -> sender(commodore.getBukkitSender(wrapper));
     }
 
     @Override
     public void registerCommand(GameCommand command) {
         logger.debug("Registering command " + command.getLabel() + " with commodore");
 
-        LiteralCommandNode<?> argumentBuilder = BrigadierUtil.convertToBrigadier(
-                command,
-                wrapper -> sender(commodore.getBukkitSender(wrapper))
-        );
-        CommandNode<?> redirection = argumentBuilder.getRedirect();
-        if (redirection != null) {
-            // Commodore handles the label being different fine
-            argumentBuilder = (LiteralCommandNode<?>) redirection;
-        }
-
         PluginCommand pluginCommand = command(command);
         if (pluginCommand == null) {
             logger.error("Failed to create command " + command.getLabel());
@@ -62,12 +59,37 @@ public class CommodoreHandler extends AbstractBukkitCommandExecutor {
         handler.registerCommand(command);
         pluginCommand.setExecutor(this);
 
-        String requiredPermission = command.getRequiredPermission();
-        LiteralCommandNode<?> finalArgumentBuilder = argumentBuilder;
-        discordSRV.scheduler().runOnMainThread(() -> commodore.register(
-                pluginCommand,
-                finalArgumentBuilder,
-                player -> requiredPermission == null || player.hasPermission(requiredPermission)
-        ));
+        List<LiteralCommandNode<?>> nodes = getAliases(command, pluginCommand);
+        discordSRV.scheduler().runOnMainThread(() -> {
+            for (LiteralCommandNode<?> node : nodes) {
+                commodore.register(node);
+            }
+        });
+    }
+
+    private List<LiteralCommandNode<?>> getAliases(GameCommand command, PluginCommand pluginCommand) {
+        String commandName = pluginCommand.getName();
+        String pluginName = pluginCommand.getPlugin().getName().toLowerCase(Locale.ROOT);
+
+        List<String> allAliases = new ArrayList<>();
+        allAliases.add(commandName);
+        allAliases.addAll(pluginCommand.getAliases());
+
+        List<LiteralCommandNode<?>> nodes = new ArrayList<>();
+        for (String alias : allAliases) {
+            if (alias.equals(commandName)) {
+                LiteralCommandNode<?> node = BrigadierUtil.convertToBrigadier(command, senderFunction);
+                if (node.getRedirect() != null) {
+                    throw new IllegalStateException("Cannot register a redirected node!");
+                }
+                nodes.add(node);
+            } else {
+                nodes.add(BrigadierUtil.convertToBrigadier(GameCommand.literal(alias).redirect(command), senderFunction));
+            }
+
+            // plugin:command
+            nodes.add(BrigadierUtil.convertToBrigadier(GameCommand.literal(pluginName + ":" + alias).redirect(command), senderFunction));
+        }
+        return nodes;
     }
 }