cs2/SimpleAdmin
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

1.6.3b

Browse source 
```diff
+ Small code cleanup
+ FIXED ban check on connect
```
This commit is contained in:
Dawid Bepierszcz 2024-10-08 00:54:20 +02:00
parent d0207f3d0b
commit 9820d74095
8 changed files with 109 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CS2-SimpleAdmin/Commands/basebans.cs
View file

@ -394,8 +394,6 @@ public partial class CS2_SimpleAdmin
{
if (Database == null) return;
var callerSteamId = caller?.SteamID.ToString() ?? _localizer?["sa_console"] ?? "Console";
if (command.GetArg(1).Length <= 1)
{
command.ReplyToCommand($"Too short pattern to search.");

14
CS2-SimpleAdmin/Commands/basecommands.cs
View file

@ -198,10 +198,9 @@ public partial class CS2_SimpleAdmin
public static void AddAdmin(CCSPlayerController? caller, string steamid, string name, string flags, int immunity, int time = 0, bool globalAdmin = false, CommandInfo? command = null)
{
if (Database == null) return;
PermissionManager adminManager = new(Database);
var flagsList = flags.Split(',').Select(flag => flag.Trim()).ToList();
_ = adminManager.AddAdminBySteamId(steamid, name, flagsList, immunity, time, globalAdmin);
_ = Instance.PermissionManager.AddAdminBySteamId(steamid, name, flagsList, immunity, time, globalAdmin);
Helper.LogCommand(caller, $"css_addadmin {steamid} {name} {flags} {immunity} {time}");
@ -289,10 +288,9 @@ public partial class CS2_SimpleAdmin
private static void AddGroup(CCSPlayerController? caller, string name, string flags, int immunity, bool globalGroup, CommandInfo? command = null)
{
if (Database == null) return;
PermissionManager adminManager = new(Database);
var flagsList = flags.Split(',').Select(flag => flag.Trim()).ToList();
_ = adminManager.AddGroup(name, flagsList, immunity, globalGroup);
_ = Instance.PermissionManager.AddGroup(name, flagsList, immunity, globalGroup);
Helper.LogCommand(caller, $"css_addgroup {name} {flags} {immunity}");
@ -367,12 +365,10 @@ public partial class CS2_SimpleAdmin
AdminManager.RemovePlayerAdminData(steamId);
}
PermissionManager adminManager = new(Database);
Task.Run(async () =>
{
await adminManager.CrateGroupsJsonFile();
await adminManager.CreateAdminsJsonFile();
await PermissionManager.CrateGroupsJsonFile();
await PermissionManager.CreateAdminsJsonFile();
var adminsFile = await File.ReadAllTextAsync(Instance.ModuleDirectory + "/data/admins.json");
var groupsFile = await File.ReadAllTextAsync(Instance.ModuleDirectory + "/data/groups.json");

48
CS2-SimpleAdmin/Commands/basecomms.cs
View file

@ -42,18 +42,17 @@ public partial class CS2_SimpleAdmin
return;
}
Gag(caller, player, time, reason, callerName, MuteManager, command);
Gag(caller, player, time, reason, callerName, command);
});
}
internal void Gag(CCSPlayerController? caller, CCSPlayerController player, int time, string reason, string? callerName = null, MuteManager? muteManager = null, CommandInfo? command = null, bool silent = false)
internal void Gag(CCSPlayerController? caller, CCSPlayerController player, int time, string reason, string? callerName = null, CommandInfo? command = null, bool silent = false)
{
if (Database == null || !player.IsValid || !player.UserId.HasValue) return;
if (!caller.CanTarget(player)) return;
// Set default caller name if not provided
callerName ??= caller == null ? _localizer?["sa_console"] ?? "Console" : caller.PlayerName;
muteManager ??= new MuteManager(Database);
// Get player and admin information
var playerInfo = PlayersInfo[player.UserId.Value];
@ -62,7 +61,7 @@ public partial class CS2_SimpleAdmin
// Asynchronously handle gag logic
Task.Run(async () =>
{
await muteManager.MutePlayer(playerInfo, adminInfo, reason, time);
await MuteManager.MutePlayer(playerInfo, adminInfo, reason, time);
});
// Add penalty to the player's penalty manager
@ -141,7 +140,7 @@ public partial class CS2_SimpleAdmin
if (!caller.CanTarget(player)) return;
// Perform the gag for an online player
Gag(caller, player, time, reason, callerName, MuteManager, silent: true);
Gag(caller, player, time, reason, callerName, silent: true);
}
else
{
@ -176,7 +175,6 @@ public partial class CS2_SimpleAdmin
}
Helper.LogCommand(caller, command);
var muteManager = new MuteManager(Database);
// Check if pattern is a valid SteamID64
if (Helper.ValidateSteamId(pattern, out var steamId) && steamId != null)
@ -190,7 +188,7 @@ public partial class CS2_SimpleAdmin
Task.Run(async () =>
{
await muteManager.UnmutePlayer(player.SteamID.ToString(), callerSteamId, reason);
await MuteManager.UnmutePlayer(player.SteamID.ToString(), callerSteamId, reason);
});
command.ReplyToCommand($"Ungaged player {player.PlayerName}.");
@ -211,7 +209,7 @@ public partial class CS2_SimpleAdmin
Task.Run(async () =>
{
await muteManager.UnmutePlayer(namePlayer.SteamID.ToString(), callerSteamId, reason);
await MuteManager.UnmutePlayer(namePlayer.SteamID.ToString(), callerSteamId, reason);
});
command.ReplyToCommand($"Ungaged player {namePlayer.PlayerName}.");
@ -220,7 +218,7 @@ public partial class CS2_SimpleAdmin
{
Task.Run(async () =>
{
await muteManager.UnmutePlayer(pattern, callerSteamId, reason);
await MuteManager.UnmutePlayer(pattern, callerSteamId, reason);
});
command.ReplyToCommand($"Ungaged offline player with pattern {pattern}.");
@ -258,18 +256,17 @@ public partial class CS2_SimpleAdmin
return;
}
Mute(caller, player, time, reason, callerName, MuteManager, command);
Mute(caller, player, time, reason, callerName, command);
});
}
internal void Mute(CCSPlayerController? caller, CCSPlayerController player, int time, string reason, string? callerName = null, MuteManager? muteManager = null, CommandInfo? command = null, bool silent = false)
internal void Mute(CCSPlayerController? caller, CCSPlayerController player, int time, string reason, string? callerName = null, CommandInfo? command = null, bool silent = false)
{
if (Database == null || !player.IsValid || !player.UserId.HasValue) return;
if (!caller.CanTarget(player)) return;
// Set default caller name if not provided
callerName ??= caller == null ? _localizer?["sa_console"] ?? "Console" : caller.PlayerName;
muteManager ??= new MuteManager(Database);
// Get player and admin information
var playerInfo = PlayersInfo[player.UserId.Value];
@ -281,7 +278,7 @@ public partial class CS2_SimpleAdmin
// Asynchronously handle mute logic
Task.Run(async () =>
{
await muteManager.MutePlayer(playerInfo, adminInfo, reason, time, 1);
await MuteManager.MutePlayer(playerInfo, adminInfo, reason, time, 1);
});
// Add penalty to the player's penalty manager
@ -360,7 +357,7 @@ public partial class CS2_SimpleAdmin
if (!caller.CanTarget(player)) return;
// Perform the mute for an online player
Mute(caller, player, time, reason, callerName, MuteManager, silent: true);
Mute(caller, player, time, reason, callerName, silent: true);
}
else
{
@ -395,7 +392,6 @@ public partial class CS2_SimpleAdmin
}
Helper.LogCommand(caller, command);
var muteManager = new MuteManager(Database);
// Check if pattern is a valid SteamID64
if (Helper.ValidateSteamId(pattern, out var steamId) && steamId != null)
@ -410,7 +406,7 @@ public partial class CS2_SimpleAdmin
Task.Run(async () =>
{
await muteManager.UnmutePlayer(player.SteamID.ToString(), callerSteamId, reason, 1);
await MuteManager.UnmutePlayer(player.SteamID.ToString(), callerSteamId, reason, 1);
});
command.ReplyToCommand($"Unmuted player {player.PlayerName}.");
@ -432,7 +428,7 @@ public partial class CS2_SimpleAdmin
Task.Run(async () =>
{
await muteManager.UnmutePlayer(namePlayer.SteamID.ToString(), callerSteamId, reason, 1);
await MuteManager.UnmutePlayer(namePlayer.SteamID.ToString(), callerSteamId, reason, 1);
});
command.ReplyToCommand($"Unmuted player {namePlayer.PlayerName}.");
@ -441,7 +437,7 @@ public partial class CS2_SimpleAdmin
{
Task.Run(async () =>
{
await muteManager.UnmutePlayer(pattern, callerSteamId, reason, 1);
await MuteManager.UnmutePlayer(pattern, callerSteamId, reason, 1);
});
command.ReplyToCommand($"Unmuted offline player with pattern {pattern}.");
@ -479,18 +475,17 @@ public partial class CS2_SimpleAdmin
return;
}
Silence(caller, player, time, reason, callerName, MuteManager, command);
Silence(caller, player, time, reason, callerName, command);
});
}
internal void Silence(CCSPlayerController? caller, CCSPlayerController player, int time, string reason, string? callerName = null, MuteManager? muteManager = null, CommandInfo? command = null, bool silent = false)
internal void Silence(CCSPlayerController? caller, CCSPlayerController player, int time, string reason, string? callerName = null, CommandInfo? command = null, bool silent = false)
{
if (Database == null || !player.IsValid || !player.UserId.HasValue) return;
if (!caller.CanTarget(player)) return;
// Set default caller name if not provided
callerName ??= caller == null ? _localizer?["sa_console"] ?? "Console" : caller.PlayerName;
muteManager ??= new MuteManager(Database);
// Get player and admin information
var playerInfo = PlayersInfo[player.UserId.Value];
@ -499,7 +494,7 @@ public partial class CS2_SimpleAdmin
// Asynchronously handle silence logic
Task.Run(async () =>
{
await muteManager.MutePlayer(playerInfo, adminInfo, reason, time, 2); // Assuming 2 is the type for silence
await MuteManager.MutePlayer(playerInfo, adminInfo, reason, time, 2); // Assuming 2 is the type for silence
});
// Add penalty to the player's penalty manager
@ -578,7 +573,7 @@ public partial class CS2_SimpleAdmin
if (!caller.CanTarget(player)) return;
// Perform the silence for an online player
Silence(caller, player, time, reason, callerName, MuteManager, silent: true);
Silence(caller, player, time, reason, callerName, silent: true);
}
else
{
@ -613,7 +608,6 @@ public partial class CS2_SimpleAdmin
}
Helper.LogCommand(caller, command);
var muteManager = new MuteManager(Database);
// Check if pattern is a valid SteamID64
if (Helper.ValidateSteamId(pattern, out var steamId) && steamId != null)
@ -630,7 +624,7 @@ public partial class CS2_SimpleAdmin
Task.Run(async () =>
{
await muteManager.UnmutePlayer(player.SteamID.ToString(), callerSteamId, reason, 2); // Unmute by type 2 (silence)
await MuteManager.UnmutePlayer(player.SteamID.ToString(), callerSteamId, reason, 2); // Unmute by type 2 (silence)
});
command.ReplyToCommand($"Unsilenced player {player.PlayerName}.");
@ -654,7 +648,7 @@ public partial class CS2_SimpleAdmin
Task.Run(async () =>
{
await muteManager.UnmutePlayer(namePlayer.SteamID.ToString(), callerSteamId, reason, 2); // Unmute by type 2 (silence)
await MuteManager.UnmutePlayer(namePlayer.SteamID.ToString(), callerSteamId, reason, 2); // Unmute by type 2 (silence)
});
command.ReplyToCommand($"Unsilenced player {namePlayer.PlayerName}.");
@ -663,7 +657,7 @@ public partial class CS2_SimpleAdmin
{
Task.Run(async () =>
{
await muteManager.UnmutePlayer(pattern, callerSteamId, reason, 2); // Unmute by type 2 (silence)
await MuteManager.UnmutePlayer(pattern, callerSteamId, reason, 2); // Unmute by type 2 (silence)
});
command.ReplyToCommand($"Unsilenced offline player with pattern {pattern}.");