fixing bugs with arguments and cooldown

Author: HerrMagiic

CustomCommands/Services/CooldownManager.cs

@@ -1,6 +1,7 @@
 using System.Text.Json;
 using CounterStrikeSharp.API.Core;
 using CustomCommands.Model;
+using Microsoft.Extensions.Logging;
 
 namespace CustomCommands.Interfaces;
 
@@ -38,8 +39,15 @@ public bool IsCommandOnCooldownWithCondition(Func<CooldownTimer, bool> predicate
         if (index != -1)
         {
             string timeleft = PluginGlobals.CooldownTimer[index].CooldownTime.Subtract(DateTime.Now).Seconds.ToString();
-            player.PrintToChat($"{PluginGlobals.Config.Prefix}{cmd.Cooldown.CooldownMessage.Replace("{TIME}", timeleft) 
-                ?? $"This command is for {timeleft} seconds on cooldown"}");
+            string message = "";
+
+            // Check if cmd.Cooldown is a Cooldown object
+            if (cmd.Cooldown is Cooldown cooldown)
+                message = cooldown.CooldownMessage.Replace("{TIME}", timeleft);
+            else
+                message = $"This command is for {timeleft} seconds on cooldown";
+
+            player.PrintToChat($"{PluginGlobals.Config.Prefix}{message}");
 
             return true;
         }
@@ -61,12 +69,14 @@ public void AddToCooldownList(bool isGlobal, int playerID, Guid commandID, int c
             CommandID = commandID, 
             CooldownTime = DateTime.Now.AddSeconds(cooldownTime)
         };
-
+        Console.WriteLine("Cooldown 2");
         if (isGlobal)
         {
+            Console.WriteLine("Cooldown 3");
             int index = PluginGlobals.CooldownTimer.FindIndex(x => 
                 x.IsGlobal == true 
                 && x.CommandID == commandID);
+
             if (index != -1)
                 PluginGlobals.CooldownTimer[index].CooldownTime = timer.CooldownTime;
             else
@@ -97,17 +107,19 @@ public void SetCooldown(CCSPlayerController player, Commands cmd)
             switch (jsonElement.ValueKind)
             {
                 case JsonValueKind.Number:
-                    int cooldown = (int)cmd.Cooldown;
+
+                    int cooldown = cmd.Cooldown.GetInt32();
                     if (cooldown == 0) 
                         break;
 
                     AddToCooldownList(false, player.UserId ?? 0, cmd.ID, cooldown);
                     break;
 
                 case JsonValueKind.Object:
-                    Cooldown cooldownObject = (Cooldown)cmd.Cooldown;
 
+                    var cooldownObject = JsonSerializer.Deserialize<Cooldown>(cmd.Cooldown.GetRawText());
                     AddToCooldownList(cooldownObject.IsGlobal, player.UserId ?? 0, cmd.ID, cooldownObject.CooldownTime);
+                    
                     break;
 
                 default:

CustomCommands/Services/RegisterCommands.cs

@@ -1,3 +1,4 @@
+using System.Text.Json;
 using CounterStrikeSharp.API.Core.Plugin;
 using CustomCommands.Interfaces;
 using CustomCommands.Model;
@@ -33,16 +34,28 @@ public void AddCommands(Commands com)
 
         for (int i = 0; i < aliases.Length; i++)
         {
-            plugin.AddCommand(aliases[i], com.Description, (player, info) =>
+            string alias = aliases[i];
+            plugin.AddCommand(alias, com.Description, (player, info) =>
             {
                 if (player == null) return;
 
                 var command = com;
-                
+
+                // Check if the command has arguments and if it does, check if the command exists and is the right one
                 if (info.ArgCount > 1)
-                    command = PluginGlobals.CustomCommands.Find(x => x.Command.Contains(aliases[i])) ?? com;
+                {
+                    var findcommand = PluginGlobals.CustomCommands.Find(x => x.Command.Contains(alias + $" {info.ArgString}"));
+                    // Check if the command is the right one with the right arguments
+                    if (findcommand! != command)
+                        return;
+
+                    command = findcommand;
+                }
+                // This will exit the command if the command has arguments but the client didn't provide any
+                if (command!.Command.Contains(alias + " ") && info.ArgCount <= 1) 
+                    return;
 
-                if (command.Permission.PermissionList.Count > 0 && command.Permission != null)
+                if (command!.Permission.PermissionList.Count > 0 && command.Permission != null)
                     if (!PluginUtilities.RequiresPermissions(player, command.Permission)) 
                         return;
 

CustomCommands/test.md

@@ -1,11 +1,11 @@
 ## Test this:
 
-* [ ] Test tag support for server commands
-* [ ] check if USERID tag is the right one from the console
-* [ ] check if the string pattern check works
-* [ ] check cooldown funktion for normal int and than object
-* [ ] check if padleft color tag works now
-  * [ ] If this works remove all spaced in the example files with color tags
-* [ ] check if command args works
+* [X] Test tag support for server commands
+* [X] check if USERID tag is the right one from the console
+* [X] check if the string pattern check works
+* [X] check cooldown funktion for normal int and than object
+* [X] check if padleft color tag works now
+  * [X] If this works remove all spaced in the example files with color tags
+* [X] check if command args works
   * [ ] check if duplicated commands still wont work with this feature
-* [ ] check if toggle feature works
+* [X] check if toggle feature works

Examples/Colors.json

@@ -3,14 +3,14 @@
         "Title": "Rainbow",
         "Description": "rainbow command",
         "Command": "rainbow",
-        "Message": " {RED}R{ORANGE}A{YELLOW}I{GREEN}N{BLUE}B{DARKBLUE}O{PURPLE}W", 
+        "Message": "{RED}R{ORANGE}A{YELLOW}I{GREEN}N{BLUE}B{DARKBLUE}O{PURPLE}W", 
         "PrintTo": 0
     },
     {
         "Title": "All Colors",
         "Description": "This command displays all the colors that are available to use in the chat.",
         "Command": "colors",
-        "Message": "{DEFAULT}1, {WHITE}2 \n {DARKRED}3, {RED}4, {LIGHTRED}5\n {GREEN}6, {LIME}7, {OLIVE}8\n {ORANGE}9, {GOLD}10, {YELLOW}11\n {BLUE}12, {DARKBLUE}13\n {LIGHTPURPLE}14 {PURPLE}15 \n, {GREY}18",
+        "Message": "{DEFAULT}1, {WHITE}2 \n{DARKRED}3, {RED}4, {LIGHTRED}5\n{GREEN}6, {LIME}7, {OLIVE}8\n{ORANGE}9, {GOLD}10, {YELLOW}11\n{BLUE}12, {DARKBLUE}13\n{LIGHTPURPLE}14 {PURPLE}15 \n,{GREY}18",
         "PrintTo": 0
     }
 ]

Examples/MulitpleAliasesForOneCommand.json

@@ -2,7 +2,7 @@
     {
         "Title": "Discord",
         "Description": "Command for Discord link",
-        "Command": "discord,dc,Discord", // User can type !discord or /discord, !dc or /dc and !Discord or /discord in chat
+        "Command": "discord,dc", // User can type !discord or /discord, !dc or /dc and !Discord or /discord in chat
         "Message": "{PREFIX}Discord: https://discord.gg/Z9JfJ9Y57C",
         "PrintTo": 0
     }