Redact player name in NPC messages

jo3bingham · jo3bingham · commit 43876b2fb871 · 2020-07-14T09:53:00.000-04:00
diff --git a/Apps/Redact/Program.cs b/Apps/Redact/Program.cs
@@ -239,7 +239,7 @@ private static bool Connection_OnReceivedServerMessagePacket(Packet packet)
             var p = (OXGaming.TibiaAPI.Network.ServerPackets.Message)packet;
             if (p.MessageMode == MessageModeType.Look)
             {
-                if (_lookPlayerRx.IsMatch(p.Text) || p.Text.Contains("You see yourself."))
+                if (_lookPlayerRx.IsMatch(p.Text) || p.Text.Contains("You see yourself.", StringComparison.OrdinalIgnoreCase))
                 {
                     p.Text = "Redacted";
                 }
@@ -256,6 +256,12 @@ private static bool Connection_OnReceivedServerTalkPacket(Packet packet)
                 p.SpeakerLevel = 100;
                 p.SpeakerName = "Redacted";
             }
+            else if (creature is object && creature.Type == CreatureType.Npc)
+            {
+                // In case the NPC used the player's name in their message,
+                // we need to check and replace it.
+                p.Text = p.Text.Replace(p.Client.Player.Name, "Redacted", StringComparison.OrdinalIgnoreCase);
+            }
             return true;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,7 @@ private static bool Connection_OnReceivedServerMessagePacket(Packet packet)`
`239`	`239`	`var p = (OXGaming.TibiaAPI.Network.ServerPackets.Message)packet;`
`240`	`240`	`if (p.MessageMode == MessageModeType.Look)`
`241`	`241`	`{`
`242`		`- if (_lookPlayerRx.IsMatch(p.Text) \|\| p.Text.Contains("You see yourself."))`
	`242`	`+ if (_lookPlayerRx.IsMatch(p.Text) \|\| p.Text.Contains("You see yourself.", StringComparison.OrdinalIgnoreCase))`
`243`	`243`	`{`
`244`	`244`	`p.Text = "Redacted";`
`245`	`245`	`}`
`@@ -256,6 +256,12 @@ private static bool Connection_OnReceivedServerTalkPacket(Packet packet)`
`256`	`256`	`p.SpeakerLevel = 100;`
`257`	`257`	`p.SpeakerName = "Redacted";`
`258`	`258`	`}`
	`259`	`+ else if (creature is object && creature.Type == CreatureType.Npc)`
	`260`	`+ {`
	`261`	`+ // In case the NPC used the player's name in their message,`
	`262`	`+ // we need to check and replace it.`
	`263`	`+ p.Text = p.Text.Replace(p.Client.Player.Name, "Redacted", StringComparison.OrdinalIgnoreCase);`
	`264`	`+ }`
`259`	`265`	`return true;`
`260`	`266`	`}`
`261`	`267`