From 335e0230f287229c3acca6f25819c645a958dfe9 Mon Sep 17 00:00:00 2001 From: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com> Date: Tue, 15 Aug 2023 00:11:54 -0500 Subject: [PATCH] Add placement logs (#18709) * add placement logs * add tile log type * add support for spawn command a little janky because the log message isn't entirely accurate when it's the result of a command use * move method to ActorSystem.cs * switch to TryGet and outs instead of multiple returns --- .../Placement/PlacementLoggerSystem.cs | 58 +++++++++++++++++++ Content.Server/Tools/ToolSystem.TilePrying.cs | 4 +- Content.Shared.Database/LogType.cs | 1 + Content.Shared/Tiles/FloorTileSystem.cs | 2 +- 4 files changed, 62 insertions(+), 3 deletions(-) create mode 100644 Content.Server/Placement/PlacementLoggerSystem.cs diff --git a/Content.Server/Placement/PlacementLoggerSystem.cs b/Content.Server/Placement/PlacementLoggerSystem.cs new file mode 100644 index 0000000000..b548f2c13c --- /dev/null +++ b/Content.Server/Placement/PlacementLoggerSystem.cs @@ -0,0 +1,58 @@ +using Content.Server.Administration.Logs; +using Content.Shared.Database; +using Robust.Server.GameObjects; +using Robust.Shared.Map; +using Robust.Shared.Placement; + +namespace Content.Server.Placement; + +public sealed class PlacementLoggerSystem : EntitySystem +{ + [Dependency] private readonly IAdminLogManager _adminLogger = default!; + [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!; + [Dependency] private readonly ActorSystem _actorSystem = default!; + + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(OnEntityPlacement); + SubscribeLocalEvent(OnTilePlacement); + } + + private void OnEntityPlacement(PlacementEntityEvent ev) + { + _actorSystem.TryGetActorFromUserId(ev.PlacerNetUserId, out var actor, out var actorEntity); + + var logType = ev.PlacementEventAction switch + { + PlacementEventAction.Create => LogType.EntitySpawn, + PlacementEventAction.Erase => LogType.EntityDelete, + _ => LogType.Action + }; + + if (actorEntity != null) + _adminLogger.Add(logType, LogImpact.High, + $"{ToPrettyString(actorEntity.Value):actor} used placement system to {ev.PlacementEventAction.ToString().ToLower()} {ToPrettyString(ev.EditedEntity):subject} at {ev.Coordinates}"); + else if (actor != null) + _adminLogger.Add(logType, LogImpact.High, + $"{actor:actor} used placement system to {ev.PlacementEventAction.ToString().ToLower()} {ToPrettyString(ev.EditedEntity):subject} at {ev.Coordinates}"); + else + _adminLogger.Add(logType, LogImpact.High, + $"Placement system {ev.PlacementEventAction.ToString().ToLower()}ed {ToPrettyString(ev.EditedEntity):subject} at {ev.Coordinates}"); + } + + private void OnTilePlacement(PlacementTileEvent ev) + { + _actorSystem.TryGetActorFromUserId(ev.PlacerNetUserId, out var actor, out var actorEntity); + + if (actorEntity != null) + _adminLogger.Add(LogType.Tile, LogImpact.High, + $"{ToPrettyString(actorEntity.Value):actor} used placement system to set tile {_tileDefinitionManager[ev.TileType].Name} at {ev.Coordinates}"); + else if (actor != null) + _adminLogger.Add(LogType.Tile, LogImpact.High, + $"{actor} used placement system to set tile {_tileDefinitionManager[ev.TileType].Name} at {ev.Coordinates}"); + else + _adminLogger.Add(LogType.Tile, LogImpact.High, + $"Placement system set tile {_tileDefinitionManager[ev.TileType].Name} at {ev.Coordinates}"); + } +} diff --git a/Content.Server/Tools/ToolSystem.TilePrying.cs b/Content.Server/Tools/ToolSystem.TilePrying.cs index 6c524acff6..1f602dae37 100644 --- a/Content.Server/Tools/ToolSystem.TilePrying.cs +++ b/Content.Server/Tools/ToolSystem.TilePrying.cs @@ -42,12 +42,12 @@ public sealed partial class ToolSystem var center = _turf.GetTileCenter(tile); if (args.Used != null) { - _adminLogger.Add(LogType.Action, LogImpact.Low, + _adminLogger.Add(LogType.Tile, LogImpact.Low, $"{ToPrettyString(args.User):actor} used {ToPrettyString(args.Used.Value):tool} to pry {_tileDefinitionManager[tile.Tile.TypeId].Name} at {center}"); } else { - _adminLogger.Add(LogType.Action, LogImpact.Low, + _adminLogger.Add(LogType.Tile, LogImpact.Low, $"{ToPrettyString(args.User):actor} pried {_tileDefinitionManager[tile.Tile.TypeId].Name} at {center}"); } diff --git a/Content.Shared.Database/LogType.cs b/Content.Shared.Database/LogType.cs index 99fe568626..6671865472 100644 --- a/Content.Shared.Database/LogType.cs +++ b/Content.Shared.Database/LogType.cs @@ -88,4 +88,5 @@ public enum LogType Vote = 83, ItemConfigure = 84, DeviceLinking = 85, + Tile = 86, } diff --git a/Content.Shared/Tiles/FloorTileSystem.cs b/Content.Shared/Tiles/FloorTileSystem.cs index 8cd8021810..bf757eb49e 100644 --- a/Content.Shared/Tiles/FloorTileSystem.cs +++ b/Content.Shared/Tiles/FloorTileSystem.cs @@ -175,7 +175,7 @@ public sealed class FloorTileSystem : EntitySystem private void PlaceAt(EntityUid user, EntityUid gridUid, MapGridComponent mapGrid, EntityCoordinates location, ushort tileId, SoundSpecifier placeSound, float offset = 0) { - _adminLogger.Add(LogType.Action, LogImpact.Low, $"{ToPrettyString(user):actor} placed tile {_tileDefinitionManager[tileId].Name} at {ToPrettyString(gridUid)} {location}"); + _adminLogger.Add(LogType.Tile, LogImpact.Low, $"{ToPrettyString(user):actor} placed tile {_tileDefinitionManager[tileId].Name} at {ToPrettyString(gridUid)} {location}"); var variant = ((ContentTileDefinition) _tileDefinitionManager[tileId]).PickVariant(); mapGrid.SetTile(location.Offset(new Vector2(offset, offset)), new Tile(tileId, 0, variant));