From 0a408dece4af4a312afe941aa42bdf2cd318506c Mon Sep 17 00:00:00 2001
From: VigersRay <VigersRay@gmail.com>
Date: Mon, 22 Jul 2024 04:38:50 +0300
Subject: [PATCH] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=D1=8B=20=D0=B0=D0=BF?=
 =?UTF-8?q?=D1=81=D1=82=D1=80=D0=B8=D0=BC=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../UI/SurveillanceCameraMonitorBoundUi.cs      | 11 ++---------
 .../UI/SurveillanceCameraMonitorWindow.xaml.cs  | 17 +++++++++++++----
 .../VoiceMask/VoiceMaskNameChangeWindow.xaml.cs |  6 +++---
 .../Administration/Managers/BanManager.cs       |  9 +++++++--
 Resources/migration.yml                         |  1 +
 5 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs
index 1cb614d64b..3e290d3e19 100644
--- a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs
+++ b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs
@@ -33,15 +33,6 @@ public sealed class SurveillanceCameraMonitorBoundUserInterface : BoundUserInter
     {
         base.Open();
 
-        // Sunrise-start
-        EntityUid? gridUid = null;
-
-        if (_entManager.TryGetComponent<TransformComponent>(Owner, out var xform))
-        {
-            gridUid = xform.GridUid;
-        }
-        // Sunrise-end
-
         _window = this.CreateWindow<SurveillanceCameraMonitorWindow>();
 
         _window.CameraSelected += OnCameraSelected;
@@ -49,6 +40,8 @@ public sealed class SurveillanceCameraMonitorBoundUserInterface : BoundUserInter
         _window.SubnetRefresh += OnSubnetRefresh;
         _window.CameraSwitchTimer += OnCameraSwitchTimer;
         _window.CameraDisconnect += OnCameraDisconnect;
+
+        _window.SetEntity(Owner);
     }
 
     private void OnCameraSelected(string cameraAddress, string subnetAddress) // Sunrise-edit
diff --git a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorWindow.xaml.cs b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorWindow.xaml.cs
index a25b8827df..25af4a7e93 100644
--- a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorWindow.xaml.cs
+++ b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorWindow.xaml.cs
@@ -35,7 +35,9 @@ public sealed partial class SurveillanceCameraMonitorWindow : FancyWindow
     private Texture? _blipTexture; // Sunrise-edit
     private NetEntity? _trackedEntity; // Sunrise-edit
 
-    public SurveillanceCameraMonitorWindow(EntityUid? mapUid)
+    public EntityUid Entity;
+
+    public SurveillanceCameraMonitorWindow()
     {
         RobustXamlLoader.Load(this);
 
@@ -65,14 +67,21 @@ public sealed partial class SurveillanceCameraMonitorWindow : FancyWindow
 
         // Sunrise-start
         NavMap.TrackedEntitySelectedAction += SetTrackedEntityFromNavMap;
-
         _entManager = IoCManager.Resolve<IEntityManager>();
+        // Sunrise-end
+    }
 
-        if (_entManager.TryGetComponent<TransformComponent>(mapUid, out var xform))
+    public void SetEntity(EntityUid uid)
+    {
+        Entity = uid;
+
+        // Pass owner to nav map
+        NavMap.Owner = uid;
+
+        if (_entManager.TryGetComponent<TransformComponent>(uid, out var xform))
             NavMap.MapUid = xform.GridUid;
         else
             NavMap.Visible = false;
-        // Sunrise-end
     }
 
     // Sunrise-start
diff --git a/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs b/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
index a12f14ff30..54a280a8a4 100644
--- a/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
+++ b/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
@@ -22,7 +22,7 @@ public sealed partial class VoiceMaskNameChangeWindow : FancyWindow
 
     private string? _verb;
 
-    public VoiceMaskNameChangeWindow(IPrototypeManager proto)
+    public VoiceMaskNameChangeWindow()
     {
         RobustXamlLoader.Load(this);
 
@@ -37,13 +37,13 @@ public sealed partial class VoiceMaskNameChangeWindow : FancyWindow
             SpeechVerbSelector.SelectId(args.Id);
         };
 
-        ReloadVerbs(proto);
+        ReloadVerbs(IoCManager.Resolve<IPrototypeManager>());
 
         // Sunrise-TTS-Start
         if (IoCManager.Resolve<IConfigurationManager>().GetCVar(SunriseCCVars.TTSEnabled))
         {
             TTSContainer.Visible = true;
-            ReloadVoices(proto);
+            ReloadVoices(IoCManager.Resolve<IPrototypeManager>());
         }
         // Sunrise-TTS-End
 
diff --git a/Content.Server/Administration/Managers/BanManager.cs b/Content.Server/Administration/Managers/BanManager.cs
index e424a0de4f..e621e6976f 100644
--- a/Content.Server/Administration/Managers/BanManager.cs
+++ b/Content.Server/Administration/Managers/BanManager.cs
@@ -559,8 +559,13 @@ public sealed class BanManager : IBanManager, IPostInjectInit
     DateTime.UtcNow,
     TimeZoneInfo.FindSystemTimeZoneById("Russian Standard Time"));
 
-        var adminDiscordId = await _discordAuth.GetDiscordUserId(banDef.BanningAdmin);
-        var targetDiscordId = await _discordAuth.GetDiscordUserId(banDef.UserId);
+        string? adminDiscordId = null;
+        string? targetDiscordId = null;
+        if (_discordAuth != null)
+        {
+            adminDiscordId = await _discordAuth.GetDiscordUserId(banDef.BanningAdmin);
+            targetDiscordId = await _discordAuth.GetDiscordUserId(banDef.UserId);
+        }
 
         var adminLink = "";
         var targetLink = "";
diff --git a/Resources/migration.yml b/Resources/migration.yml
index 750027589c..f2062aa55d 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -382,3 +382,4 @@ SignHydro3: SignHydro1
 # Sunrise migrations
 AirlockExternalGlassShuttleArrivals: AirlockExternalGlassShuttleArrivalsLocked
 AirlockHatchSyndicate: AirlockHatchSyndicateLocked
+SurveillanceCameraWirelessRouterBase: SurveillanceCameraWirelessRouterConstructed