Merge pull request #27 from HerrMagiic/feature/stringpatterncheck

HerrMagiic · web-flow · commit 288917b14faf · 2024-01-31T14:16:54.000+01:00
Feature/stringpatterncheck
diff --git a/CustomCommands.sln b/CustomCommands.sln
@@ -3,34 +3,22 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.7.34018.315
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CustomCommands", "CustomCommands\CustomCommands.csproj", "{CFD687D3-02AF-4F8B-B561-ED01C4B2C5D3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustomCommands", "CustomCommands\CustomCommands.csproj", "{CFD687D3-02AF-4F8B-B561-ED01C4B2C5D3}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{DBAE0443-7660-456C-B185-444366A42766}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DBAE0443-7660-456C-B185-444366A42766}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DBAE0443-7660-456C-B185-444366A42766}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DBAE0443-7660-456C-B185-444366A42766}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C4B486A3-D8FC-41AC-827E-905BAFF50A9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C4B486A3-D8FC-41AC-827E-905BAFF50A9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C4B486A3-D8FC-41AC-827E-905BAFF50A9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C4B486A3-D8FC-41AC-827E-905BAFF50A9D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A590C358-C1B2-4F21-B9B0-FE56B6562F39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A590C358-C1B2-4F21-B9B0-FE56B6562F39}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A590C358-C1B2-4F21-B9B0-FE56B6562F39}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A590C358-C1B2-4F21-B9B0-FE56B6562F39}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8BF8B3C3-FE3F-459E-B414-72469816539A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8BF8B3C3-FE3F-459E-B414-72469816539A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8BF8B3C3-FE3F-459E-B414-72469816539A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8BF8B3C3-FE3F-459E-B414-72469816539A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CFD687D3-02AF-4F8B-B561-ED01C4B2C5D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CFD687D3-02AF-4F8B-B561-ED01C4B2C5D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CFD687D3-02AF-4F8B-B561-ED01C4B2C5D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CFD687D3-02AF-4F8B-B561-ED01C4B2C5D3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F5F2148E-D3A3-4196-B97A-4E0941326365}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F5F2148E-D3A3-4196-B97A-4E0941326365}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F5F2148E-D3A3-4196-B97A-4E0941326365}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F5F2148E-D3A3-4196-B97A-4E0941326365}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/CustomCommands/CustomCommandsServiceCollection.cs b/CustomCommands/CustomCommandsServiceCollection.cs
@@ -10,7 +10,7 @@ public class CustomCommandsServiceCollection : IPluginServiceCollection<CustomCo
     public void ConfigureServices(IServiceCollection services)
     {
         services.Scan(scan => scan
-            .FromAssemblyOf<IPermissionsManager>()
+            .FromAssemblyOf<IRegisterCommands>()
             .AddClasses()
                 .AsImplementedInterfaces()
                 .WithSingletonLifetime()
diff --git a/CustomCommands/Interfaces/IPluginUtilities.cs b/CustomCommands/Interfaces/IPluginUtilities.cs
@@ -1,9 +1,12 @@
+
 using CounterStrikeSharp.API.Core;
 using CustomCommands.Model;
 
 namespace CustomCommands.Interfaces;
 
-public interface IPermissionsManager
+public interface IPluginUtilities
 {
+    string[] SplitStringByCommaOrSemicolon(string str);
+    void ExecuteServerCommands(Commands cmd);
     bool RequiresPermissions(CCSPlayerController player, Permission permissions);
 }
diff --git a/CustomCommands/Interfaces/IRegisterCommands.cs b/CustomCommands/Interfaces/IRegisterCommands.cs
@@ -6,5 +6,4 @@ public interface IRegisterCommands
 {
     void AddCommands(Commands cmd);
     List<Commands> CheckForDuplicateCommands(List<Commands> comms);
-    void ExecuteServerCommands(Commands cmd);
 }
diff --git a/CustomCommands/Services/PluginUtilities.cs b/CustomCommands/Services/PluginUtilities.cs
@@ -1,19 +1,37 @@
+using System.Text.RegularExpressions;
+using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Admin;
 using CustomCommands.Interfaces;
 using CustomCommands.Model;
 
 namespace CustomCommands.Services;
 
-public class PermissionsManager : IPermissionsManager
+public class PluginUtilities : IPluginUtilities
 {
     private readonly IPluginGlobals PluginGlobals;
-
-    public PermissionsManager(IPluginGlobals PluginGlobals)
+    
+    public PluginUtilities(IPluginGlobals PluginGlobals)
     {
         this.PluginGlobals = PluginGlobals;
     }
 
+    public string[] SplitStringByCommaOrSemicolon(string str)
+    {
+        return Regex.Split(str, ",|;|\\s")
+                        .Where(s => !string.IsNullOrEmpty(s))
+                        .ToArray();
+    }
+    
+    public void ExecuteServerCommands(Commands cmd) 
+    {
+        if (cmd.ServerCommands.Count == 0) return;
+
+        foreach (var serverCommand in cmd.ServerCommands)
+        {
+            Server.ExecuteCommand(serverCommand);
+        }
+    }
     public bool RequiresPermissions(CCSPlayerController player, Permission permissions)
     {
         if (!permissions.RequiresAllPermissions)
diff --git a/CustomCommands/Services/RegisterCommands.cs b/CustomCommands/Services/RegisterCommands.cs
@@ -1,4 +1,3 @@
-using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core.Plugin;
 using CustomCommands.Interfaces;
 using CustomCommands.Model;
@@ -10,24 +9,25 @@ public class RegisterCommands : IRegisterCommands
     private readonly ILogger<CustomCommands> Logger;
     private readonly IMessageManager MessageManager;
     private readonly IPluginGlobals PluginGlobals;
-    private readonly IPermissionsManager PermissionsManager;
     private readonly PluginContext PluginContext;
+    private readonly IPluginUtilities PluginUtilities;
 
     public RegisterCommands(ILogger<CustomCommands> Logger, IMessageManager MessageManager, 
-                                IPluginGlobals PluginGlobals, IPermissionsManager PermissionsManager, IPluginContext PluginContext)
+                                IPluginGlobals PluginGlobals, IPluginContext PluginContext, 
+                                IPluginUtilities PluginUtilities)
     {
         this.Logger = Logger;
         this.MessageManager = MessageManager;
         this.PluginGlobals = PluginGlobals;
-        this.PermissionsManager = PermissionsManager;
         this.PluginContext = (PluginContext as PluginContext)!;
+        this.PluginUtilities = PluginUtilities;
     }
 
     public void AddCommands(Commands com)
     {
         CustomCommands plugin = (PluginContext.Plugin as CustomCommands)!;
         
-        string[] aliases = com.Command.Split(',');
+        string[] aliases = PluginUtilities.SplitStringByCommaOrSemicolon(com.Command);
 
         for (int i = 0; i < aliases.Length; i++)
         {
@@ -36,12 +36,12 @@ public void AddCommands(Commands com)
                 if (player == null) return;
                 
                 if (com.Permission.PermissionList.Count > 0 && com.Permission != null)
-                    if (!PermissionsManager.RequiresPermissions(player, com.Permission)) 
+                    if (!PluginUtilities.RequiresPermissions(player, com.Permission)) 
                         return;
                 
                 MessageManager.SendMessage(player, com);
 
-                ExecuteServerCommands(com);
+                PluginUtilities.ExecuteServerCommands(com);
             });
         }
     }
@@ -89,13 +89,4 @@ public List<Commands> CheckForDuplicateCommands(List<Commands> comms)
 
         return commands;
     }
-    public void ExecuteServerCommands(Commands cmd) 
-    {
-        if (cmd.ServerCommands.Count == 0) return;
-
-        foreach (var serverCommand in cmd.ServerCommands)
-        {
-            Server.ExecuteCommand(serverCommand);
-        }
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public class CustomCommandsServiceCollection : IPluginServiceCollection<CustomCo`
`10`	`10`	`public void ConfigureServices(IServiceCollection services)`
`11`	`11`	`{`
`12`	`12`	`services.Scan(scan => scan`
`13`		`- .FromAssemblyOf<IPermissionsManager>()`
	`13`	`+ .FromAssemblyOf<IRegisterCommands>()`
`14`	`14`	`.AddClasses()`
`15`	`15`	`.AsImplementedInterfaces()`
`16`	`16`	`.WithSingletonLifetime()`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,12 @@`
	`1`	`+`
`1`	`2`	`using CounterStrikeSharp.API.Core;`
`2`	`3`	`using CustomCommands.Model;`
`3`	`4`
`4`	`5`	`namespace CustomCommands.Interfaces;`
`5`	`6`
`6`		`-public interface IPermissionsManager`
	`7`	`+public interface IPluginUtilities`
`7`	`8`	`{`
	`9`	`+ string[] SplitStringByCommaOrSemicolon(string str);`
	`10`	`+ void ExecuteServerCommands(Commands cmd);`
`8`	`11`	`bool RequiresPermissions(CCSPlayerController player, Permission permissions);`
`9`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,4 @@ public interface IRegisterCommands`
`6`	`6`	`{`
`7`	`7`	`void AddCommands(Commands cmd);`
`8`	`8`	`List<Commands> CheckForDuplicateCommands(List<Commands> comms);`
`9`		`- void ExecuteServerCommands(Commands cmd);`
`10`	`9`	`}`