diff --git a/Content.Server/Administration/Commands/StealthminCommand.cs b/Content.Server/Administration/Commands/StealthminCommand.cs deleted file mode 100644 index 49d8363481..0000000000 --- a/Content.Server/Administration/Commands/StealthminCommand.cs +++ /dev/null @@ -1,39 +0,0 @@ -using Content.Server.Administration.Managers; -using Content.Shared.Administration; -using JetBrains.Annotations; -using Robust.Shared.Console; -using Robust.Shared.Utility; - -namespace Content.Server.Administration.Commands; - -[UsedImplicitly] -[AdminCommand(AdminFlags.Stealth)] -public sealed class StealthminCommand : LocalizedCommands -{ - public override string Command => "stealthmin"; - - public override void Execute(IConsoleShell shell, string argStr, string[] args) - { - var player = shell.Player; - if (player == null) - { - shell.WriteLine(Loc.GetString("cmd-stealthmin-no-console")); - return; - } - - var mgr = IoCManager.Resolve(); - - var adminData = mgr.GetAdminData(player); - - DebugTools.AssertNotNull(adminData); - - if (!adminData!.Stealth) - { - mgr.Stealth(player); - } - else - { - mgr.UnStealth(player); - } - } -} diff --git a/Content.Server/Administration/Managers/AdminManager.cs b/Content.Server/Administration/Managers/AdminManager.cs index b5db392bad..39cbe98222 100644 --- a/Content.Server/Administration/Managers/AdminManager.cs +++ b/Content.Server/Administration/Managers/AdminManager.cs @@ -4,7 +4,6 @@ using System.Reflection; using System.Threading.Tasks; using Content.Server.Chat.Managers; using Content.Server.Database; -using Content.Server.Players; using Content.Shared.Administration; using Content.Shared.CCVar; using Content.Shared.Players; @@ -98,44 +97,6 @@ namespace Content.Server.Administration.Managers UpdateAdminStatus(session); } - public void Stealth(ICommonSession session) - { - if (!_admins.TryGetValue(session, out var reg)) - { - throw new ArgumentException($"Player {session} is not an admin"); - } - - if (reg.Data.Stealth) - return; - - var playerData = session.ContentData()!; - playerData.Stealthed = true; - reg.Data.Stealth = true; - - _chat.DispatchServerMessage(session, Loc.GetString("admin-manager-stealthed-message")); - _chat.SendAdminAnnouncement(Loc.GetString("admin-manager-self-de-admin-message", ("exAdminName", session.Name)), AdminFlags.Stealth); - _chat.SendAdminAnnouncement(Loc.GetString("admin-manager-self-enable-stealth", ("stealthAdminName", session.Name)), flagWhitelist: AdminFlags.Stealth); - } - - public void UnStealth(ICommonSession session) - { - if (!_admins.TryGetValue(session, out var reg)) - { - throw new ArgumentException($"Player {session} is not an admin"); - } - - if (!reg.Data.Stealth) - return; - - var playerData = session.ContentData()!; - playerData.Stealthed = false; - reg.Data.Stealth = false; - - _chat.DispatchServerMessage(session, Loc.GetString("admin-manager-unstealthed-message")); - _chat.SendAdminAnnouncement(Loc.GetString("admin-manager-self-re-admin-message", ("newAdminName", session.Name)), flagBlacklist: AdminFlags.Stealth); - _chat.SendAdminAnnouncement(Loc.GetString("admin-manager-self-disable-stealth", ("exStealthAdminName", session.Name)), flagWhitelist: AdminFlags.Stealth); - } - public void ReAdmin(ICommonSession session) { if (!_admins.TryGetValue(session, out var reg)) @@ -215,11 +176,6 @@ namespace Content.Server.Administration.Managers _chat.DispatchServerMessage(player, Loc.GetString("admin-manager-admin-permissions-updated-message")); } - - if (player.ContentData()!.Stealthed) - { - aData.Stealth = true; - } } SendPermsChangedEvent(player); @@ -342,19 +298,9 @@ namespace Content.Server.Administration.Managers } else if (e.NewStatus == SessionStatus.Disconnected) { - if (_admins.Remove(e.Session, out var reg ) && _cfg.GetCVar(CCVars.AdminAnnounceLogout)) + if (_admins.Remove(e.Session) && _cfg.GetCVar(CCVars.AdminAnnounceLogout)) { - if (reg.Data.Stealth) - { - _chat.SendAdminAnnouncement(Loc.GetString("admin-manager-admin-logout-message", - ("name", e.Session.Name)), flagWhitelist: AdminFlags.Stealth); - - } - else - { - _chat.SendAdminAnnouncement(Loc.GetString("admin-manager-admin-logout-message", - ("name", e.Session.Name))); - } + _chat.SendAdminAnnouncement(Loc.GetString("admin-manager-admin-logout-message", ("name", e.Session.Name))); } } } @@ -377,27 +323,13 @@ namespace Content.Server.Administration.Managers _admins.Add(session, reg); - if (session.ContentData()!.Stealthed) - reg.Data.Stealth = true; - if (!session.ContentData()!.ExplicitlyDeadminned) { reg.Data.Active = true; if (_cfg.GetCVar(CCVars.AdminAnnounceLogin)) { - if (reg.Data.Stealth) - { - - _chat.DispatchServerMessage(session, Loc.GetString("admin-manager-stealthed-message")); - _chat.SendAdminAnnouncement(Loc.GetString("admin-manager-admin-login-message", - ("name", session.Name)), flagWhitelist: AdminFlags.Stealth); - } - else - { - _chat.SendAdminAnnouncement(Loc.GetString("admin-manager-admin-login-message", - ("name", session.Name))); - } + _chat.SendAdminAnnouncement(Loc.GetString("admin-manager-admin-login-message", ("name", session.Name))); } SendPermsChangedEvent(session); diff --git a/Content.Server/Administration/Managers/IAdminManager.cs b/Content.Server/Administration/Managers/IAdminManager.cs index 95967b24ac..a52ec7b099 100644 --- a/Content.Server/Administration/Managers/IAdminManager.cs +++ b/Content.Server/Administration/Managers/IAdminManager.cs @@ -41,16 +41,6 @@ namespace Content.Server.Administration.Managers /// void ReAdmin(ICommonSession session); - /// - /// Make admin hidden from adminwho. - /// - void Stealth(ICommonSession session); - - /// - /// Unhide admin from adminwho. - /// - void UnStealth(ICommonSession session); - /// /// Re-loads the permissions of an player in case their admin data changed DB-side. /// diff --git a/Content.Server/Chat/Managers/ChatManager.cs b/Content.Server/Chat/Managers/ChatManager.cs index 5dfecbf5e4..872925151a 100644 --- a/Content.Server/Chat/Managers/ChatManager.cs +++ b/Content.Server/Chat/Managers/ChatManager.cs @@ -152,23 +152,9 @@ namespace Content.Server.Chat.Managers _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Server message to {player:Player}: {message}"); } - public void SendAdminAnnouncement(string message, AdminFlags? flagBlacklist, AdminFlags? flagWhitelist) + public void SendAdminAnnouncement(string message) { - var clients = _adminManager.ActiveAdmins.Where(p => - { - var adminData = _adminManager.GetAdminData(p); - - DebugTools.AssertNotNull(adminData); - - if (adminData == null) - return false; - - if (flagBlacklist != null && adminData.HasFlag(flagBlacklist.Value)) - return false; - - return flagWhitelist == null || adminData.HasFlag(flagWhitelist.Value); - - }).Select(p => p.Channel); + var clients = _adminManager.ActiveAdmins.Select(p => p.Channel); var wrappedMessage = Loc.GetString("chat-manager-send-admin-announcement-wrap-message", ("adminChannelName", Loc.GetString("chat-manager-admin-channel-name")), ("message", FormattedMessage.EscapeText(message))); diff --git a/Content.Shared/Administration/AdminData.cs b/Content.Shared/Administration/AdminData.cs index 137d26a626..3748363af5 100644 --- a/Content.Shared/Administration/AdminData.cs +++ b/Content.Shared/Administration/AdminData.cs @@ -14,11 +14,6 @@ namespace Content.Shared.Administration public bool Stealth; // WD - /// - /// Whether the admin is in stealth mode and won't appear in adminwho to admins without the Stealth flag. - /// - public bool Stealth; - /// /// The admin's title. /// @@ -63,14 +58,6 @@ namespace Content.Shared.Administration return HasFlag(AdminFlags.Admin); } - /// - /// Check if this admin can be hidden and see other hidden admins. - /// - public bool CanStealth() - { - return HasFlag(AdminFlags.Stealth); - } - public bool CanAdminReloadPrototypes() { return HasFlag(AdminFlags.Host); diff --git a/Content.Shared/Administration/AdminFlags.cs b/Content.Shared/Administration/AdminFlags.cs index bbec6e8b19..aebc63a46a 100644 --- a/Content.Shared/Administration/AdminFlags.cs +++ b/Content.Shared/Administration/AdminFlags.cs @@ -104,11 +104,6 @@ namespace Content.Shared.Administration /// MassBan = 1 << 17, - /// - /// Allows you to remain hidden from adminwho except to other admins with this flag. - /// - Stealth = 1 << 16, - /// /// Dangerous host permissions like scsi. /// diff --git a/Content.Shared/Players/ContentPlayerData.cs b/Content.Shared/Players/ContentPlayerData.cs index 16b6ace3a1..7545eb58fc 100644 --- a/Content.Shared/Players/ContentPlayerData.cs +++ b/Content.Shared/Players/ContentPlayerData.cs @@ -1,5 +1,4 @@ -using Content.Shared.Administration; -using Content.Shared.GameTicking; +using Content.Shared.GameTicking; using Content.Shared.Mind; using Robust.Shared.Network; @@ -38,14 +37,9 @@ public sealed class ContentPlayerData /// public bool ExplicitlyDeadminned { get; set; } - /// - /// If true, the admin will not show up in adminwho except to admins with the flag. - /// - public bool Stealthed { get; set; } - public ContentPlayerData(NetUserId userId, string name) { UserId = userId; Name = name; } -} +} \ No newline at end of file diff --git a/Resources/Locale/en-US/administration/commands/stealthmin-command.ftl b/Resources/Locale/en-US/administration/commands/stealthmin-command.ftl deleted file mode 100644 index 4fb5e52105..0000000000 --- a/Resources/Locale/en-US/administration/commands/stealthmin-command.ftl +++ /dev/null @@ -1,3 +0,0 @@ -cmd-stealthmin-desc = Toggle whether others can see you in adminwho. -cmd-stealthmin-help = Usage: stealthmin\nUse stealthmin to toggle whether you appear in the output of the adminwho command. -cmd-stealthmin-no-console = You cannot use this command from the server console. diff --git a/Resources/Locale/en-US/administration/managers/admin-manager.ftl b/Resources/Locale/en-US/administration/managers/admin-manager.ftl index b70f550fc3..b1bbcc4c8c 100644 --- a/Resources/Locale/en-US/administration/managers/admin-manager.ftl +++ b/Resources/Locale/en-US/administration/managers/admin-manager.ftl @@ -6,8 +6,4 @@ admin-manager-no-longer-admin-message = You are no longer an admin. admin-manager-admin-permissions-updated-message = Your admin permission have been updated. admin-manager-admin-logout-message = Admin logout: {$name} admin-manager-admin-login-message = Admin login: {$name} -admin-manager-admin-data-host-title = Host -admin-manager-stealthed-message = You are now a hidden admin. -admin-manager-unstealthed-message = You are no longer hidden. -admin-manager-self-enable-stealth = {$stealthAdminName} is now hidden. -admin-manager-self-disable-stealth = {$exStealthAdminName} is no longer hidden. +admin-manager-admin-data-host-title = Host \ No newline at end of file