From 3344f94d368f23971d367b75e6ebbece18efd690 Mon Sep 17 00:00:00 2001
From: HitPanda <104197232+EnefFlow@users.noreply.github.com>
Date: Wed, 17 May 2023 20:15:12 +0300
Subject: [PATCH] [Fix] Roleban ban id fix (#77)

* roleban ban id fix

* clean up

* fix cast
---
 .../Administration/Managers/RoleBanManager.cs | 43 ++++++++++++++++---
 1 file changed, 37 insertions(+), 6 deletions(-)

diff --git a/Content.Server/Administration/Managers/RoleBanManager.cs b/Content.Server/Administration/Managers/RoleBanManager.cs
index a18890295d..4c3e90b961 100644
--- a/Content.Server/Administration/Managers/RoleBanManager.cs
+++ b/Content.Server/Administration/Managers/RoleBanManager.cs
@@ -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
 }