Fix mind logs

space-wizards · Sep 22, 2024 · 50ae6a3 · 50ae6a3
1 parent da8894c
commit 50ae6a3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/Content.Shared/Mind/SharedMindSystem.cs b/Content.Shared/Mind/SharedMindSystem.cs
@@ -346,7 +346,7 @@ public bool TryAddObjective(EntityUid mindId, MindComponent mind, string proto)
     public void AddObjective(EntityUid mindId, MindComponent mind, EntityUid objective)
     {
         var title = Name(objective);
-        _adminLogger.Add(LogType.Mind, LogImpact.Low, $"Objective {objective} ({title}) added to mind of {MindOwnerLoggingString(mind)}");
+        _adminLogger.Add(LogType.Mind, LogImpact.Low, $"Objective {objective} ({title}) added to mind of {mind.OwnedEntity} ({(mind.UserId == null ? "originally " : "")} {mind.UserId ?? mind.OriginalOwnerUserId})");
         mind.Objectives.Add(objective);
     }
 
@@ -362,7 +362,7 @@ public bool TryRemoveObjective(EntityUid mindId, MindComponent mind, int index)
         var objective = mind.Objectives[index];
 
         var title = Name(objective);
-        _adminLogger.Add(LogType.Mind, LogImpact.Low, $"Objective {objective} ({title}) removed from the mind of {MindOwnerLoggingString(mind)}");
+        _adminLogger.Add(LogType.Mind, LogImpact.Low, $"Objective {objective} ({title}) removed from the mind of {mind.OwnedEntity} ({(mind.UserId == null ? "originally " : "")} {mind.UserId ?? mind.OriginalOwnerUserId})");
         mind.Objectives.Remove(objective);
         Del(objective);
         return true;
@@ -526,7 +526,8 @@ public bool IsCharacterDeadIc(MindComponent mind)
     }
 
     /// <summary>
-    ///     A string to represent the mind for logging
+    /// A string to represent the mind for logging. Note that this should not be used for admin logs, as the
+    /// entity information will get lost.
     /// </summary>
     public string MindOwnerLoggingString(MindComponent mind)
     {

diff --git a/Content.Shared/Roles/SharedRoleSystem.cs b/Content.Shared/Roles/SharedRoleSystem.cs
@@ -110,7 +110,7 @@ public void MindAddRoles(EntityUid mindId, ComponentRegistry components, MindCom
         }
 
         _adminLogger.Add(LogType.Mind, LogImpact.Low,
-            $"Role components {string.Join(components.Keys.ToString(), ", ")} added to mind of {_minds.MindOwnerLoggingString(mind)}");
+            $"Role components {string.Join(components.Keys.ToString(), ", ")} added to mind of {mind.OwnedEntity} ({(mind.UserId == null ? "originally " : "")} {mind.UserId ?? mind.OriginalOwnerUserId})");
     }
 
     public void MindAddRole(EntityUid mindId, Component component, MindComponent? mind = null, bool silent = false)
@@ -136,7 +136,7 @@ public void MindAddRole(EntityUid mindId, Component component, MindComponent? mi
         }
 
         _adminLogger.Add(LogType.Mind, LogImpact.Low,
-            $"'Role {component}' added to mind of {_minds.MindOwnerLoggingString(mind)}");
+            $"'Role {component}' added to mind of {mind.OwnedEntity} ({(mind.UserId == null ? "originally " : "")} {mind.UserId ?? mind.OriginalOwnerUserId})");
     }
 
     /// <summary>
@@ -173,7 +173,7 @@ public void MindAddRole(EntityUid mindId, Component component, MindComponent? mi
         }
 
         _adminLogger.Add(LogType.Mind, LogImpact.Low,
-            $"'Role {typeof(T).Name}' added to mind of {_minds.MindOwnerLoggingString(mind)}");
+            $"'Role {typeof(T).Name}' added to mind of {mind.OwnedEntity} ({(mind.UserId == null ? "originally " : "")} {mind.UserId ?? mind.OriginalOwnerUserId})");
     }
 
     /// <summary>
@@ -200,7 +200,7 @@ public void MindRemoveRole<T>(EntityUid mindId) where T : IComponent
             RaiseLocalEvent(mind.OwnedEntity.Value, message, true);
         }
         _adminLogger.Add(LogType.Mind, LogImpact.Low,
-            $"'Role {typeof(T).Name}' removed from mind of {_minds.MindOwnerLoggingString(mind)}");
+            $"'Role {typeof(T).Name}' removed from mind of {mind.OwnedEntity} ({(mind.UserId == null ? "originally " : "")} {mind.UserId ?? mind.OriginalOwnerUserId})");
     }
 
     public bool MindTryRemoveRole<T>(EntityUid mindId) where T : IComponent