feat(scripting/commands): RegisterRawAlias

Author: skuzzis

src/commands/CommandsManager.cpp

@@ -60,25 +60,32 @@ Command *CommandsManager::FetchCommand(std::string cmd)
     return this->commands.at(cmd);
 }
 
-void CommandsManager::RegisterCommand(std::string plugin_name, std::string cmd, Command *command)
+void CommandsManager::RegisterCommand(std::string plugin_name, std::string cmd, Command *command, bool registerRaw)
 {
-    if (this->commands.find(cmd) != this->commands.end())
-        return;
 
-    this->commands.insert({cmd, command});
-    this->commandAliases.insert({cmd, {}});
+    if (!registerRaw)
+    {
+        if (this->commands.find(cmd) != this->commands.end())
+            return;
+
+        this->commands.insert({cmd, command});
+        this->commandAliases.insert({cmd, {}});
 
-    if (this->commandsByPlugin.find(plugin_name) == this->commandsByPlugin.end())
-        this->commandsByPlugin.insert({plugin_name, {}});
+        if (this->commandsByPlugin.find(plugin_name) == this->commandsByPlugin.end())
+            this->commandsByPlugin.insert({plugin_name, {}});
+
+        this->commandsByPlugin[plugin_name].push_back(cmd);
+    }
 
-    this->commandsByPlugin[plugin_name].push_back(cmd);
+    if (!registerRaw)
+        cmd = "sw_" + cmd;
 
     if (conCommandCreated.find(cmd) == conCommandCreated.end())
     {
         conCommandCreated.insert({cmd, true});
 
         ConCommandRefAbstract commandRef;
-        new ConCommand(&commandRef, ("sw_" + cmd).c_str(), commandsCallback, "Swiftly Command", (1 << 25) | (1 << 0) | (1 << 24));
+        new ConCommand(&commandRef, cmd.c_str(), commandsCallback, "Swiftly Command", (1 << 25) | (1 << 0) | (1 << 24));
     }
 }
 
@@ -109,7 +116,7 @@ static void commandsCallback(const CCommandContext &context, const CCommand &arg
     CCommand tokenizedArgs;
     tokenizedArgs.Tokenize(args.GetCommandString());
 
-    std::string commandName = (tokenizedArgs[0] + 3);
+    std::string commandName = (starts_with(tokenizedArgs[0], "sw_") ? (tokenizedArgs[0] + 3) : tokenizedArgs[0]);
 
     std::vector<std::string> argsplit;
     for (int i = 1; i < tokenizedArgs.ArgC(); i++)

src/commands/CommandsManager.h

@@ -23,7 +23,7 @@ class CommandsManager
     int HandleCommand(Player *player, std::string text);
 
     Command *FetchCommand(std::string cmd);
-    void RegisterCommand(std::string plugin_name, std::string cmd, Command *command);
+    void RegisterCommand(std::string plugin_name, std::string cmd, Command *command, bool registerRaw = false);
     void UnregisterCommand(std::string cmd);
 
     std::vector<std::string> FetchCommandsByPlugin(std::string plugin_name)

src/plugins/core/scripting.h

@@ -310,6 +310,7 @@ class PluginCommands
     void RegisterCommand(std::string commandName, void *callback);
     void UnregisterCommand(std::string commandName);
 
+    void RegisterRawAlias(std::string commandName, std::string aliasName);
     void RegisterAlias(std::string commandName, std::string aliasName);
     void UnregisterAlias(std::string aliasName);
 

src/plugins/core/scripting/commands.cpp

@@ -29,6 +29,15 @@ void PluginCommands::RegisterAlias(std::string commandName, std::string aliasNam
     g_commandsManager->RegisterCommand(command->GetPluginName(), aliasName, command);
 }
 
+void PluginCommands::RegisterRawAlias(std::string commandName, std::string aliasName)
+{
+    Command *command = g_commandsManager->FetchCommand(commandName);
+    if (!command)
+        return;
+
+    g_commandsManager->RegisterCommand(command->GetPluginName(), aliasName, command, true);
+}
+
 void PluginCommands::UnregisterAlias(std::string aliasName)
 {
     UnregisterCommand(aliasName);

src/plugins/lua/scripting/commands.cpp

@@ -7,6 +7,7 @@ void SetupLuaCommands(LuaPlugin *plugin, lua_State *state)
         .addConstructor<void (*)(std::string)>()
         .addFunction("Register", &PluginCommands::RegisterCommandLua)
         .addFunction("Unregister", &PluginCommands::UnregisterCommand)
+        .addFunction("RegisterRawAlias", &PluginCommands::RegisterRawAlias)
         .addFunction("RegisterAlias", &PluginCommands::RegisterAlias)
         .addFunction("UnregisterAlias", &PluginCommands::UnregisterAlias)
         .endClass();