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

Фичи для педалей (#202)

Browse Source
This commit is contained in:
Aviu00
2023-07-16 11:32:42 +03:00
committed by Aviu00
parent 65ef100acd
commit 3f8ff32206
21 changed files with 337 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Content.Server/Administration/Commands/AdminWhoCommand.cs
View File

@@ -21,24 +21,34 @@ public sealed class AdminWhoCommand : IConsoleCommand
var sb = new StringBuilder();
var first = true;
// WD start
var isAdmin = shell.Player is {} player && adminMgr.HasAdminFlag(player, AdminFlags.Admin);
foreach (var admin in adminMgr.ActiveAdmins)
{
var adminData = adminMgr.GetAdminData(admin)!;
DebugTools.AssertNotNull(adminData);
if (!isAdmin && adminData.Stealth)
continue;
if (!first)
sb.Append('\n');
first = false;
var adminData = adminMgr.GetAdminData(admin)!;
DebugTools.AssertNotNull(adminData);
sb.Append(admin.Name);
if (adminData.Title is { } title)
sb.Append($": [{title}]");
if (shell.Player is { } player && adminMgr.HasAdminFlag(player, AdminFlags.Admin))
{
if (afk.IsAfk(admin))
sb.Append(" [AFK]");
}
if (!isAdmin)
continue;
if (afk.IsAfk(admin))
sb.Append(" [AFK]");
if (adminData.Stealth)
sb.Append(" [Stealth]");
// WD end
}
shell.WriteLine(sb.ToString());

6
Content.Server/Administration/Systems/BwoinkSystem.cs
View File

@@ -418,7 +418,7 @@ namespace Content.Server.Administration.Systems
bwoinkText = $"{senderSession.Name}: {escapedText}";
}
var msg = new BwoinkTextMessage(message.UserId, senderSession.UserId, bwoinkText);
var msg = new BwoinkTextMessage(message.UserId, senderSession.UserId, bwoinkText, senderAHelpAdmin);
LogBwoink(msg);
@@ -487,7 +487,7 @@ namespace Content.Server.Administration.Systems
// No admin online, let the player know
var systemText = Loc.GetString("bwoink-system-starmute-message-no-other-users");
var starMuteMsg = new BwoinkTextMessage(message.UserId, SystemUserId, systemText);
var starMuteMsg = new BwoinkTextMessage(message.UserId, SystemUserId, systemText, senderAHelpAdmin);
RaiseNetworkEvent(starMuteMsg, senderSession.ConnectedClient);
}
@@ -592,7 +592,7 @@ namespace Content.Server.Administration.Systems
{
var bwoinkText = $"[color=red](D) {sender}[/color]: {text}";
_playerManager.TryGetUserId(sender, out var senderId);
var msg = new BwoinkTextMessage(receiver, senderId, bwoinkText);
var msg = new BwoinkTextMessage(receiver, senderId, bwoinkText, true);
LogBwoink(msg);