1.7.4a

【ＵＰＤＡＴＥ　１．７．４ａ】 **🆕 What's new and what's changed:** - Exposed event `OnAdminShowActivity` - fire when the function of informing players of admin action is performed - Exposed `ShowAdminActivity` - Added module to integration with AntiDLL - Added module to integration with Redis (plugin send info about penalties between all servers)
2026-09-27 20:17:04 +02:00 · 2025-02-18 20:11:05 +01:00 · 2025-02-18 20:11:05 +01:00 · babcbc2119
commit babcbc2119
parent 64e5f1156e
50 changed files with 3277 additions and 39 deletions
--- a/CS2-SimpleAdmin/Api/CS2_SimpleAdminApi.cs
+++ b/CS2-SimpleAdmin/Api/CS2_SimpleAdminApi.cs
@ -27,12 +27,15 @@ public class CS2_SimpleAdminApi : ICS2_SimpleAdminApi
    
    public event Action<PlayerInfo, PlayerInfo?, PenaltyType, string, int, int?, int?>? OnPlayerPenaltied;
    public event Action<SteamID, PlayerInfo?, PenaltyType, string, int, int?, int?>? OnPlayerPenaltiedAdded;
+    public event Action<string, string?, bool, object>? OnAdminShowActivity;

    public void OnPlayerPenaltiedEvent(PlayerInfo player, PlayerInfo? admin, PenaltyType penaltyType, string reason,
        int duration, int? penaltyId) =>  OnPlayerPenaltied?.Invoke(player, admin, penaltyType, reason, duration, penaltyId, CS2_SimpleAdmin.ServerId);
    
    public void OnPlayerPenaltiedAddedEvent(SteamID player, PlayerInfo? admin, PenaltyType penaltyType, string reason,
        int duration, int? penaltyId) =>  OnPlayerPenaltiedAdded?.Invoke(player, admin, penaltyType, reason, duration, penaltyId, CS2_SimpleAdmin.ServerId);
+    
+    public void OnAdminShowActivityEvent(string messageKey, string? callerName = null, bool dontPublish = false, params object[] messageArgs) =>  OnAdminShowActivity?.Invoke(messageKey, callerName, dontPublish, messageArgs);

    public void IssuePenalty(CCSPlayerController player, CCSPlayerController? admin, PenaltyType penaltyType, string reason, int duration = -1)
    {
@ -121,4 +124,9 @@ public class CS2_SimpleAdminApi : ICS2_SimpleAdminApi
    {
        return CS2_SimpleAdmin.SilentPlayers.Contains(player.Slot);
    }
+
+    public void ShowAdminActivity(string messageKey, string? callerName = null, bool dontPublish = false, params object[] messageArgs)
+    {
+        Helper.ShowAdminActivity(messageKey, callerName, dontPublish, messageArgs);
+    }
 }
--- a/CS2-SimpleAdmin/CS2-SimpleAdmin.cs
+++ b/CS2-SimpleAdmin/CS2-SimpleAdmin.cs
@ -19,7 +19,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
    public override string ModuleName => "CS2-SimpleAdmin" + (Helper.IsDebugBuild ? " (DEBUG)" : " (RELEASE)");
    public override string ModuleDescription => "Simple admin plugin for Counter-Strike 2 :)";
    public override string ModuleAuthor => "daffyy & Dliix66";
-    public override string ModuleVersion => "1.7.3a";
+    public override string ModuleVersion => "1.7.4a";
    
    public override void Load(bool hotReload)
    {
--- a/CS2-SimpleAdmin/Commands/basebans.cs
+++ b/CS2-SimpleAdmin/Commands/basebans.cs
@ -94,7 +94,7 @@ public partial class CS2_SimpleAdmin
        // Display admin activity message if necessary
        if (caller == null || !SilentPlayers.Contains(caller.Slot))
        {
-            Helper.ShowAdminActivity(activityMessageKey, callerName, adminActivityArgs);
+            Helper.ShowAdminActivity(activityMessageKey, callerName, false, adminActivityArgs);
        }

        // Schedule a kick timer
@ -420,7 +420,7 @@ public partial class CS2_SimpleAdmin
        // Display admin activity message if necessary
        if (caller == null || !SilentPlayers.Contains(caller.Slot))
        {
-            Helper.ShowAdminActivity(activityMessageKey, callerName, adminActivityArgs);
+            Helper.ShowAdminActivity(activityMessageKey, callerName, false, adminActivityArgs);
        }

        // Log the warning command
--- a/CS2-SimpleAdmin/Commands/basecommands.cs
+++ b/CS2-SimpleAdmin/Commands/basecommands.cs
@ -558,7 +558,7 @@ public partial class CS2_SimpleAdmin
                            // Display admin activity message if necessary
                            if (!SilentPlayers.Contains(caller.Slot))
                            {
-                                Helper.ShowAdminActivity(activityMessageKey, caller.PlayerName, adminActivityArgs);
+                                Helper.ShowAdminActivity(activityMessageKey, caller.PlayerName, false ,adminActivityArgs);
                            }
                            
                            MenuApi?.CloseMenu(caller);
@ -583,7 +583,7 @@ public partial class CS2_SimpleAdmin
                            // Display admin activity message to other players
                            if (!SilentPlayers.Contains(caller.Slot))
                            {
-                                Helper.ShowAdminActivity(activityMessageKey, caller.PlayerName, adminActivityArgs);
+                                Helper.ShowAdminActivity(activityMessageKey, caller.PlayerName, false, adminActivityArgs);
                            }
                            
                            MenuApi?.CloseMenu(caller);
@ -608,7 +608,7 @@ public partial class CS2_SimpleAdmin
                            // Display admin activity message to other players
                            if (!SilentPlayers.Contains(caller.Slot))
                            {
-                                Helper.ShowAdminActivity(activityMessageKey, caller.PlayerName, adminActivityArgs);
+                                Helper.ShowAdminActivity(activityMessageKey, caller.PlayerName, false, adminActivityArgs);
                            }
                            
                            MenuApi?.CloseMenu(caller);
@ -633,7 +633,7 @@ public partial class CS2_SimpleAdmin
                            // Display admin activity message to other players
                            if (!SilentPlayers.Contains(caller.Slot))
                            {
-                                Helper.ShowAdminActivity(activityMessageKey, caller.PlayerName, adminActivityArgs);
+                                Helper.ShowAdminActivity(activityMessageKey, caller.PlayerName, false, adminActivityArgs);
                            }
                            
                            MenuApi?.CloseMenu(caller);
@ -825,7 +825,7 @@ public partial class CS2_SimpleAdmin
        // Display admin activity message to other players
        if (caller == null || !SilentPlayers.Contains(caller.Slot))
        {
-            Helper.ShowAdminActivity(activityMessageKey, callerName, adminActivityArgs);
+            Helper.ShowAdminActivity(activityMessageKey, callerName, false, adminActivityArgs);
        }

        // Schedule the kick for the player
@ -894,7 +894,7 @@ public partial class CS2_SimpleAdmin
        // Display admin activity message to other players
        if (caller == null || !SilentPlayers.Contains(caller.Slot))
        {
-            Helper.ShowAdminActivity(activityMessageKey, callerName, adminActivityArgs);
+            Helper.ShowAdminActivity(activityMessageKey, callerName, false, adminActivityArgs);
        }

        Helper.LogCommand(caller, command?.GetCommandString ?? $"css_map {map}");
@ -924,7 +924,7 @@ public partial class CS2_SimpleAdmin
        // Display admin activity message to other players
        if (caller == null || !SilentPlayers.Contains(caller.Slot))
        {
-            Helper.ShowAdminActivity(activityMessageKey, callerName, ["CALLER", map]);
+            Helper.ShowAdminActivity(activityMessageKey, callerName, false, ["CALLER", map]);
        }

        // Add timer to execute the map change command after a delay
--- a/CS2-SimpleAdmin/Commands/basecomms.cs
+++ b/CS2-SimpleAdmin/Commands/basecomms.cs
@ -87,7 +87,7 @@ public partial class CS2_SimpleAdmin
        // Display admin activity message to other players
        if (caller == null || !SilentPlayers.Contains(caller.Slot))
        {
-            Helper.ShowAdminActivity(activityMessageKey, callerName, adminActivityArgs);
+            Helper.ShowAdminActivity(activityMessageKey, callerName, false, adminActivityArgs);
        }

        // Increment the player's total gags count
@ -355,7 +355,7 @@ public partial class CS2_SimpleAdmin
        // Display admin activity message to other players
        if (caller == null || !SilentPlayers.Contains(caller.Slot))
        {
-            Helper.ShowAdminActivity(activityMessageKey, callerName, adminActivityArgs);
+            Helper.ShowAdminActivity(activityMessageKey, callerName, false, adminActivityArgs);
        }

        // Increment the player's total mutes count
@ -623,7 +623,7 @@ public partial class CS2_SimpleAdmin
        // Display admin activity message to other players
        if (caller == null || !SilentPlayers.Contains(caller.Slot))
        {
-            Helper.ShowAdminActivity(activityMessageKey, callerName, adminActivityArgs);
+            Helper.ShowAdminActivity(activityMessageKey, callerName, false, adminActivityArgs);
        }

        // Increment the player's total silences count
--- a/CS2-SimpleAdmin/Commands/funcommands.cs
+++ b/CS2-SimpleAdmin/Commands/funcommands.cs
@ -46,7 +46,7 @@ public partial class CS2_SimpleAdmin
        // Display admin activity message to other players
        if (caller == null || !SilentPlayers.Contains(caller.Slot))
        {
-            Helper.ShowAdminActivity(activityMessageKey, callerName, adminActivityArgs);
+            Helper.ShowAdminActivity(activityMessageKey, callerName, false, adminActivityArgs);
        }

        // Log the command
@ -109,7 +109,7 @@ public partial class CS2_SimpleAdmin
        // Display admin activity message to other players
        if (caller == null || !SilentPlayers.Contains(caller.Slot))
        {
-            Helper.ShowAdminActivity(activityMessageKey, callerName, adminActivityArgs);
+            Helper.ShowAdminActivity(activityMessageKey, callerName, false, adminActivityArgs);
        }
    }

@ -152,7 +152,7 @@ public partial class CS2_SimpleAdmin
        // Display admin activity message to other players
        if (caller == null || !SilentPlayers.Contains(caller.Slot))
        {
-            Helper.ShowAdminActivity(activityMessageKey, callerName, adminActivityArgs);
+            Helper.ShowAdminActivity(activityMessageKey, callerName, false, adminActivityArgs);
        }

        // Schedule unfreeze for the player if time is specified
@ -203,7 +203,7 @@ public partial class CS2_SimpleAdmin
        // Display admin activity message to other players
        if (caller == null || !SilentPlayers.Contains(caller.Slot))
        {
-            Helper.ShowAdminActivity(activityMessageKey, callerName, adminActivityArgs);
+            Helper.ShowAdminActivity(activityMessageKey, callerName, false, adminActivityArgs);
        }

        // Log the command and send Discord notification
--- a/CS2-SimpleAdmin/Commands/playercommands.cs
+++ b/CS2-SimpleAdmin/Commands/playercommands.cs
@ -49,7 +49,7 @@ public partial class CS2_SimpleAdmin
        // Display admin activity message to other players
        if (caller == null || !SilentPlayers.Contains(caller.Slot))
        {
-            Helper.ShowAdminActivity(activityMessageKey, callerName, adminActivityArgs);
+            Helper.ShowAdminActivity(activityMessageKey, callerName, false, adminActivityArgs);
        }

        // Log the command and send Discord notification
@ -133,7 +133,7 @@ public partial class CS2_SimpleAdmin
        // Display admin activity message to other players
        if (caller == null || !SilentPlayers.Contains(caller.Slot))
        {
-            Helper.ShowAdminActivity(activityMessageKey, callerName, adminActivityArgs);
+            Helper.ShowAdminActivity(activityMessageKey, callerName, false, adminActivityArgs);
        }
    }

@ -161,7 +161,7 @@ public partial class CS2_SimpleAdmin
        // Display admin activity message to other players
        if (caller == null || !SilentPlayers.Contains(caller.Slot))
        {
-            Helper.ShowAdminActivity(activityMessageKey, callerName, adminActivityArgs);
+            Helper.ShowAdminActivity(activityMessageKey, callerName, false, adminActivityArgs);
        }
    }

@ -212,7 +212,7 @@ public partial class CS2_SimpleAdmin
        // Display admin activity message to other players
        if (caller == null || !SilentPlayers.Contains(caller.Slot))
        {
-            Helper.ShowAdminActivity(activityMessageKey, callerName, adminActivityArgs);
+            Helper.ShowAdminActivity(activityMessageKey, callerName, false, adminActivityArgs);
        }
    }

@ -261,7 +261,7 @@ public partial class CS2_SimpleAdmin
        // Display admin activity message to other players
        if (caller == null || !SilentPlayers.Contains(caller.Slot))
        {
-            Helper.ShowAdminActivity(activityMessageKey, callerName, adminActivityArgs);
+            Helper.ShowAdminActivity(activityMessageKey, callerName, false, adminActivityArgs);
        }
    }

@ -317,7 +317,7 @@ public partial class CS2_SimpleAdmin
        // Display admin activity message to other players
        if (caller == null || !SilentPlayers.Contains(caller.Slot))
        {
-            Helper.ShowAdminActivity(activityMessageKey, callerName, adminActivityArgs);
+            Helper.ShowAdminActivity(activityMessageKey, callerName, false, adminActivityArgs);
        }
    }

@ -373,7 +373,7 @@ public partial class CS2_SimpleAdmin
        // Display admin activity message to other players
        if (caller == null || !SilentPlayers.Contains(caller.Slot))
        {
-            Helper.ShowAdminActivity(activityMessageKey, callerName, adminActivityArgs);
+            Helper.ShowAdminActivity(activityMessageKey, callerName, false, adminActivityArgs);
        }
    }

@ -425,7 +425,7 @@ public partial class CS2_SimpleAdmin
        // Display admin activity message to other players
        if (caller == null || !SilentPlayers.Contains(caller.Slot))
        {
-            Helper.ShowAdminActivity(activityMessageKey, callerName, adminActivityArgs);
+            Helper.ShowAdminActivity(activityMessageKey, callerName, false, adminActivityArgs);
        }
    }

@ -483,7 +483,7 @@ public partial class CS2_SimpleAdmin

        if (_localizer != null)
        {
-            Helper.ShowAdminActivity(activityMessageKey, callerName, adminActivityArgs);
+            Helper.ShowAdminActivity(activityMessageKey, callerName, false, adminActivityArgs);
        }
    }

@ -580,7 +580,7 @@ public partial class CS2_SimpleAdmin
        // Display admin activity message to other players
        if (caller != null && SilentPlayers.Contains(caller.Slot)) return;

-        Helper.ShowAdminActivity(activityMessageKey, callerName, adminActivityArgs);
+        Helper.ShowAdminActivity(activityMessageKey, callerName, false, adminActivityArgs);
    }

    [CommandHelper(1, "<#userid or name> <new name>")]
@ -621,7 +621,7 @@ public partial class CS2_SimpleAdmin
            // Display admin activity message to other players
            if (caller != null && SilentPlayers.Contains(caller.Slot)) return;

-            Helper.ShowAdminActivity(activityMessageKey, callerName, adminActivityArgs);
+            Helper.ShowAdminActivity(activityMessageKey, callerName, false, adminActivityArgs);
            
            // Rename the player
            player.Rename(newName);
@ -662,7 +662,7 @@ public partial class CS2_SimpleAdmin
            // Display admin activity message to other players
            if (caller != null && !SilentPlayers.Contains(caller.Slot))
            {
-                Helper.ShowAdminActivity(activityMessageKey, callerName, adminActivityArgs);
+                Helper.ShowAdminActivity(activityMessageKey, callerName, false, adminActivityArgs);
            }
            
            // Determine if the new name is valid and update the renamed players list
@ -732,7 +732,7 @@ public partial class CS2_SimpleAdmin
        // Display admin activity message to other players
        if (caller != null && SilentPlayers.Contains(caller.Slot)) return;

-        Helper.ShowAdminActivity(activityMessageKey, callerName, adminActivityArgs);
+        Helper.ShowAdminActivity(activityMessageKey, callerName, false, adminActivityArgs);
    }

    [CommandHelper(1, "<#userid or name>")]
@ -801,7 +801,7 @@ public partial class CS2_SimpleAdmin
            // Show admin activity
            if (!SilentPlayers.Contains(caller.Slot) && _localizer != null)
            {
-                Helper.ShowAdminActivity(activityMessageKey, caller.PlayerName, adminActivityArgs);
+                Helper.ShowAdminActivity(activityMessageKey, caller.PlayerName, false, adminActivityArgs);
            }
        }
    }
@ -872,7 +872,7 @@ public partial class CS2_SimpleAdmin
            // Show admin activity
            if (!SilentPlayers.Contains(caller.Slot) && _localizer != null)
            {
-                Helper.ShowAdminActivity(activityMessageKey, caller.PlayerName, adminActivityArgs);
+                Helper.ShowAdminActivity(activityMessageKey, caller.PlayerName, false, adminActivityArgs);
            }
        }
    }
--- a/CS2-SimpleAdmin/Helper.cs
+++ b/CS2-SimpleAdmin/Helper.cs
@ -388,15 +388,23 @@ internal static class Helper
        _ = CS2_SimpleAdmin.DiscordWebhookClientLog.SendMessageAsync(GenerateMessageDiscord(localizer["sa_discord_log_command", $"[{callerName}]({communityUrl})", command]));
    }

-    public static void ShowAdminActivity(string messageKey, string? callerName = null, params object[] messageArgs)
+    public static void ShowAdminActivity(string messageKey, string? callerName = null, bool dontPublish = false, params object[] messageArgs)
    {
+        string[] publishActions = ["ban", "gag", "silence", "mute"];
+        
        if (CS2_SimpleAdmin.Instance.Config.OtherSettings.ShowActivityType == 0) return;
        if (CS2_SimpleAdmin._localizer == null) return;
+        
+        if (string.IsNullOrWhiteSpace(callerName))
+            callerName = CS2_SimpleAdmin._localizer["sa_console"];

-        // Determine the localized message key
-        var localizedMessageKey = $"{messageKey}";
        var formattedMessageArgs = messageArgs.Select(arg => arg.ToString() ?? string.Empty).ToArray();
-
+        
+        if (dontPublish == false && publishActions.Any(messageKey.Contains))
+        {
+            CS2_SimpleAdmin.SimpleAdminApi?.OnAdminShowActivityEvent(messageKey, callerName, dontPublish, messageArgs);
+        }
+        
        // // Replace placeholder based on showActivityType
        // for (var i = 0; i < formattedMessageArgs.Length; i++)
        // {
@ -437,7 +445,7 @@ internal static class Helper
            }

            // Send the localized message to each player
-            controller.SendLocalizedMessage(CS2_SimpleAdmin._localizer, localizedMessageKey, currentMessageArgs.Cast<object>().ToArray());
+            controller.SendLocalizedMessage(CS2_SimpleAdmin._localizer, messageKey, currentMessageArgs.Cast<object>().ToArray());
        }
    }

--- a/CS2-SimpleAdmin/VERSION
+++ b/CS2-SimpleAdmin/VERSION
@ -1 +1 @@
-1.7.3a
+1.7.4a
--- a/CS2-SimpleAdmin/Variables.cs
+++ b/CS2-SimpleAdmin/Variables.cs
@ -62,7 +62,7 @@ public partial class CS2_SimpleAdmin
    private static readonly PluginCapability<IMenuApi> MenuCapability = new("menu:nfcore");

    // Shared API
-    private Api.CS2_SimpleAdminApi? SimpleAdminApi { get; set; }
+    internal static Api.CS2_SimpleAdminApi? SimpleAdminApi { get; set; }
    
    // Managers
    internal PermissionManager PermissionManager = new(Database);
 @ -1 +1 @@
 .7.3a
 .7.4a