Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[Fix] Roleban ban id fix (#77)

Browse Source 
* roleban ban id fix

* clean up

* fix cast
This commit is contained in:
HitPanda
2023-05-17 20:15:12 +03:00
committed by Aviu00
parent 1fbae1c80c
commit 3344f94d36
1 changed files with 37 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
Content.Server/Administration/Managers/RoleBanManager.cs
View File

@@ -182,7 +182,15 @@ public sealed class RoleBanManager
role,
serverName);
UtkaSendJobBanEvent(admin, target, minutes, job, isGlobalBan, reason);
if (!await AddRoleBan(banDef))
{
UtkaSendResponse(false);
return;
}
var banId = await UtkaGetBanId(reason, role, targetUid);
UtkaSendJobBanEvent(admin, target, minutes, job, isGlobalBan, reason, banId);
UtkaSendResponse(true);
}
//WD end
@@ -263,8 +271,12 @@ public sealed class RoleBanManager
var length = expires == null ? Loc.GetString("cmd-roleban-inf") : Loc.GetString("cmd-roleban-until", ("expires", expires));
shell.WriteLine(Loc.GetString("cmd-roleban-success", ("target", target), ("role", role), ("reason", reason), ("length", length), ("server", serverName)));
if (job != null) // WD
UtkaSendJobBanEvent(shell.Player!.Name, target, minutes, job, isGlobalBan, reason); //WD
// WD start
var banId = await UtkaGetBanId(reason, role, targetUid);
if (job != null)
UtkaSendJobBanEvent(shell.Player!.Name, target, minutes, job, isGlobalBan, reason, banId);
//WD end
}
#endregion
@@ -279,20 +291,39 @@ public sealed class RoleBanManager
_utkaSockets.SendMessageToAll(utkaBanned);
}
private void UtkaSendJobBanEvent(string ackey, string ckey, uint duration, string role, bool global,
string reason)
private async void UtkaSendJobBanEvent(string ackey, string ckey, uint duration, string job, bool global,
string reason, int banId)
{
var utkaBanned = new UtkaBannedEvent()
{
ACkey = ackey,
Ckey = ckey,
Duration = duration,
Bantype = role,
Bantype = job,
Global = global,
Reason = reason
};
_utkaSockets.SendMessageToAll(utkaBanned);
}
private async Task<int> UtkaGetBanId(string reason, string role, NetUserId targetUid)
{
var banId = 0;
var banList = await _db.GetServerRoleBansAsync(null, targetUid, null);
foreach (var ban in banList)
{
if (ban.Reason == reason)
{
if (ban.Role == role && ban.Id != null)
{
banId = ban.Id.Value;
}
}
}
return banId;
}
//WD end
}