upstream

.github/ISSUE_TEMPLATE/config.yml

@@ -1,7 +1,7 @@
 contact_links:
   - name: Предложение
-    url: https://discord.com/invite/CPacm3dfrA
+    url: https://discord.gg/CuWu6kSznf #A-13
     about: Свои предложения можете оставлять в соответствующем канале Discord.
   - name: Сообщить об уязвимости
-    url: https://discord.com/invite/CPacm3dfrA
+    url: https://discord.gg/CuWu6kSznf #A-13
     about: Пожалуйста, сообщайте о серьезных эксплойтах и уязвимостях безопасности lemird (634710558364663819) или 13lackhawk (236910741146304515) в Discord.

Content.Client/Launcher/LauncherConnectingGui.xaml.cs

@@ -47,7 +47,7 @@ public LauncherConnectingGui(LauncherConnecting state, IRobustRandom random,
             ChangeLoginTip();
             ReconnectButton.OnPressed += ReconnectButtonPressed;
             RetryButton.OnPressed += ReconnectButtonPressed;
-            DiscordButton.OnPressed += _ => IoCManager.Resolve<IUriOpener>().OpenUri("https://discord.gg/CPacm3dfrA"); // A-13
+            DiscordButton.OnPressed += _ => IoCManager.Resolve<IUriOpener>().OpenUri("https://discord.gg/CuWu6kSznf"); // A-13
             ExitButton.OnPressed += _ => _state.Exit();
 
             var addr = state.Address;

Content.Docfx/index.md

@@ -6,4 +6,4 @@
 
 ## Links
 
-[Website](https://spacestation14.io/) | [Discord](https://discord.gg/t2jac3p) | [Forum](https://forum.spacestation14.io/) | [Steam](https://store.steampowered.com/app/1255460/Space_Station_14/) | [Standalone Download](https://spacestation14.io/about/nightlies/)
+[Website](https://spacestation14.io/) | [Discord](https://discord.gg/CuWu6kSznf) | [Forum](https://forum.spacestation14.io/) | [Steam](https://store.steampowered.com/app/1255460/Space_Station_14/) | [Standalone Download](https://spacestation14.io/about/nightlies/)

Content.Server/Administration/Managers/AdminManager.cs

@@ -19,12 +19,13 @@
 using Robust.Shared.Toolshed;
 using Robust.Shared.Toolshed.Errors;
 using Robust.Shared.Utility;
-
+using Content.Server.Andromeda.AdministrationNotifications.GameTicking; //A-13 AdminNotifications
 
 namespace Content.Server.Administration.Managers
 {
     public sealed partial class AdminManager : IAdminManager, IPostInjectInit, IConGroupControllerImplementation
     {
+        [Dependency] private readonly IEntityManager _entityManager = default!; //A-13 AdminNotifications
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IServerDbManager _dbManager = default!;
         [Dependency] private readonly IConfigurationManager _cfg = default!;
@@ -342,7 +343,7 @@ private void PlayerStatusChanged(object? sender, SessionStatusEventArgs e)
             }
             else if (e.NewStatus == SessionStatus.Disconnected)
             {
-                if (_admins.Remove(e.Session, out var reg ) && _cfg.GetCVar(CCVars.AdminAnnounceLogout))
+                if (_admins.TryGetValue(e.Session, out var reg ) && _cfg.GetCVar(CCVars.AdminAnnounceLogout)) //A-13 AdminNotifications
                 {
                     if (reg.Data.Stealth)
                     {
@@ -355,6 +356,12 @@ private void PlayerStatusChanged(object? sender, SessionStatusEventArgs e)
                         _chat.SendAdminAnnouncement(Loc.GetString("admin-manager-admin-logout-message",
                             ("name", e.Session.Name)));
                     }
+                    //A-13 AdminNotifications start
+                    var logoutEvent = new AdminLoggedOutEvent(e.Session);
+                    _entityManager.EventBus.RaiseEvent(EventSource.Local, logoutEvent);
+
+                    _admins.Remove(e.Session);
+                    //A-13 AdminNotifications end
                 }
             }
         }
@@ -398,6 +405,10 @@ private async void LoginAdminMaybe(ICommonSession session)
                         _chat.SendAdminAnnouncement(Loc.GetString("admin-manager-admin-login-message",
                             ("name", session.Name)));
                     }
+                    //A-13 AdminNotifications start
+                    var loginEvent = new AdminLoggedInEvent(session);
+                    _entityManager.EventBus.RaiseEvent(EventSource.Local, loginEvent);
+                    //A-13 AdminNotifications end
                 }
 
                 SendPermsChangedEvent(session);

Content.Server/Administration/Systems/AdminNotifySystem.cs

@@ -8,6 +8,9 @@
 using Robust.Shared.Audio.Systems;
 using Content.Server.Administration;
 using Content.Server.Administration.Managers;
+using Content.Server.Guardian; //A-13 Fix AdminNotifySystem
+using Content.Server.GameTicking.Rules.Components; //A-13 Fix AdminNotifySystem
+using System.Linq; //A-13 Fix AdminNotifySystem
 
 namespace Content.Server.Administration.Systems;
 
@@ -30,6 +33,14 @@ private void OnMobStateChanged(MobStateChangedEvent ev)
         if (!TryComp(ev.Target, out ActorComponent? actorComponent))
             return;
 
+        //A-13 Fix AdminNotifySystem start
+        if (!HasComp<CanHostGuardianComponent>(ev.Target))
+            return;
+
+        if (EntityQuery<NukeopsRuleComponent>().Any())
+            return;
+        //A-13 Fix AdminNotifySystem end
+
         if (actorComponent.PlayerSession.AttachedEntity == null || ev.NewMobState == MobState.Alive)
             return;
 

Content.Server/Andromeda/AdministrationNotifications/AdminNotificationsSystem.cs

@@ -0,0 +1,82 @@
+using Content.Shared.Administration;
+using Robust.Shared;
+using Robust.Shared.Configuration;
+using Robust.Shared.Player;
+using System.Net.Http;
+using System.Text.Json;
+using System.Text;
+using Content.Server.Discord;
+using Content.Shared.CCVar;
+using Content.Shared.Andromeda.CCVar;
+using Content.Server.Andromeda.AdministrationNotifications.GameTicking;
+
+namespace Content.Server.Andromeda.AdministrationNotifications
+{
+
+    public sealed class AdminNotificationsSystem : EntitySystem
+    {
+        [Dependency] private readonly IConfigurationManager _config = default!;
+        private ISawmill _sawmill = default!;
+        private readonly HttpClient _httpClient = new();
+        private string _webhookUrl = String.Empty;
+        private int _adminCount = 0;
+
+        public override void Initialize()
+        {
+            _sawmill = Logger.GetSawmill("admin_notifications");
+            SubscribeLocalEvent<AdminLoggedInEvent>(OnAdminLoggedIn);
+            SubscribeLocalEvent<AdminLoggedOutEvent>(OnAdminLoggedOut);
+            _config.OnValueChanged(AndromedaCCVars.DiscordAdminWebhook, value => _webhookUrl = value, true);
+        }
+
+        private async void SendDiscordMessage(WebhookPayload payload)
+        {
+            var request = await _httpClient.PostAsync(_webhookUrl,
+                new StringContent(JsonSerializer.Serialize(payload), Encoding.UTF8, "application/json"));
+
+            _sawmill.Debug($"Вебхук Discord в формате json: {JsonSerializer.Serialize(payload)}");
+
+            var content = await request.Content.ReadAsStringAsync();
+            if (!request.IsSuccessStatusCode)
+            {
+                _sawmill.Error($"Discord вернул неверный код статуса при публикации сообщения: {request.StatusCode}\nResponse: {content}");
+                return;
+            }
+        }
+
+        private void OnAdminLoggedIn(AdminLoggedInEvent e)
+        {
+            _adminCount++;
+            SendAdminStatusUpdate(e.Session, "вошёл", 0x00FF00);
+        }
+
+        private void OnAdminLoggedOut(AdminLoggedOutEvent e)
+        {
+            _adminCount--;
+            SendAdminStatusUpdate(e.Session, "вышел", 0xFF0000);
+        }
+
+        private void SendAdminStatusUpdate(ICommonSession session, string action, int color)
+        {
+            if (String.IsNullOrEmpty(_webhookUrl))
+                return;
+
+            var message = $"{session.Name} {action}. Всего администраторов онлайн: {_adminCount}";
+
+            var payload = new WebhookPayload
+            {
+                Username = "Отчёт входов админов",
+                Embeds = new List<WebhookEmbed>
+                {
+                    new()
+                    {
+                        Description = message,
+                        Color = color,
+                    },
+                },
+            };
+
+            SendDiscordMessage(payload);
+        }
+    }
+}

Content.Server/Andromeda/AdministrationNotifications/GameTicking/AdminLoggedEvent.cs

@@ -0,0 +1,13 @@
+using Robust.Shared.Player;
+
+namespace Content.Server.Andromeda.AdministrationNotifications.GameTicking;
+
+public sealed class AdminLoggedInEvent : EntityEventArgs
+{
+    public ICommonSession Session { get; }
+
+    public AdminLoggedInEvent(ICommonSession session)
+    {
+        Session = session;
+    }
+}

Content.Server/Andromeda/AdministrationNotifications/GameTicking/AdminLoggedOutEvent.cs

@@ -0,0 +1,13 @@
+using Robust.Shared.Player;
+
+namespace Content.Server.Andromeda.AdministrationNotifications.GameTicking;
+
+public sealed class AdminLoggedOutEvent : EntityEventArgs
+{
+    public ICommonSession Session { get; }
+
+    public AdminLoggedOutEvent(ICommonSession session)
+    {
+        Session = session;
+    }
+}