add new command AdminToggle

Content.Server/ADT/Administration/Commands/AdminToggleCommand.cs

@@ -0,0 +1,75 @@
+using Content.Server.Administration.Managers;
+using Content.Shared.Administration;
+using Robust.Shared.Console;
+using Content.Server.Administration;
+using Robust.Server.Player;
+using System.Linq;
+
+namespace Content.Server.ADT.Administration.Commands;
+
+
+[AdminCommand(AdminFlags.Permissions)]
+public sealed class AdminToggleCommand : LocalizedCommands
+{
+    [Dependency] private readonly IPlayerLocator _locator = default!;
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
+    public override string Command => "admin_toggle";
+
+    public override async void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        if (args.Length != 2)
+        {
+            shell.WriteLine("Error: invalid arguments!");
+            return;
+        }
+
+        var target = args[0];
+        var located = await _locator.LookupIdByNameOrIdAsync(target);
+        if (located == null)
+        {
+            shell.WriteError(Loc.GetString("cmd-admin_toggle-error-args"));
+            return;
+        }
+
+        if (!_playerManager.TryGetSessionById(located.UserId, out var targetSession))
+        {
+            shell.WriteLine("Not session it's player!");
+            return;
+        }
+
+        if (targetSession == null)
+            return;
+
+        var mgr = IoCManager.Resolve<IAdminManager>();
+        if (args[1] == "deadmin")
+        {
+            mgr.DeAdmin(targetSession);
+        }
+        else if (args[1] == "readmin" && !(mgr.GetAdminData(targetSession, includeDeAdmin: true) == null))
+        {
+            mgr.ReAdmin(targetSession);
+        }
+    }
+
+    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+    {
+        if (args.Length == 1)
+        {
+            var options = _playerManager.Sessions.Select(c => c.Name).OrderBy(c => c).ToArray();
+            return CompletionResult.FromHintOptions(
+                options,
+                LocalizationManager.GetString("cmd-ban-hint"));
+        }
+        if (args.Length == 2)
+        {
+            var durations = new CompletionOption[]
+            {
+                new("deadmin", LocalizationManager.GetString("cmd-admin_toggle-deadmin")),
+                new("readmin", LocalizationManager.GetString("cmd-admin_toggle-readmin")),
+            };
+            return CompletionResult.FromHintOptions(durations, LocalizationManager.GetString("cmd-admin_toggle-hint-duration"));
+        }
+        return CompletionResult.Empty;
+    }
+}
+

Content.Server/ADT/Administration/Commands/BanMassCommand.cs

@@ -26,9 +26,9 @@ public sealed class BanMassCommand : LocalizedCommands
     [Dependency] private readonly IConfigurationManager _cfg = default!;
     [Dependency] private readonly IPlayerManager _playerManager = default!;
     [Dependency] private readonly ILogManager _logManager = default!;
-
     [Dependency] private readonly IDiscordBanInfoSender _discordBanInfoSender = default!;
     [Dependency] private readonly IServerDbManager _dbManager = default!;
+    [Dependency] private readonly IAdminManager _adminManager = default!;
 
     public override string Command => "banmass";
 
@@ -81,6 +81,14 @@ public override async void Execute(IConsoleShell shell, string argStr, string[]
             var targetUid = located.UserId;
             var targetHWid = located.LastHWId;
 
+            var dbData = await _dbManager.GetAdminDataForAsync(targetUid);
+            if (dbData != null && dbData.AdminRank != null)
+            {
+                var targetPermissionsFlag = AdminFlagsHelper.NamesToFlags(dbData.AdminRank.Flags.Select(p => p.Flag));
+                if ((targetPermissionsFlag & AdminFlags.Permissions) == AdminFlags.Permissions) // Адмемов с правами Пермиссион не забанят
+                    return;
+            }
+
             //Start логи банов для диса
             var lastServerBan = await _dbManager.GetLastServerBanAsync();
             var newServerBanId = lastServerBan is not null ? lastServerBan.Id + 1 : 1;

Content.Server/ADT/Administration/Commands/EchoChatCommand.cs

@@ -56,10 +56,8 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args)
             _chatSystem.TrySendInGameICMessage(entityUid.Value, message, InGameICChatType.Whisper, ChatTransmitRange.Normal);
         }
 
-        // Проверяем, нужно ли добавлять запись в логи
         if (args.Length == 4 && args[3] == "false")
         {
-            // Не добавляем в логи
             return;
         }
 

Content.Server/ADT/Administration/Commands/KickHideCommand.cs

@@ -4,6 +4,7 @@
 using Robust.Shared.Console;
 using Content.Server.GhostKick;
 using Content.Server.Administration;
+using Content.Server.Administration.Managers;
 
 namespace Content.Server.ADT.Administration.Commands;
 
@@ -16,6 +17,7 @@ public sealed class KickHideCommand : LocalizedCommands
     [Dependency] private readonly IPlayerLocator _locator = default!;
     [Dependency] private readonly IPlayerManager _playerManager = default!;
     [Dependency] private readonly GhostKickManager _ghostKickManager = default!;
+    [Dependency] private readonly IAdminManager _adminManager = default!;
 
     public override string Command => "kick_hide";
 
@@ -36,8 +38,13 @@ public override async void Execute(IConsoleShell shell, string argStr, string[]
             return;
         }
 
-        var targetSession = _playerManager.GetSessionById(located.UserId);
-        _ghostKickManager.DoDisconnect(targetSession.Channel, "Smitten.");
+        var players = IoCManager.Resolve<IPlayerManager>();
+        if (!players.TryGetSessionByUsername(target, out var player))
+        {
+            shell.WriteError($"Unable to find player: '{target}'.");
+            return;
+        }
+        _ghostKickManager.DoDisconnect(player.Channel, "Smitten.");
     }
 
     public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)

Content.Server/Administration/BanPanelEui.cs

@@ -29,6 +29,7 @@ public sealed class BanPanelEui : BaseEui
     [Dependency] private readonly IAdminManager _admins = default!;
     [Dependency] private readonly IServerDbManager _dbManager = default!;
     [Dependency] private readonly IDiscordBanInfoSender _discordBanInfoSender = default!;
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
 
     private readonly ISawmill _sawmill;
 
@@ -172,7 +173,20 @@ private async void BanPlayer(string? target, string? ipAddressString, bool useLa
                 _sawmill.Error($"Error while erasing banned player:\n{e}");
             }
         }
+        // ADT-Tweak-Start
+        if (targetUid != null)
+        {
+            var dbData = await _dbManager.GetAdminDataForAsync(targetUid.Value);
+
+            if (dbData != null && dbData.AdminRank != null)
+            {
+                var targetPermissionsFlag = AdminFlagsHelper.NamesToFlags(dbData.AdminRank.Flags.Select(p => p.Flag));
 
+                if ((targetPermissionsFlag & AdminFlags.Permissions) == AdminFlags.Permissions)
+                    return;
+            }
+        }
+        // ADT-Tweak-End
         var lastServerBan = await _dbManager.GetLastServerBanAsync();
         var newServerBanId = lastServerBan is not null ? lastServerBan.Id + 1 : 1;
 

Content.Server/Administration/Commands/BanCommand.cs

@@ -24,6 +24,7 @@ public sealed class BanCommand : LocalizedCommands
     [Dependency] private readonly ILogManager _logManager = default!;
     [Dependency] private readonly IDiscordBanInfoSender _discordBanInfoSender = default!;
     [Dependency] private readonly IServerDbManager _dbManager = default!;
+    [Dependency] private readonly IAdminManager _adminManager = default!;
 
     public override string Command => "ban";
 
@@ -94,6 +95,16 @@ public override async void Execute(IConsoleShell shell, string argStr, string[]
 
         var targetUid = located.UserId;
         var targetHWid = located.LastHWId;
+
+        // ADT-Tweak-Start: Пользователя с флагом Permission не забанить
+        var dbData = await _dbManager.GetAdminDataForAsync(targetUid);
+        if (dbData != null && dbData.AdminRank != null)
+        {
+            var targetPermissionsFlag = AdminFlagsHelper.NamesToFlags(dbData.AdminRank.Flags.Select(p => p.Flag));
+            if ((targetPermissionsFlag & AdminFlags.Permissions) == AdminFlags.Permissions)
+                return;
+        }
+        // ADT-Tweak-End
         //Start-ADT-Tweak: логи банов для диса
         var lastServerBan = await _dbManager.GetLastServerBanAsync();
         var newServerBanId = lastServerBan is not null ? lastServerBan.Id + 1 : 1;

Content.Server/Administration/Managers/AdminManager.cs

@@ -112,10 +112,10 @@ public void Stealth(ICommonSession session)
             var playerData = session.ContentData()!;
             playerData.Stealthed = true;
             reg.Data.Stealth = true;
-
+            // ADT Tweak commented
             _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);
+            // _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)
@@ -131,10 +131,10 @@ public void UnStealth(ICommonSession session)
             var playerData = session.ContentData()!;
             playerData.Stealthed = false;
             reg.Data.Stealth = false;
-
+            // ADT Tweak commented
             _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);
+            // _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)

Content.Server/Ghost/GhostSystem.cs

@@ -36,7 +36,7 @@
 using System.Linq;
 using System.Numerics;
 using Content.Shared.ADT.OnGhostAttemtpDamage;
-using Content.Server.ADT.Ghost;
+using Content.Shared.ADT.Ghost;
 
 namespace Content.Server.Ghost
 {

Content.Server/GhostKick/GhostKickManager.cs

@@ -5,6 +5,9 @@
 using Robust.Shared.Console;
 using Robust.Shared.Network;
 using Robust.Shared.Timing;
+using Content.Server.Administration.Managers;
+using Content.Server.Administration.Logs;
+using Content.Shared.Database;
 
 namespace Content.Server.GhostKick;
 
@@ -47,6 +50,8 @@ public void DoDisconnect(INetChannel channel, string reason)
 [AdminCommand(AdminFlags.Moderator)]
 public sealed class GhostKickCommand : IConsoleCommand
 {
+    [Dependency] private readonly IAdminManager _adminManager = default!;
+    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
     public string Command => "ghostkick";
     public string Description => "Kick a client from the server as if their network just dropped.";
     public string Help => "Usage: ghostkick <Player> [Reason]";
@@ -70,7 +75,18 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
             shell.WriteError($"Unable to find player: '{playerName}'.");
             return;
         }
-
+        // ADT-Tweak-start
+        if (_adminManager.HasAdminFlag(player, AdminFlags.Permissions))
+        {
+            shell.WriteError($"You dont have permission to kick '{playerName}'");
+            return;
+        }
+        _adminLogger.Add(
+            LogType.AdminMessage,
+            LogImpact.Low,
+            $"[АДМИНАБУЗ] {shell.Player?.Name} used the command ghostkick on '{playerName}'."
+        );
+        // ADT-Tweak-end
         ghostKick.DoDisconnect(player.Channel, reason);
     }
 }

Content.Server/Info/ShowRulesCommand.cs

@@ -6,6 +6,7 @@
 using Robust.Shared.Configuration;
 using Robust.Shared.Console;
 using Robust.Shared.Network;
+using Content.Server.Administration.Managers;
 
 namespace Content.Server.Info;
 
@@ -15,6 +16,7 @@ public sealed class ShowRulesCommand : IConsoleCommand
     [Dependency] private readonly INetManager _net = default!;
     [Dependency] private readonly IConfigurationManager _configuration = default!;
     [Dependency] private readonly IPlayerManager _player = default!;
+    [Dependency] private readonly IAdminManager _adminManager = default!;
 
     public string Command => "showrules";
     public string Description => "Opens the rules popup for the specified player.";
@@ -57,6 +59,11 @@ public async void Execute(IConsoleShell shell, string argStr, string[] args)
            return;
         }
 
+        if (_adminManager.HasAdminFlag(player, AdminFlags.Permissions)) // ADT-Tweak
+        {
+            shell.WriteError($"You not permission for showrule '{target}'.");
+            return;
+        }
         var coreRules = _configuration.GetCVar(CCVars.RulesFile);
         var message = new SendRulesInformationMessage { PopupTime = seconds, CoreRules = coreRules, ShouldShowRules = true};
         _net.ServerSendMessage(message, player.Channel);

Content.Server/Tips/TipsSystem.cs

@@ -12,6 +12,8 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
+using Content.Server.Administration.Logs;
+using Content.Shared.Database;
 
 namespace Content.Server.Tips;
 
@@ -28,6 +30,7 @@ public sealed class TipsSystem : EntitySystem
     [Dependency] private readonly GameTicker _ticker = default!;
     [Dependency] private readonly IConsoleHost _conHost = default!;
     [Dependency] private readonly IPlayerManager _playerManager = default!;
+    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
 
     private bool _tipsEnabled;
     private float _tipTimeOutOfRound;
@@ -82,6 +85,13 @@ private void SendTippy(IConsoleShell shell, string argstr, string[] args)
             return;
         }
 
+        // ADT-Tweak-Start Логируем сообщение
+        _adminLogger.Add(
+            LogType.AdminMessage,
+            LogImpact.Low,
+            $"[АДМИНАБУЗ] {shell.Player?.Name} used the command tippy or tip."
+        );
+        // ADT-Tweak-End
         ActorComponent? actor = null;
         if (args[0] != "all")
         {

Content.Server/ADT/HideGhostWarp/HideGhostWarpComponent.cs → Content.Shared/ADT/Ghost/HideGhostWarpComponent.cs

@@ -1,6 +1,7 @@
-namespace Content.Server.ADT.Ghost;
+namespace Content.Shared.ADT.Ghost;
 
 /// <summary>
+///  Author: Schrodinger71, помогал _kote(Котька)
 ///  Вешаем на сущность, и к ней нельзя будет тепнуться через "Телепорт призрака".
 /// </summary>
 [RegisterComponent]

Content.Shared/Follower/FollowerSystem.cs

@@ -17,6 +17,8 @@
 using Robust.Shared.Physics.Systems;
 using Robust.Shared.Player;
 using Robust.Shared.Utility;
+using Content.Shared.ADT.Ghost;
+using Robust.Shared.Spawners;
 
 namespace Content.Shared.Follower;
 
@@ -149,6 +151,14 @@ private void OnFollowedTerminating(EntityUid uid, FollowedComponent component, r
     /// <param name="entity">The entity to be followed</param>
     public void StartFollowingEntity(EntityUid follower, EntityUid entity)
     {
+        // ADT-Tweak-Start: Улучшаем смысл компонента
+        if (HasComp<HideGhostWarpComponent>(entity))
+        {
+            var despawn = EnsureComp<TimedDespawnComponent>(follower);
+            despawn.Lifetime = 0.1f;
+            return;
+        }
+        // ADT-Tweak-End
         // No recursion for you
         var targetXform = Transform(entity);
         while (targetXform.ParentUid.IsValid())

Resources/Locale/ru-RU/ADT/administration/commands.ftl

@@ -18,3 +18,11 @@ echo_chat-speak-help = Использовать обычную разговор
 echo_chat-emote-help = Использовать чат эмоций
 echo_chat-whisper-help = Использование чата шёпотом
 
+## Команда: admin_toggle
+cmd-admin_toggle-desc = Вводит в деадмин или реадмин указанного пользователя.
+cmd-admin_toggle-help = Использование: admin_toggle <userName> <readmin/deadmin>
+cmd-admin_toggle-hint-duration = Значение
+cmd-admin_toggle-readmin = Вернуть права админу.
+cmd-admin_toggle-deadmin = Ввести в деадмин.
+cmd-admin_toggle-error-args = Указанный пользователь не найден.
+

Resources/clientCommandPerms.yml

@@ -25,7 +25,7 @@
     - gc
     - gc_mode
     - cvar
-    - fuckrules
+    # - fuckrules # ADT-Tweak
     - midipanic
     - replay_recording_start
     - replay_recording_stop
@@ -79,6 +79,7 @@
     - mapping
     - toggleautosave
     - toggledecals
+    - fuckrules # ADT-Tweak
 
 - Flags: QUERY
   Commands: