Merge branch 'main' into main

Commands/basebans.cs

@@ -1,4 +1,4 @@
-using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Core.Attributes.Registration;
 using CounterStrikeSharp.API.Core.Translations;
 using CounterStrikeSharp.API.Modules.Admin;

Commands/basecommands.cs

@@ -1,4 +1,4 @@
-using CounterStrikeSharp.API;
+using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Core.Attributes.Registration;
 using CounterStrikeSharp.API.Core.Translations;
@@ -473,13 +473,6 @@ namespace CS2_SimpleAdmin
 					_command = $"ds_workshop_changelevel {map.Replace("ws:", "")}";
 				}
 
-				//if (_discordWebhookClientLog != null && _localizer != null)
-				//{
-				//	string communityUrl = caller != null ? "<" + new SteamID(caller.SteamID).ToCommunityUrl().ToString() + ">" : "<https://steamcommunity.com/profiles/0>";
-				//	string commandName = command?.GetCommandString ?? "css_changemap";
-				//	_discordWebhookClientLog.SendMessageAsync(Helper.GenerateMessageDiscord(_localizer["sa_discord_log_command", $"[{callerName}]({communityUrl})", commandName]));
-				//}
-
 				AddTimer(3.0f, () =>
 				{
 					Server.ExecuteCommand(_command);
@@ -565,15 +558,6 @@ namespace CS2_SimpleAdmin
 				}
 			}
 
-			//if (_discordWebhookClientLog != null && _localizer != null)
-			//{
-			//	string communityUrl = caller != null ? "<" + new SteamID(caller.SteamID).ToCommunityUrl().ToString() + ">" : "<https://steamcommunity.com/profiles/0>";
-			//	string commandName = command?.GetCommandString ?? "css_changewsmap";
-			//	_discordWebhookClientLog.SendMessageAsync(Helper.GenerateMessageDiscord(_localizer["sa_discord_log_command", $"[{callerName}]({communityUrl})", commandName]));
-			//}
-			//if (command is not null)
-			//	Helper.LogCommand(caller, command);
-
 			AddTimer(3.0f, () =>
 			{
 				Server.ExecuteCommand(_command);

Commands/basecomms.cs

@@ -1,4 +1,4 @@
-using CounterStrikeSharp.API;
+using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Core.Attributes.Registration;
 using CounterStrikeSharp.API.Core.Translations;

Commands/funcommands.cs

@@ -1,4 +1,4 @@
-using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Core.Attributes.Registration;
 using CounterStrikeSharp.API.Core.Translations;
 using CounterStrikeSharp.API.Modules.Admin;

Commands/playercommands.cs

@@ -1,4 +1,4 @@
-using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Core.Attributes.Registration;
 using CounterStrikeSharp.API.Core.Translations;
 using CounterStrikeSharp.API.Modules.Admin;

Config.cs

@@ -22,6 +22,9 @@ namespace CS2_SimpleAdmin
 
 		[JsonPropertyName("Command")]
 		public string Command { get; set; } = "";
+		
+		[JsonPropertyName("ExecuteOnClient")]
+		public bool ExecuteOnClient { get; set; } = false;
 	}
 
 	public class CS2_SimpleAdminConfig : BasePluginConfig

Helper.cs

@@ -307,6 +307,19 @@ namespace CS2_SimpleAdmin
 			var updatedJsonContent = JsonSerializer.Serialize(config, new JsonSerializerOptions { WriteIndented = true, Encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping });
 			File.WriteAllText(CfgPath, updatedJsonContent);
 		}
+		
+		public static void TryLogCommandOnDiscord(CCSPlayerController? caller, string commandString)
+		{
+			if (CS2_SimpleAdmin._discordWebhookClientLog == null || CS2_SimpleAdmin._localizer == null)
+				return;
+			
+			if (caller != null && caller.IsValid == false)
+				caller = null;
+
+			string callerName = caller == null ? "Console" : caller.PlayerName;
+			string communityUrl = caller != null ? "<" + new SteamID(caller.SteamID).ToCommunityUrl().ToString() + ">" : "<https://steamcommunity.com/profiles/0>";
+			CS2_SimpleAdmin._discordWebhookClientLog.SendMessageAsync(GenerateMessageDiscord(CS2_SimpleAdmin._localizer["sa_discord_log_command", $"[{callerName}]({communityUrl})", commandString]));
+		}
 	}
 
 	public class SchemaString<SchemaClass> : NativeObject where SchemaClass : NativeObject

Menus/AdminMenu.cs

@@ -44,6 +44,12 @@ namespace CS2_SimpleAdmin.Menus
 				new ChatMenuOptionData("Manage Server", () => ManageServerMenu.OpenMenu(admin)),
 				new ChatMenuOptionData("Fun actions", () => FunActionsMenu.OpenMenu(admin)),
 			};
+			
+			List<CustomServerCommandData> customCommands = CS2_SimpleAdmin.Instance.Config.CustomServerCommands;
+			if (customCommands.Count > 0)
+			{
+				options.Add(new ChatMenuOptionData("Custom Commands", () => CustomCommandsMenu.OpenMenu(admin)));
+			}
 
 			if (AdminManager.PlayerHasPermissions(admin, "@css/root"))
 				options.Add(new ChatMenuOptionData("Manage Admins", () => ManageAdminsMenu.OpenMenu(admin)));

Menus/CustomCommandsMenu.cs

@@ -0,0 +1,55 @@
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Admin;
+using CounterStrikeSharp.API.Modules.Menu;
+
+namespace CS2_SimpleAdmin.Menus
+{
+	public static class CustomCommandsMenu
+	{
+		public static void OpenMenu(CCSPlayerController admin)
+		{
+			if (admin == null || admin.IsValid == false)
+				return;
+
+			if (AdminManager.PlayerHasPermissions(admin, "@css/generic") == false)
+			{
+				// TODO: Localize
+				admin.PrintToChat("[Simple Admin] You do not have permissions to use this command.");
+				return;
+			}
+
+			BaseMenu menu = AdminMenu.CreateMenu("Custom Commands");
+			List<ChatMenuOptionData> options = new();
+
+			List<CustomServerCommandData> customCommands = CS2_SimpleAdmin.Instance.Config.CustomServerCommands;
+			foreach (CustomServerCommandData customCommand in customCommands)
+			{
+				if (string.IsNullOrEmpty(customCommand.DisplayName) || string.IsNullOrEmpty(customCommand.Command))
+					continue;
+
+				bool hasRights = AdminManager.PlayerHasPermissions(admin, customCommand.Flag);
+				if (!hasRights)
+					continue;
+				
+				options.Add(new ChatMenuOptionData(customCommand.DisplayName, () =>
+				{
+					Helper.TryLogCommandOnDiscord(admin, customCommand.Command);
+					
+					if (customCommand.ExecuteOnClient)
+						admin.ExecuteClientCommand(customCommand.Command);
+					else
+						Server.ExecuteCommand(customCommand.Command);
+				}));
+			}
+
+			foreach (ChatMenuOptionData menuOptionData in options)
+			{
+				string menuName = menuOptionData.name;
+				menu.AddMenuOption(menuName, (_, _) => { menuOptionData.action?.Invoke(); }, menuOptionData.disabled);
+			}
+
+			AdminMenu.OpenMenu(admin, menu);
+		}
+	}
+}

Menus/FunActionsMenu.cs

@@ -21,7 +21,8 @@ namespace CS2_SimpleAdmin.Menus
 					_weaponsCache = new();
 					foreach (CsItem item in weaponsArray)
 					{
-						if (item == CsItem.Tablet) continue;
+						if (item == CsItem.Tablet)
+							continue;
 
 						_weaponsCache[(int)item] = item;
 					}
@@ -57,7 +58,7 @@ namespace CS2_SimpleAdmin.Menus
 			{
 				options.Add(new ChatMenuOptionData("God Mode", () => PlayersMenu.OpenAliveMenu(admin, "God Mode", GodMode)));
 				options.Add(new ChatMenuOptionData("No Clip", () => PlayersMenu.OpenAliveMenu(admin, "No Clip", NoClip)));
-				options.Add(new ChatMenuOptionData("Respawn", () => PlayersMenu.OpenAliveMenu(admin, "Respawn", Respawn)));
+				options.Add(new ChatMenuOptionData("Respawn", () => PlayersMenu.OpenDeadMenu(admin, "Respawn", Respawn)));
 				options.Add(new ChatMenuOptionData("Give Weapon", () => PlayersMenu.OpenAliveMenu(admin, "Give Weapon", GiveWeaponMenu)));
 			}
 
@@ -67,6 +68,8 @@ namespace CS2_SimpleAdmin.Menus
 				options.Add(new ChatMenuOptionData("Freeze", () => PlayersMenu.OpenAliveMenu(admin, "Freeze", Freeze)));
 				options.Add(new ChatMenuOptionData("HP", () => PlayersMenu.OpenAliveMenu(admin, "HP", SetHpMenu)));
 				options.Add(new ChatMenuOptionData("Speed", () => PlayersMenu.OpenAliveMenu(admin, "Speed", SetSpeedMenu)));
+				options.Add(new ChatMenuOptionData("Gravity", () => PlayersMenu.OpenAliveMenu(admin, "Gravity", SetGravityMenu)));
+				options.Add(new ChatMenuOptionData("Set Money", () => PlayersMenu.OpenMenu(admin, "Set Money", SetMoneyMenu)));
 			}
 
 			foreach (ChatMenuOptionData menuOptionData in options)
@@ -117,7 +120,8 @@ namespace CS2_SimpleAdmin.Menus
 
 		private static void Freeze(CCSPlayerController admin, CCSPlayerController player)
 		{
-			if (!(player.PlayerPawn?.Value?.IsValid ?? false)) return;
+			if (!(player.PlayerPawn?.Value?.IsValid ?? false))
+				return;
 
 			if (player.PlayerPawn.Value.MoveType != MoveType_t.MOVETYPE_OBSOLETE)
 				CS2_SimpleAdmin.Instance.Freeze(admin, player, -1);
@@ -184,5 +188,61 @@ namespace CS2_SimpleAdmin.Menus
 		{
 			CS2_SimpleAdmin.Instance.SetSpeed(admin, player, speed);
 		}
+
+		private static void SetGravityMenu(CCSPlayerController admin, CCSPlayerController player)
+		{
+			Tuple<string, float>[] _gravityArray = new[]
+			{
+				new Tuple<string, float>("0.1", .1f),
+				new Tuple<string, float>("0.25", .25f),
+				new Tuple<string, float>("0.5", .5f),
+				new Tuple<string, float>("0.75", .75f),
+				new Tuple<string, float>("1", 1),
+				new Tuple<string, float>("2", 2)
+			};
+
+			BaseMenu menu = AdminMenu.CreateMenu($"Set Gravity: {player.PlayerName}");
+
+			foreach (Tuple<string, float> gravityTuple in _gravityArray)
+			{
+				string optionName = gravityTuple.Item1;
+				menu.AddMenuOption(optionName, (_, _) => { SetGravity(admin, player, gravityTuple.Item2); });
+			}
+
+			AdminMenu.OpenMenu(admin, menu);
+		}
+
+		private static void SetGravity(CCSPlayerController admin, CCSPlayerController player, float gravity)
+		{
+			CS2_SimpleAdmin.Instance.SetGravity(admin, player, gravity);
+		}
+
+		private static void SetMoneyMenu(CCSPlayerController admin, CCSPlayerController player)
+		{
+			Tuple<string, int>[] _moneyArray = new[]
+			{
+				new Tuple<string, int>("$0", 0),
+				new Tuple<string, int>("$1000", 1000),
+				new Tuple<string, int>("$2500", 2500),
+				new Tuple<string, int>("$5000", 5000),
+				new Tuple<string, int>("$10000", 10000),
+				new Tuple<string, int>("$16000", 16000)
+			};
+
+			BaseMenu menu = AdminMenu.CreateMenu($"Set Money: {player.PlayerName}");
+
+			foreach (Tuple<string, int> moneyTuple in _moneyArray)
+			{
+				string optionName = moneyTuple.Item1;
+				menu.AddMenuOption(optionName, (_, _) => { SetMoney(admin, player, moneyTuple.Item2); });
+			}
+
+			AdminMenu.OpenMenu(admin, menu);
+		}
+
+		private static void SetMoney(CCSPlayerController admin, CCSPlayerController player, int money)
+		{
+			CS2_SimpleAdmin.Instance.SetMoney(admin, player, money);
+		}
 	}
-}
+}

Menus/ManageAdminsMenu.cs

@@ -24,9 +24,9 @@ namespace CS2_SimpleAdmin.Menus
 			// TODO: Localize options
 			// options added in order
 
-			options.Add(new ChatMenuOptionData("Add Admin", () => PlayersMenu.OpenAliveMenu(admin, "Add Admin", AddAdminMenu)));
+			options.Add(new ChatMenuOptionData("Add Admin", () => PlayersMenu.OpenRealPlayersMenu(admin, "Add Admin", AddAdminMenu)));
-			options.Add(new ChatMenuOptionData("Remove Admin", () => PlayersMenu.OpenAliveMenu(admin, "Remove Admin", RemoveAdmin, player => player != admin && admin.CanTarget(player))));
+			options.Add(new ChatMenuOptionData("Remove Admin", () => PlayersMenu.OpenAdminPlayersMenu(admin, "Remove Admin", RemoveAdmin, player => player != admin && admin.CanTarget(player))));
-			options.Add(new ChatMenuOptionData("Reload Admins", ReloadAdmins));
+			options.Add(new ChatMenuOptionData("Reload Admins", () => ReloadAdmins(admin)));
 
 			foreach (ChatMenuOptionData menuOptionData in options)
 			{
@@ -77,9 +77,9 @@ namespace CS2_SimpleAdmin.Menus
 			CS2_SimpleAdmin.Instance.RemoveAdmin(admin, player.SteamID.ToString());
 		}
 
-		private static void ReloadAdmins()
+		private static void ReloadAdmins(CCSPlayerController admin)
 		{
-			CS2_SimpleAdmin.Instance.ReloadAdmins();
+			CS2_SimpleAdmin.Instance.ReloadAdmins(admin);
 		}
 	}
 }

Menus/ManagePlayersMenu.cs

@@ -44,14 +44,14 @@ namespace CS2_SimpleAdmin.Menus
 
 			if (hasBan)
 			{
-				options.Add(new ChatMenuOptionData("Ban", () => PlayersMenu.OpenMenu(admin, "Ban", (admin, player) => DurationMenu.OpenMenu(admin, $"Ban: {player.PlayerName}", player, BanMenu))));
+				options.Add(new ChatMenuOptionData("Ban", () => PlayersMenu.OpenRealPlayersMenu(admin, "Ban", (admin, player) => DurationMenu.OpenMenu(admin, $"Ban: {player.PlayerName}", player, BanMenu))));
 			}
 
 			if (hasChat)
 			{
-				options.Add(new ChatMenuOptionData("Gag", () => PlayersMenu.OpenMenu(admin, "Gag", (admin, player) => DurationMenu.OpenMenu(admin, $"Gag: {player.PlayerName}", player, GagMenu))));
+				options.Add(new ChatMenuOptionData("Gag", () => PlayersMenu.OpenRealPlayersMenu(admin, "Gag", (admin, player) => DurationMenu.OpenMenu(admin, $"Gag: {player.PlayerName}", player, GagMenu))));
-				options.Add(new ChatMenuOptionData("Mute", () => PlayersMenu.OpenMenu(admin, "Mute", (admin, player) => DurationMenu.OpenMenu(admin, $"Mute: {player.PlayerName}", player, MuteMenu))));
+				options.Add(new ChatMenuOptionData("Mute", () => PlayersMenu.OpenRealPlayersMenu(admin, "Mute", (admin, player) => DurationMenu.OpenMenu(admin, $"Mute: {player.PlayerName}", player, MuteMenu))));
-				options.Add(new ChatMenuOptionData("Silence", () => PlayersMenu.OpenMenu(admin, "Silence", (admin, player) => DurationMenu.OpenMenu(admin, $"Silence: {player.PlayerName}", player, SilenceMenu))));
+				options.Add(new ChatMenuOptionData("Silence", () => PlayersMenu.OpenRealPlayersMenu(admin, "Silence", (admin, player) => DurationMenu.OpenMenu(admin, $"Silence: {player.PlayerName}", player, SilenceMenu))));
 			}
 
 			if (hasKick)

Menus/ManageServerMenu.cs

@@ -1,4 +1,3 @@
-using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Admin;
 using CounterStrikeSharp.API.Modules.Menu;
@@ -35,19 +34,6 @@ namespace CS2_SimpleAdmin.Menus
 
 			options.Add(new ChatMenuOptionData("Restart Game", () => CS2_SimpleAdmin.RestartGame(admin)));
 
-			List<CustomServerCommandData> customCommands = CS2_SimpleAdmin.Instance.Config.CustomServerCommands;
-			foreach (CustomServerCommandData customCommand in customCommands)
-			{
-				if (string.IsNullOrEmpty(customCommand.DisplayName) || string.IsNullOrEmpty(customCommand.Command))
-					continue;
-
-				bool hasRights = AdminManager.PlayerHasPermissions(admin, customCommand.Flag);
-				if (!hasRights)
-					continue;
-
-				options.Add(new ChatMenuOptionData(customCommand.DisplayName, () => Server.ExecuteCommand(customCommand.Command)));
-			}
-
 			foreach (ChatMenuOptionData menuOptionData in options)
 			{
 				string menuName = menuOptionData.name;

Menus/PlayersMenu.cs

@@ -1,15 +1,32 @@
+using System.Web;
 using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Admin;
 using CounterStrikeSharp.API.Modules.Menu;
 
 namespace CS2_SimpleAdmin.Menus
 {
 	public static class PlayersMenu
 	{
+		public static void OpenRealPlayersMenu(CCSPlayerController admin, string menuName, Action<CCSPlayerController, CCSPlayerController> onSelectAction, Func<CCSPlayerController, bool>? enableFilter = null)
+		{
+			OpenMenu(admin, menuName, onSelectAction, p => p.IsBot == false);
+		}
+
+		public static void OpenAdminPlayersMenu(CCSPlayerController admin, string menuName, Action<CCSPlayerController, CCSPlayerController> onSelectAction, Func<CCSPlayerController, bool>? enableFilter = null)
+		{
+			OpenMenu(admin, menuName, onSelectAction, p => AdminManager.GetPlayerAdminData(p)?.Flags?.Count > 0);
+		}
+
 		public static void OpenAliveMenu(CCSPlayerController admin, string menuName, Action<CCSPlayerController, CCSPlayerController> onSelectAction, Func<CCSPlayerController, bool>? enableFilter = null)
 		{
 			OpenMenu(admin, menuName, onSelectAction, p => p.PawnIsAlive);
 		}
 
+		public static void OpenDeadMenu(CCSPlayerController admin, string menuName, Action<CCSPlayerController, CCSPlayerController> onSelectAction, Func<CCSPlayerController, bool>? enableFilter = null)
+		{
+			OpenMenu(admin, menuName, onSelectAction, p => p.PawnIsAlive == false);
+		}
+
 		public static void OpenMenu(CCSPlayerController admin, string menuName, Action<CCSPlayerController, CCSPlayerController> onSelectAction, Func<CCSPlayerController, bool>? enableFilter = null)
 		{
 			BaseMenu menu = AdminMenu.CreateMenu(menuName);
@@ -17,14 +34,15 @@ namespace CS2_SimpleAdmin.Menus
 			IEnumerable<CCSPlayerController> players = Helper.GetValidPlayersWithBots();
 			foreach (CCSPlayerController player in players)
 			{
-				string optionName = player.PlayerName;
+				string optionName = HttpUtility.HtmlEncode(player.PlayerName);
+				if (enableFilter != null && enableFilter(player) == false)
+					continue;
+
 				bool enabled = admin.CanTarget(player);
-				if (enableFilter != null)
-					enabled &= enableFilter(player);
 				menu.AddMenuOption(optionName, (_, _) => { onSelectAction?.Invoke(admin, player); }, enabled == false);
 			}
 
 			AdminMenu.OpenMenu(admin, menu);
 		}
 	}
-}
+}

lang/en.json

@@ -44,8 +44,8 @@
 	"sa_admin_slap_message": "Admin {lightred}{0}{default} slapped {lightred}{1}{default}!",
 	"sa_admin_changemap_message": "Admin {lightred}{0}{default} changed map to {lightred}{1}{default}!",
 	"sa_admin_noclip_message": "Admin {lightred}{0}{default} toggled noclip for {lightred}{1}{default}!",
-	"sa_admin_freeze_message": "Admin {lightred}{0}{default} freezed {lightred}{1}{default}!",
+	"sa_admin_freeze_message": "Admin {lightred}{0}{default} froze {lightred}{1}{default}!",
-	"sa_admin_unfreeze_message": "Admin {lightred}{0}{default} umfreezed {lightred}{1}{default}!",
+	"sa_admin_unfreeze_message": "Admin {lightred}{0}{default} unfroze {lightred}{1}{default}!",
 	"sa_admin_rename_message": "Admin {lightred}{0}{default} changed {lightred}{1}{default} nickname to {lightred}{2}{default}!",
 	"sa_admin_respawn_message": "Admin {lightred}{0}{default} respawned {lightred}{1}{default}!",
 	"sa_admin_tp_message": "Admin {lightred}{0}{default} teleported to {lightred}{1}{default}!",