Merge 9d86315 into a903413

HerrMagiic · web-flow · commit 5a48cc036e19 · 2024-02-02T20:34:44.000+01:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -25,7 +25,7 @@ jobs:
       run: dotnet build ./CustomCommands/CustomCommands.csproj --configuration Release --no-restore
 
     - name: Publish
-      run: dotnet publish --configuration Release --no-build --output ./out
+      run: dotnet publish ./CustomCommands/CustomCommands.csproj --configuration Release --no-build --output ./out
 
     - name: Zip artifacts
       run: |
diff --git a/CustomCommands/.gitignore b/CustomCommands/.gitignore
@@ -1,3 +1,5 @@
 /.vs
 /bin
-/obj
+/obj
+
+TestingCommands.json
diff --git a/CustomCommands/Interfaces/IPluginUtilities.cs b/CustomCommands/Interfaces/IPluginUtilities.cs
@@ -8,5 +8,4 @@ public interface IPluginUtilities
     string[] SplitStringByCommaOrSemicolon(string str);
     void ExecuteServerCommands(Commands cmd, CCSPlayerController player);
     bool RequiresPermissions(CCSPlayerController player, Permission permissions);
-    string PadLeftColorTag(string input);
 }
diff --git a/CustomCommands/Services/CooldownManager.cs b/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:
diff --git a/CustomCommands/Services/LoadJson.cs b/CustomCommands/Services/LoadJson.cs
@@ -18,10 +18,11 @@ public List<Commands> GetCommandsFromJsonFiles(string path)
     {
         var comms = new List<Commands>();
 
+        string defaultconfigpath = Path.Combine(path, "Commands.json");
+
         CheckForExampleFile(path);
 
         var pathofcommands = Path.Combine(path, "Commands");
-        var defaultconfigpath = Path.Combine(path, "Commands.json");
 
         var files = new List<string>();
 
@@ -34,7 +35,6 @@ public List<Commands> GetCommandsFromJsonFiles(string path)
             files.Add(defaultconfigpath);
             Logger.LogInformation("Found default config file.");
         }
-        //
         else if (!File.Exists(defaultconfigpath) && files.Count == 0)
         {
             Logger.LogWarning("No Config file found. Please create plugins/CustomCommands/Commands.json or in plugins/CustomCommands/Commands/<name>.json");
@@ -58,14 +58,20 @@ public List<Commands> GetCommandsFromJsonFiles(string path)
     // Check if the Command.json file exists. If not replace it with the example file
     public void CheckForExampleFile(string path)
     {
+        if (Directory.Exists(Path.Combine(path, "Commands")))
+        {
+            var files = Directory.GetFiles(Path.Combine(path, "Commands"), "*.json", SearchOption.AllDirectories);
+            if (files.Length > 0)
+                return;
+        }
+
         var defaultconfigpath = Path.Combine(path, "Commands.json");
         var exampleconfigpath = Path.Combine(path, "Commands.example.json");
         if (!File.Exists(defaultconfigpath))
         {
             File.Copy(exampleconfigpath, defaultconfigpath);
             Logger.LogInformation("Created default config file.");
         }
-        
     }
     public bool IsValidJsonSyntax(string path)
     {
diff --git a/CustomCommands/Services/PluginUtilities.cs b/CustomCommands/Services/PluginUtilities.cs
@@ -98,41 +98,4 @@ public bool RequiresPermissions(CCSPlayerController player, Permission permissio
             return true;
         }
     }
-    /// <summary>
-    /// Moves the color tag one space the the left if it's not already there.
-    /// Because the game doesn't support color tags at the start of a string.
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    public string PadLeftColorTag(string input)
-    {
-        string[] colorTagList = new string[] {
-            "{DEFAULT}",
-            "{WHITE}",
-            "{DARKRED}",
-            "{RED}",
-            "{LIGHTRED}",
-            "{GREEN}",
-            "{LIME}",
-            "{OLIVE}",
-            "{ORANGE}",
-            "{GOLD}",
-            "{YELLOW}",
-            "{BLUE}",
-            "{DARKBLUE}",
-            "{LIGHTPURPLE}",
-            "{PURPLE}",
-            "{SILVER}",
-            "{BLUEGREY}",
-            "{GREY}",
-        };
-        foreach (var colorTag in colorTagList)
-        {
-            if (input.StartsWith(colorTag))
-            {
-                return " " + input;
-            }
-        }
-        return input;
-    }
 }
diff --git a/CustomCommands/Services/RegisterCommands.cs b/CustomCommands/Services/RegisterCommands.cs
@@ -1,3 +1,4 @@
+using System.Text.Json;
 using CounterStrikeSharp.API.Core.Plugin;
 using CustomCommands.Interfaces;
 using CustomCommands.Model;
@@ -33,17 +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;
-                if (info.ArgCount > 0)
+
+                // 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;
             
@@ -70,12 +82,12 @@ public List<Commands> CheckForDuplicateCommands(List<Commands> comms)
 
             foreach (var alias in aliases)
             {
-                if (commandNames.Contains(alias))
+                if (commandNames.Contains(alias.ToLower()))
                 {
                     duplicateCommands.Add(com);
                     continue;
                 }
-                commandNames.Add(alias);
+                commandNames.Add(alias.ToLower());
             }
         }
         
diff --git a/CustomCommands/Services/ReplaceTagsFunction.cs b/CustomCommands/Services/ReplaceTagsFunction.cs
@@ -15,15 +15,13 @@ public class ReplaceTagsFunctions : IReplaceTagsFunctions
     private readonly IPluginGlobals PluginGlobals;
     private readonly PluginContext PluginContext;
     private readonly ILogger<CustomCommands> Logger;
-    private readonly IPluginUtilities PluginUtilities;
     
     public ReplaceTagsFunctions(IPluginGlobals PluginGlobals, IPluginContext PluginContext, 
-                                    ILogger<CustomCommands> Logger, IPluginUtilities PluginUtilities)
+                                    ILogger<CustomCommands> Logger)
     {
         this.PluginGlobals = PluginGlobals;
         this.PluginContext = (PluginContext as PluginContext)!;
         this.Logger = Logger;
-        this.PluginUtilities = PluginUtilities;
     }
 
     public string[] ReplaceTags(string[] input, CCSPlayerController player)
@@ -96,7 +94,7 @@ public string ReplaceMessageTags(string input, CCSPlayerController player)
     public string ReplaceColorTags(string input)
     {
         // PadLeft the color tag if it's not already there because the game doesn't support color tags at the start of a string.
-        input = PluginUtilities.PadLeftColorTag(input);
+        input = PadLeftColorTag(input);
 
         Dictionary<string, string> replacements = new()
         {
@@ -164,4 +162,42 @@ public string[] WrappedLine(dynamic input)
 
         return output.ToArray();
     }
+
+    /// <summary>
+    /// Moves the color tag one space the the left if it's not already there.
+    /// Because the game doesn't support color tags at the start of a string.
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    private string PadLeftColorTag(string input)
+    {
+        string[] colorTagList = new string[] {
+            "{DEFAULT}",
+            "{WHITE}",
+            "{DARKRED}",
+            "{RED}",
+            "{LIGHTRED}",
+            "{GREEN}",
+            "{LIME}",
+            "{OLIVE}",
+            "{ORANGE}",
+            "{GOLD}",
+            "{YELLOW}",
+            "{BLUE}",
+            "{DARKBLUE}",
+            "{LIGHTPURPLE}",
+            "{PURPLE}",
+            "{SILVER}",
+            "{BLUEGREY}",
+            "{GREY}",
+        };
+        foreach (var colorTag in colorTagList)
+        {
+            if (input.StartsWith(colorTag))
+            {
+                return " " + input;
+            }
+        }
+        return input;
+    }
 }
diff --git a/CustomCommands/test.md b/CustomCommands/test.md
@@ -1,15 +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
-
-
-
-test
+* [X] check if toggle feature works
diff --git a/Examples/Colors.json b/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
     }
 ]
diff --git a/Examples/MulitpleAliasesForOneCommand.json b/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
     }
diff --git a/Examples/Tags.json b/Examples/Tags.json
@@ -75,5 +75,12 @@
         "Command": "playercount",
         "Message": "Current playercount: {PLAYERS}",
         "PrintTo": 0
+    },
+    {
+        "Title": "UserID",
+        "Description": "Displays Player #userid",
+        "Command": "userid",
+        "Message": "Current players userid: {USERID}",
+        "PrintTo": 0
     }
 ]

-Original file line number
+Diff line change
 /.vs
 /bin
 -/obj
 +/obj
++
 +TestingCommands.json
Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,4 @@ public interface IPluginUtilities`
`8`	`8`	`string[] SplitStringByCommaOrSemicolon(string str);`
`9`	`9`	`void ExecuteServerCommands(Commands cmd, CCSPlayerController player);`
`10`	`10`	`bool RequiresPermissions(CCSPlayerController player, Permission permissions);`
`11`		`- string PadLeftColorTag(string input);`
`12`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,10 +18,11 @@ public List<Commands> GetCommandsFromJsonFiles(string path)`
`18`	`18`	`{`
`19`	`19`	`var comms = new List<Commands>();`
`20`	`20`
	`21`	`+ string defaultconfigpath = Path.Combine(path, "Commands.json");`
	`22`	`+`
`21`	`23`	`CheckForExampleFile(path);`
`22`	`24`
`23`	`25`	`var pathofcommands = Path.Combine(path, "Commands");`
`24`		`- var defaultconfigpath = Path.Combine(path, "Commands.json");`
`25`	`26`
`26`	`27`	`var files = new List<string>();`
`27`	`28`
`@@ -34,7 +35,6 @@ public List<Commands> GetCommandsFromJsonFiles(string path)`
`34`	`35`	`files.Add(defaultconfigpath);`
`35`	`36`	`Logger.LogInformation("Found default config file.");`
`36`	`37`	`}`
`37`		`- //`
`38`	`38`	`else if (!File.Exists(defaultconfigpath) && files.Count == 0)`
`39`	`39`	`{`
`40`	`40`	`Logger.LogWarning("No Config file found. Please create plugins/CustomCommands/Commands.json or in plugins/CustomCommands/Commands/<name>.json");`
`@@ -58,14 +58,20 @@ public List<Commands> GetCommandsFromJsonFiles(string path)`
`58`	`58`	`// Check if the Command.json file exists. If not replace it with the example file`
`59`	`59`	`public void CheckForExampleFile(string path)`
`60`	`60`	`{`
	`61`	`+ if (Directory.Exists(Path.Combine(path, "Commands")))`
	`62`	`+ {`
	`63`	`+ var files = Directory.GetFiles(Path.Combine(path, "Commands"), "*.json", SearchOption.AllDirectories);`
	`64`	`+ if (files.Length > 0)`
	`65`	`+ return;`
	`66`	`+ }`
	`67`	`+`
`61`	`68`	`var defaultconfigpath = Path.Combine(path, "Commands.json");`
`62`	`69`	`var exampleconfigpath = Path.Combine(path, "Commands.example.json");`
`63`	`70`	`if (!File.Exists(defaultconfigpath))`
`64`	`71`	`{`
`65`	`72`	`File.Copy(exampleconfigpath, defaultconfigpath);`
`66`	`73`	`Logger.LogInformation("Created default config file.");`
`67`	`74`	`}`
`68`		`-`
`69`	`75`	`}`
`70`	`76`	`public bool IsValidJsonSyntax(string path)`
`71`	`77`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+using System.Text.Json;`
`1`	`2`	`using CounterStrikeSharp.API.Core.Plugin;`
`2`	`3`	`using CustomCommands.Interfaces;`
`3`	`4`	`using CustomCommands.Model;`
`@@ -33,17 +34,28 @@ public void AddCommands(Commands com)`
`33`	`34`
`34`	`35`	`for (int i = 0; i < aliases.Length; i++)`
`35`	`36`	`{`
`36`		`- plugin.AddCommand(aliases[i], com.Description, (player, info) =>`
	`37`	`+ string alias = aliases[i];`
	`38`	`+ plugin.AddCommand(alias, com.Description, (player, info) =>`
`37`	`39`	`{`
`38`	`40`	`if (player == null) return;`
`39`	`41`
`40`	`42`	`var command = com;`
`41`		`- if (info.ArgCount > 0)`
	`43`	`+`
	`44`	`+ // Check if the command has arguments and if it does, check if the command exists and is the right one`
	`45`	`+ if (info.ArgCount > 1)`
`42`	`46`	`{`
`43`		`- command = PluginGlobals.CustomCommands.Find(x => x.Command.Contains(aliases[i])) ?? com;`
	`47`	`+ var findcommand = PluginGlobals.CustomCommands.Find(x => x.Command.Contains(alias + $" {info.ArgString}"));`
	`48`	`+ // Check if the command is the right one with the right arguments`
	`49`	`+ if (findcommand! != command)`
	`50`	`+ return;`
	`51`	`+`
	`52`	`+ command = findcommand;`
`44`	`53`	`}`
	`54`	`+ // This will exit the command if the command has arguments but the client didn't provide any`
	`55`	`+ if (command!.Command.Contains(alias + " ") && info.ArgCount <= 1)`
	`56`	`+ return;`
`45`	`57`
`46`		`- if (command.Permission.PermissionList.Count > 0 && command.Permission != null)`
	`58`	`+ if (command!.Permission.PermissionList.Count > 0 && command.Permission != null)`
`47`	`59`	`if (!PluginUtilities.RequiresPermissions(player, command.Permission))`
`48`	`60`	`return;`
`49`	`61`
`@@ -70,12 +82,12 @@ public List<Commands> CheckForDuplicateCommands(List<Commands> comms)`
`70`	`82`
`71`	`83`	`foreach (var alias in aliases)`
`72`	`84`	`{`
`73`		`- if (commandNames.Contains(alias))`
	`85`	`+ if (commandNames.Contains(alias.ToLower()))`
`74`	`86`	`{`
`75`	`87`	`duplicateCommands.Add(com);`
`76`	`88`	`continue;`
`77`	`89`	`}`
`78`		`- commandNames.Add(alias);`
	`90`	`+ commandNames.Add(alias.ToLower());`
`79`	`91`	`}`
`80`	`92`	`}`
`81`	`93`
Original file line number	Diff line number	Diff line change
`@@ -3,14 +3,14 @@`
`3`	`3`	`"Title": "Rainbow",`
`4`	`4`	`"Description": "rainbow command",`
`5`	`5`	`"Command": "rainbow",`
`6`		`- "Message": " {RED}R{ORANGE}A{YELLOW}I{GREEN}N{BLUE}B{DARKBLUE}O{PURPLE}W",`
	`6`	`+ "Message": "{RED}R{ORANGE}A{YELLOW}I{GREEN}N{BLUE}B{DARKBLUE}O{PURPLE}W",`
`7`	`7`	`"PrintTo": 0`
`8`	`8`	`},`
`9`	`9`	`{`
`10`	`10`	`"Title": "All Colors",`
`11`	`11`	`"Description": "This command displays all the colors that are available to use in the chat.",`
`12`	`12`	`"Command": "colors",`
`13`		`- "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",`
	`13`	`+ "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",`
`14`	`14`	`"PrintTo": 0`
`15`	`15`	`}`
`16`	`16`	`]`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`{`
`3`	`3`	`"Title": "Discord",`
`4`	`4`	`"Description": "Command for Discord link",`
`5`		`- "Command": "discord,dc,Discord", // User can type !discord or /discord, !dc or /dc and !Discord or /discord in chat`
	`5`	`+ "Command": "discord,dc", // User can type !discord or /discord, !dc or /dc and !Discord or /discord in chat`
`6`	`6`	`"Message": "{PREFIX}Discord: https://discord.gg/Z9JfJ9Y57C",`
`7`	`7`	`"PrintTo": 0`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,5 +75,12 @@`
`75`	`75`	`"Command": "playercount",`
`76`	`76`	`"Message": "Current playercount: {PLAYERS}",`
`77`	`77`	`"PrintTo": 0`
	`78`	`+ },`
	`79`	`+ {`
	`80`	`+ "Title": "UserID",`
	`81`	`+ "Description": "Displays Player #userid",`
	`82`	`+ "Command": "userid",`
	`83`	`+ "Message": "Current players userid: {USERID}",`
	`84`	`+ "PrintTo": 0`
`78`	`85`	`}`
`79`	`86`	`]`