tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add prayer logs (#13362)

Browse Source 
* hijack unused log type I accidentally introduced

* add subtle message logs

* add prayer logs

* fix missing parameter
This commit is contained in:
Chief-Engineer
2023-01-11 02:15:47 -06:00
committed by GitHub
parent d072ee0a8c
commit 19241f55ba
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Administration/Systems/AdminVerbSystem.cs
View File

@@ -92,7 +92,7 @@ namespace Content.Server.Administration.Systems
{ {
_quickDialog.OpenDialog(player, "Subtle Message", "Message", "Popup Message", (string message, string popupMessage) => _quickDialog.OpenDialog(player, "Subtle Message", "Message", "Popup Message", (string message, string popupMessage) =>
{ {
_prayerSystem.SendSubtleMessage(targetActor.PlayerSession, message, popupMessage == "" ? Loc.GetString("prayer-popup-subtle-default") : popupMessage); _prayerSystem.SendSubtleMessage(targetActor.PlayerSession, player, message, popupMessage == "" ? Loc.GetString("prayer-popup-subtle-default") : popupMessage);
}); });
}; };
prayerVerb.Impact = LogImpact.Low; prayerVerb.Impact = LogImpact.Low;

7
Content.Server/Prayer/PrayerSystem.cs
View File

@@ -1,4 +1,5 @@
using Content.Server.Administration; using Content.Server.Administration;
using Content.Server.Administration.Logs;
using Content.Server.Bible.Components; using Content.Server.Bible.Components;
using Content.Server.Chat.Managers; using Content.Server.Chat.Managers;
using Content.Server.Popups; using Content.Server.Popups;
@@ -19,6 +20,7 @@ namespace Content.Server.Prayer;
/// </remarks> /// </remarks>
public sealed class PrayerSystem : EntitySystem public sealed class PrayerSystem : EntitySystem
{ {
[Dependency] private readonly IAdminLogManager _adminLogger = default!;
[Dependency] private readonly PopupSystem _popupSystem = default!; [Dependency] private readonly PopupSystem _popupSystem = default!;
[Dependency] private readonly IChatManager _chatManager = default!; [Dependency] private readonly IChatManager _chatManager = default!;
[Dependency] private readonly QuickDialogSystem _quickDialog = default!; [Dependency] private readonly QuickDialogSystem _quickDialog = default!;
@@ -68,9 +70,10 @@ public sealed class PrayerSystem : EntitySystem
/// Subtly messages a player by giving them a popup and a chat message. /// Subtly messages a player by giving them a popup and a chat message.
/// </summary> /// </summary>
/// <param name="target">The IPlayerSession that you want to send the message to</param> /// <param name="target">The IPlayerSession that you want to send the message to</param>
/// <param name="source">The IPlayerSession that sent the message</param>
/// <param name="messageString">The main message sent to the player via the chatbox</param> /// <param name="messageString">The main message sent to the player via the chatbox</param>
/// <param name="popupMessage">The popup to notify the player, also prepended to the messageString</param> /// <param name="popupMessage">The popup to notify the player, also prepended to the messageString</param>
public void SendSubtleMessage(IPlayerSession target, string messageString, string popupMessage) public void SendSubtleMessage(IPlayerSession target, IPlayerSession source, string messageString, string popupMessage)
{ {
if (target.AttachedEntity == null) if (target.AttachedEntity == null)
return; return;
@@ -79,6 +82,7 @@ public sealed class PrayerSystem : EntitySystem
_popupSystem.PopupEntity(popupMessage, target.AttachedEntity.Value, target, PopupType.Large); _popupSystem.PopupEntity(popupMessage, target.AttachedEntity.Value, target, PopupType.Large);
_chatManager.ChatMessageToOne(ChatChannel.Local, messageString, message, EntityUid.Invalid, false, target.ConnectedClient); _chatManager.ChatMessageToOne(ChatChannel.Local, messageString, message, EntityUid.Invalid, false, target.ConnectedClient);
_adminLogger.Add(LogType.AdminMessage, LogImpact.Low, $"{ToPrettyString(target.AttachedEntity.Value):player} received subtle message from {source.Name}: {message}");
} }
/// <summary> /// <summary>
@@ -99,5 +103,6 @@ public sealed class PrayerSystem : EntitySystem
_popupSystem.PopupEntity(Loc.GetString("prayer-popup-notify-sent"), sender.AttachedEntity.Value, sender, PopupType.Medium); _popupSystem.PopupEntity(Loc.GetString("prayer-popup-notify-sent"), sender.AttachedEntity.Value, sender, PopupType.Medium);
_chatManager.SendAdminAnnouncement(Loc.GetString("prayer-chat-notify", ("name", sender.Name), ("message", message))); _chatManager.SendAdminAnnouncement(Loc.GetString("prayer-chat-notify", ("name", sender.Name), ("message", message)));
_adminLogger.Add(LogType.AdminMessage, LogImpact.Low, $"{ToPrettyString(sender.AttachedEntity.Value):player} sent prayer: {message}");
} }
} }

2
Content.Shared.Database/LogType.cs
View File

@@ -80,5 +80,5 @@ public enum LogType
Stripping = 75, Stripping = 75,
Stamina = 76, Stamina = 76,
EntitySpawn = 77, EntitySpawn = 77,
Container = 78, AdminMessage = 78,
} }