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

Revert "Add stealthmins (#26263)"

Browse Source 
This reverts commit dca0c6694b.

# Conflicts:
#	Content.Server/Administration/Commands/AdminWhoCommand.cs
#	Content.Server/Administration/Managers/AdminManager.cs
#	Content.Server/Chat/Managers/IChatManager.cs
This commit is contained in:
Remuchi
2024-03-30 10:41:05 +07:00
parent 0b2238b57a
commit 5aff149c43
9 changed files with 8 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
Content.Server/Administration/Commands/StealthminCommand.cs
View File

@@ -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<IAdminManager>();
var adminData = mgr.GetAdminData(player);
DebugTools.AssertNotNull(adminData);
if (!adminData!.Stealth)
{
mgr.Stealth(player);
}
else
{
mgr.UnStealth(player);
}
}
}

74
Content.Server/Administration/Managers/AdminManager.cs
View File

@@ -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);

10
Content.Server/Administration/Managers/IAdminManager.cs
View File

@@ -41,16 +41,6 @@ namespace Content.Server.Administration.Managers
/// </summary>
void ReAdmin(ICommonSession session);
/// <summary>
/// Make admin hidden from adminwho.
/// </summary>
void Stealth(ICommonSession session);
/// <summary>
/// Unhide admin from adminwho.
/// </summary>
void UnStealth(ICommonSession session);
/// <summary>
/// Re-loads the permissions of an player in case their admin data changed DB-side.
/// </summary>