Merge pull request #30 from HerrMagiic/feature/tagsupportforservercommands

Feature/tagsupportforservercommands

Author: HerrMagiic

CustomCommands/Interfaces/IPluginUtilities.cs

@@ -7,6 +7,6 @@ namespace CustomCommands.Interfaces;
 public interface IPluginUtilities
 {
     string[] SplitStringByCommaOrSemicolon(string str);
-    void ExecuteServerCommands(Commands cmd);
+    void ExecuteServerCommands(Commands cmd, CCSPlayerController player);
     bool RequiresPermissions(CCSPlayerController player, Permission permissions);
 }

CustomCommands/Services/PluginUtilities.cs

@@ -10,10 +10,12 @@ namespace CustomCommands.Services;
 public class PluginUtilities : IPluginUtilities
 {
     private readonly IPluginGlobals PluginGlobals;
+    private readonly IReplaceTagsFunctions ReplaceTagsFunctions;
 
-    public PluginUtilities(IPluginGlobals PluginGlobals)
+    public PluginUtilities(IPluginGlobals PluginGlobals, IReplaceTagsFunctions ReplaceTagsFunctions)
     {
         this.PluginGlobals = PluginGlobals;
+        this.ReplaceTagsFunctions = ReplaceTagsFunctions;
     }
 
     public string[] SplitStringByCommaOrSemicolon(string str)
@@ -23,13 +25,13 @@ public string[] SplitStringByCommaOrSemicolon(string str)
                         .ToArray();
     }
 
-    public void ExecuteServerCommands(Commands cmd) 
+    public void ExecuteServerCommands(Commands cmd, CCSPlayerController player) 
     {
         if (cmd.ServerCommands.Count == 0) return;
 
         foreach (var serverCommand in cmd.ServerCommands)
         {
-            Server.ExecuteCommand(serverCommand);
+            Server.ExecuteCommand(ReplaceTagsFunctions.ReplaceMessageTags(serverCommand, player));
         }
     }
     public bool RequiresPermissions(CCSPlayerController player, Permission permissions)

CustomCommands/Services/RegisterCommands.cs

@@ -41,7 +41,7 @@ public void AddCommands(Commands com)
 
                 MessageManager.SendMessage(player, com);
 
-                PluginUtilities.ExecuteServerCommands(com);
+                PluginUtilities.ExecuteServerCommands(com, player);
             });
         }
     }

CustomCommands/Services/ReplaceTagsFunction.cs

@@ -64,14 +64,15 @@ public string ReplaceLanguageTags(string input)
     public string ReplaceMessageTags(string input, CCSPlayerController player)
     {
         SteamID steamId = new SteamID(player.SteamID);
-
+        
         Dictionary<string, string> replacements = new()
         {
             {"{PREFIX}", PluginGlobals.Config.Prefix ?? "<PREFIX not found>"},
             {"{MAP}", NativeAPI.GetMapName() ?? "<MAP not found>"},
             {"{TIME}", DateTime.Now.ToString("HH:mm:ss") ?? "<TIME not found>"},
             {"{DATE}", DateTime.Now.ToString("dd.MM.yyyy") ?? "<DATE not found>"},
             {"{PLAYERNAME}", player.PlayerName ?? "<PLAYERNAME not found>"},
+            {"{USERID}", player.UserId.ToString() ?? "<USERID not found>"},
             {"{STEAMID2}", steamId.SteamId2 ?? "<STEAMID2 not found>"},
             {"{STEAMID3}", steamId.SteamId3 ?? "<STEAMID3 not found>"},
             {"{STEAMID32}", steamId.SteamId32.ToString() ?? "<STEAMID32 not found>"},

Examples/ServerCommands.json

@@ -40,5 +40,15 @@
                 "@customcommands/surf"
             ]
         }
+    },
+    {
+        "Title": "Kickme",
+        "Description": "command that kicks yourself",
+        "Command": "kickme",
+        "Message": "Getting Kicket",
+        "PrintTo": 0,
+        "ServerCommands": [
+            "kick {PLAYERNAME}" // Tags work for commands as well
+        ]
     }
 ]