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

Make AdminLogsSystem an IoC manager (#8492)

Browse Source 
* Make log not entity system

* Fixes
This commit is contained in:
wrexbe
2022-05-28 23:41:17 -07:00
committed by GitHub
parent 0f99a0dd1d
commit 1e0babbd50
79 changed files with 653 additions and 572 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Content.Shared/Actions/SharedActionsSystem.cs
View File

@@ -19,7 +19,7 @@ namespace Content.Shared.Actions;
public abstract class SharedActionsSystem : EntitySystem
{
[Dependency] private readonly SharedAdminLogSystem _logSystem = default!;
[Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
[Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
[Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
[Dependency] private readonly SharedContainerSystem _containerSystem = default!;
@@ -113,7 +113,7 @@ public abstract class SharedActionsSystem : EntitySystem
// Does the user actually have the requested action?
if (!component.Actions.TryGetValue(ev.Action, out var act))
{
_logSystem.Add(LogType.Action,
_adminLogger.Add(LogType.Action,
$"{ToPrettyString(user):user} attempted to perform an action that they do not have: {ev.Action.Name}.");
return;
}
@@ -146,10 +146,10 @@ public abstract class SharedActionsSystem : EntitySystem
return;
if (act.Provider == null)
_logSystem.Add(LogType.Action,
_adminLogger.Add(LogType.Action,
$"{ToPrettyString(user):user} is performing the {name:action} action targeted at {ToPrettyString(entityTarget):target}.");
else
_logSystem.Add(LogType.Action,
_adminLogger.Add(LogType.Action,
$"{ToPrettyString(user):user} is performing the {name:action} action (provided by {ToPrettyString(act.Provider.Value):provider}) targeted at {ToPrettyString(entityTarget):target}.");
if (entityAction.Event != null)
@@ -174,10 +174,10 @@ public abstract class SharedActionsSystem : EntitySystem
return;
if (act.Provider == null)
_logSystem.Add(LogType.Action,
_adminLogger.Add(LogType.Action,
$"{ToPrettyString(user):user} is performing the {name:action} action targeted at {mapTarget:target}.");
else
_logSystem.Add(LogType.Action,
_adminLogger.Add(LogType.Action,
$"{ToPrettyString(user):user} is performing the {name:action} action (provided by {ToPrettyString(act.Provider.Value):provider}) targeted at {mapTarget:target}.");
if (worldAction.Event != null)
@@ -194,10 +194,10 @@ public abstract class SharedActionsSystem : EntitySystem
return;
if (act.Provider == null)
_logSystem.Add(LogType.Action,
_adminLogger.Add(LogType.Action,
$"{ToPrettyString(user):user} is performing the {name:action} action.");
else
_logSystem.Add(LogType.Action,
_adminLogger.Add(LogType.Action,
$"{ToPrettyString(user):user} is performing the {name:action} action provided by {ToPrettyString(act.Provider.Value):provider}.");
performEvent = instantAction.Event;

10
Content.Shared/Administration/Logs/ISharedAdminLogManager.cs Normal file
View File

@@ -0,0 +1,10 @@
using Content.Shared.Database;
namespace Content.Shared.Administration.Logs;
public interface ISharedAdminLogManager
{
void Add(LogType type, LogImpact impact, ref LogStringHandler handler);
void Add(LogType type, ref LogStringHandler handler);
}

17
Content.Shared/Administration/Logs/SharedAdminLogManager.cs Normal file
View File

@@ -0,0 +1,17 @@
using Content.Shared.Database;
namespace Content.Shared.Administration.Logs;
[Virtual]
public class SharedAdminLogManager : ISharedAdminLogManager
{
public virtual void Add(LogType type, LogImpact impact, ref LogStringHandler handler)
{
// noop
}
public virtual void Add(LogType type, ref LogStringHandler handler)
{
// noop
}
}

4
Content.Shared/Chemistry/Reaction/SharedChemicalReactionSystem.cs
View File

@@ -20,7 +20,7 @@ namespace Content.Shared.Chemistry.Reaction
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] protected readonly SharedAdminLogSystem _logSystem = default!;
[Dependency] protected readonly ISharedAdminLogManager _adminLogger = default!;
[Dependency] private readonly IGamePrototypeLoadManager _gamePrototypeLoadManager = default!;
/// <summary>
@@ -202,7 +202,7 @@ namespace Content.Shared.Chemistry.Reaction
if (effect.ShouldLog)
{
var entity = args.SolutionEntity;
_logSystem.Add(LogType.ReagentEffect, effect.LogImpact,
_adminLogger.Add(LogType.ReagentEffect, effect.LogImpact,
$"Reaction effect {effect.GetType().Name:effect} of reaction ${reaction.ID:reaction} applied on entity {ToPrettyString(entity):entity} at {Transform(entity).Coordinates:coordinates}");
}

6
Content.Shared/Chemistry/ReactiveSystem.cs
View File

@@ -15,7 +15,7 @@ namespace Content.Shared.Chemistry
{
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IRobustRandom _robustRandom = default!;
[Dependency] private readonly SharedAdminLogSystem _logSystem = default!;
[Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
public void ReactionEntity(EntityUid uid, ReactionMethod method, Solution solution)
{
@@ -63,7 +63,7 @@ namespace Content.Shared.Chemistry
if (effect.ShouldLog)
{
var entity = args.SolutionEntity;
_logSystem.Add(LogType.ReagentEffect, effect.LogImpact,
_adminLogger.Add(LogType.ReagentEffect, effect.LogImpact,
$"Reactive effect {effect.GetType().Name:effect} of reagent {reagent.ID:reagent} with method {method} applied on entity {ToPrettyString(entity):entity} at {Transform(entity).Coordinates:coordinates}");
}
@@ -91,7 +91,7 @@ namespace Content.Shared.Chemistry
if (effect.ShouldLog)
{
var entity = args.SolutionEntity;
_logSystem.Add(LogType.ReagentEffect, effect.LogImpact,
_adminLogger.Add(LogType.ReagentEffect, effect.LogImpact,
$"Reactive effect {effect.GetType().Name:effect} of {ToPrettyString(entity):entity} using reagent {reagent.ID:reagent} with method {method} at {Transform(entity).Coordinates:coordinates}");
}

2
Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs
View File

@@ -137,7 +137,7 @@ public abstract partial class SharedHandsSystem : EntitySystem
return;
}
_adminLogSystem.Add(LogType.Pickup, LogImpact.Low, $"{ToPrettyString(uid):user} picked up {ToPrettyString(entity):entity}");
_adminLogger.Add(LogType.Pickup, LogImpact.Low, $"{ToPrettyString(uid):user} picked up {ToPrettyString(entity):entity}");
Dirty(hands);

2
Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs
View File

@@ -11,7 +11,7 @@ namespace Content.Shared.Hands.EntitySystems;
public abstract partial class SharedHandsSystem : EntitySystem
{
[Dependency] private readonly SharedAdminLogSystem _adminLogSystem = default!;
[Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
[Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
[Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
[Dependency] private readonly SharedContainerSystem _containerSystem = default!;

14
Content.Shared/Interaction/SharedInteractionSystem.cs
View File

@@ -42,7 +42,7 @@ namespace Content.Shared.Interaction
[Dependency] private readonly SharedPhysicsSystem _sharedBroadphaseSystem = default!;
[Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
[Dependency] private readonly SharedVerbSystem _verbSystem = default!;
[Dependency] private readonly SharedAdminLogSystem _adminLogSystem = default!;
[Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
[Dependency] private readonly RotateToFaceSystem _rotateToFaceSystem = default!;
[Dependency] private readonly SharedPopupSystem _popupSystem = default!;
[Dependency] private readonly UseDelaySystem _useDelay = default!;
@@ -281,7 +281,7 @@ namespace Content.Shared.Interaction
// all interactions should only happen when in range / unobstructed, so no range check is needed
var message = new InteractHandEvent(user, target);
RaiseLocalEvent(target, message);
_adminLogSystem.Add(LogType.InteractHand, LogImpact.Low, $"{ToPrettyString(user):user} interacted with {ToPrettyString(target):target}");
_adminLogger.Add(LogType.InteractHand, LogImpact.Low, $"{ToPrettyString(user):user} interacted with {ToPrettyString(target):target}");
if (message.Handled)
return;
@@ -721,7 +721,7 @@ namespace Content.Shared.Interaction
if (activateMsg.Handled)
{
_useDelay.BeginDelay(used, delayComponent);
_adminLogSystem.Add(LogType.InteractActivate, LogImpact.Low, $"{ToPrettyString(user):user} activated {ToPrettyString(used):used}");
_adminLogger.Add(LogType.InteractActivate, LogImpact.Low, $"{ToPrettyString(user):user} activated {ToPrettyString(used):used}");
return true;
}
@@ -733,7 +733,7 @@ namespace Content.Shared.Interaction
// No way to check success.
_useDelay.BeginDelay(used, delayComponent);
_adminLogSystem.Add(LogType.InteractActivate, LogImpact.Low, $"{ToPrettyString(user):user} activated {ToPrettyString(used):used}");
_adminLogger.Add(LogType.InteractActivate, LogImpact.Low, $"{ToPrettyString(user):user} activated {ToPrettyString(used):used}");
return true;
}
#endregion
@@ -808,11 +808,11 @@ namespace Content.Shared.Interaction
RaiseLocalEvent(thrown, throwMsg);
if (throwMsg.Handled)
{
_adminLogSystem.Add(LogType.Throw, LogImpact.Low,$"{ToPrettyString(user):user} threw {ToPrettyString(thrown):entity}");
_adminLogger.Add(LogType.Throw, LogImpact.Low,$"{ToPrettyString(user):user} threw {ToPrettyString(thrown):entity}");
return;
}
_adminLogSystem.Add(LogType.Throw, LogImpact.Low,$"{ToPrettyString(user):user} threw {ToPrettyString(thrown):entity}");
_adminLogger.Add(LogType.Throw, LogImpact.Low,$"{ToPrettyString(user):user} threw {ToPrettyString(thrown):entity}");
}
#endregion
@@ -821,7 +821,7 @@ namespace Content.Shared.Interaction
var dropMsg = new DroppedEvent(user);
RaiseLocalEvent(item, dropMsg);
if (dropMsg.Handled)
_adminLogSystem.Add(LogType.Drop, LogImpact.Low, $"{ToPrettyString(user):user} dropped {ToPrettyString(item):entity}");
_adminLogger.Add(LogType.Drop, LogImpact.Low, $"{ToPrettyString(user):user} dropped {ToPrettyString(item):entity}");
Transform(item).LocalRotation = Angle.Zero;
}
#endregion

4
Content.Shared/Slippery/SharedSlipperySystem.cs
View File

@@ -12,7 +12,7 @@ namespace Content.Shared.Slippery
[UsedImplicitly]
public abstract class SharedSlipperySystem : EntitySystem
{
[Dependency] private readonly SharedAdminLogSystem _adminLog = default!;
[Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
[Dependency] private readonly SharedStunSystem _stunSystem = default!;
[Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!;
[Dependency] private readonly SharedContainerSystem _container = default!;
@@ -71,7 +71,7 @@ namespace Content.Shared.Slippery
if (playSound)
PlaySound(component);
_adminLog.Add(LogType.Slip, LogImpact.Low,
_adminLogger.Add(LogType.Slip, LogImpact.Low,
$"{ToPrettyString(other):mob} slipped on collision with {ToPrettyString(component.Owner):entity}");
}

6
Content.Shared/Throwing/ThrownItemSystem.cs
View File

@@ -17,7 +17,7 @@ namespace Content.Shared.Throwing
public sealed class ThrownItemSystem : EntitySystem
{
[Dependency] private readonly SharedContainerSystem _containerSystem = default!;
[Dependency] private readonly SharedAdminLogSystem _adminLogSystem = default!;
[Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
[Dependency] private readonly FixtureSystem _fixtures = default!;
private const string ThrowingFixture = "throw-fixture";
@@ -131,7 +131,7 @@ namespace Content.Shared.Throwing
// Assume it's uninteresting if it has no thrower. For now anyway.
if (thrownItem.Thrower is not null)
_adminLogSystem.Add(LogType.Landed, LogImpact.Low, $"{ToPrettyString(landing):entity} thrown by {ToPrettyString(thrownItem.Thrower.Value):thrower} landed.");
_adminLogger.Add(LogType.Landed, LogImpact.Low, $"{ToPrettyString(landing):entity} thrown by {ToPrettyString(thrownItem.Thrower.Value):thrower} landed.");
var landMsg = new LandEvent {User = thrownItem.Thrower};
RaiseLocalEvent(landing, landMsg, false);
@@ -143,7 +143,7 @@ namespace Content.Shared.Throwing
public void ThrowCollideInteraction(EntityUid? user, IPhysBody thrown, IPhysBody target)
{
if (user is not null)
_adminLogSystem.Add(LogType.ThrowHit, LogImpact.Low,
_adminLogger.Add(LogType.ThrowHit, LogImpact.Low,
$"{ToPrettyString(thrown.Owner):thrown} thrown by {ToPrettyString(user.Value):thrower} hit {ToPrettyString(target.Owner):target}.");
// TODO: Just pass in the bodies directly
RaiseLocalEvent(target.Owner, new ThrowHitByEvent(user, thrown.Owner, target.Owner));