Add @ in chat as an alias to !say, and admins only when in team chat.

Initial work to support filters.

Author: Hackmastr

BasicAdmin/BasicAdmin.cs

@@ -9,6 +9,7 @@
 
 namespace BasicAdmin;
 
+// [MinimumApiVersion(66)]
 public sealed class BasicAdmin : BasePlugin, IPluginConfig<BasicAdminConfig>
 {
     public override string ModuleName => "BasicAdmin";
@@ -23,7 +24,48 @@ public void OnConfigParsed(BasicAdminConfig config)
     }
 
     public override void Load(bool hotReload)
-    { }
+    {
+        base.Load(hotReload);
+        
+        AddCommandListener("say", OnSayCommand);
+        AddCommandListener("say_team", OnSayCommand);
+    }
+
+    // public override void Unload(bool hotReload)
+    // {
+    //     base.Unload(hotReload);
+    //     
+    //     RemoveCommandListener("say", OnSayCommand, HookMode.Pre);
+    //     RemoveCommandListener("say_team", OnSayCommand, HookMode.Pre);
+    // }
+
+    public HookResult OnSayCommand(CCSPlayerController? caller, CommandInfo info)
+    {
+        if (!(info.GetArg(1).StartsWith('@') && AdminManager.PlayerHasPermissions(caller, "@css/chat")))
+            return HookResult.Continue;
+
+        var isTeam = info.GetArg(0).Equals("say_team");
+        var start = isTeam ? 11 : 6;
+        string message;
+
+        if (isTeam)
+        {
+            message = string.Format(Config.AdminSayTextTeam, caller!.PlayerName,
+                info.GetCommandString[start..^1]);
+        }
+        else
+        {
+            message = FormatAdminMessage(string.Format(Config.AdminSayText, caller!.PlayerName,
+                info.GetCommandString[start..^1]));
+        }
+        
+        if (isTeam)
+            ServerUtils.PrintToChatTeam(TargetFilter.Admin, message);
+        else
+            Server.PrintToChatAll(message);
+        
+        return HookResult.Stop;
+    }
 
     [ConsoleCommand("css_map", "Change map.")]
     [CommandHelper(1, "<mapname>")]
@@ -104,7 +146,7 @@ public void OnSlayCommand(CCSPlayerController? caller, CommandInfo info)
     [RequiresPermissions("@css/cvar")]
     public void OnGiveCommand(CCSPlayerController? caller, CommandInfo info)
     {
-        if (!GetTarget(info, out var player)) 
+        if (!GetTarget(info, out var player))
             return;
 
         var range = info.GetArg(0).Length + info.GetArg(1).Length + 2;

BasicAdmin/BasicAdminConfig.cs

@@ -1,5 +1,6 @@
 using System.Text.Json.Serialization;
 using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Utils;
 
 namespace BasicAdmin;
 
@@ -10,4 +11,10 @@ public class BasicAdminConfig : BasePluginConfig
 
     [JsonPropertyName("hide_activity")]
     public bool HideActivity { get; set; } = false;
+    
+    [JsonPropertyName("admin_say_text")]
+    public string AdminSayText { get; set; } = $"\x03{{0}}\x01: {{1}}";
+    
+    [JsonPropertyName("admin_say_text_admins")]
+    public string AdminSayTextTeam { get; set; } = $"(Admins only) \x03{{0}}\x01: {{1}}";
 }

BasicAdmin/Enums.cs

@@ -0,0 +1,18 @@
+namespace BasicAdmin;
+
+internal enum TargetResult
+{
+    None,
+    Multiple,
+    Single
+}
+
+internal enum TargetFilter
+{
+    CounterTerrorist,
+    Terrorist,
+    Alive,
+    Admin,
+    Dead,
+    Spec,
+}

BasicAdmin/ServerUtils.cs

@@ -1,11 +1,30 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Admin;
+using CounterStrikeSharp.API.Modules.Utils;
 
 namespace BasicAdmin;
 
 
 internal static class ServerUtils
 {
+    private static readonly Dictionary<TargetFilter, Predicate<CCSPlayerController>> FilterPredicates = new()
+    {
+        { TargetFilter.CounterTerrorist, player => player.TeamNum == (int)CsTeam.CounterTerrorist },
+        { TargetFilter.Terrorist, player => player.TeamNum == (int)CsTeam.Terrorist },
+        { TargetFilter.Alive, player => player.TeamNum == (int)LifeState_t.LIFE_ALIVE },
+        { TargetFilter.Admin, player => AdminManager.PlayerHasPermissions(player, "@css/chat") },
+        { TargetFilter.Dead, player => player.LifeState == (int)LifeState_t.LIFE_DEAD },
+        { TargetFilter.Spec, player => player.TeamNum == (int)CsTeam.Spectator },
+    };
+    
+    private static readonly Dictionary<int, TargetFilter> TeamTargetFilter = new()
+    {
+        {(int) CsTeam.CounterTerrorist, TargetFilter.CounterTerrorist},
+        {(int) CsTeam.Terrorist, TargetFilter.Terrorist},
+        {(int) CsTeam.Spectator, TargetFilter.Spec},
+    };
+    
     public static List<CCSPlayerController> GetPlayerFromName(string name)
     {
         return Utilities.GetPlayers().FindAll(x => x.PlayerName.Contains(name, StringComparison.OrdinalIgnoreCase));
@@ -43,11 +62,20 @@ public static void PrintToCenterAll(string message)
             controller.PrintToCenter(message);
         });
     }
-}
 
-internal enum TargetResult
-{
-    None,
-    Multiple,
-    Single
-}
+    public static void PrintToChatTeam(int team, string message)
+    {
+        Utilities.GetPlayers().FindAll(FilterPredicates[TeamTargetFilter[team]]).ForEach(controller =>
+        {
+            controller.PrintToChat(message);
+        });
+    }
+
+    public static void PrintToChatTeam(TargetFilter filter, string message)
+    {
+        Utilities.GetPlayers().FindAll(FilterPredicates[filter]).ForEach(controller =>
+        {
+            controller.PrintToChat(message);
+        });
+    }
+}

README.md

@@ -26,6 +26,8 @@
 * `css_spec`
   * requires `@css/kick` flag
 * `css_say`
+* `@` (alias)
+* `@` (in team chat, admins only)
   * requires `@css/chat` flag
 * `css_psay`
   * requires `@css/chat` flag