From 91eddfc58077017953e89b5b20c35588c89ed489 Mon Sep 17 00:00:00 2001
From: hydrant <lennart@kampshoff.xyz>
Date: Mon, 3 Dec 2018 18:37:11 +0100
Subject: [PATCH] Improved color code prohibition

---
 Server/Commands/Admin.cs   |  8 ++++----
 Server/Commands/Faction.cs | 10 +++++-----
 Server/Events/Chat.cs      |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Server/Commands/Admin.cs b/Server/Commands/Admin.cs
index bff7cfb5..1496050e 100644
--- a/Server/Commands/Admin.cs
+++ b/Server/Commands/Admin.cs
@@ -38,7 +38,7 @@ namespace reallife_gamemode.Server.Commands
                 ChatService.NotAuthorized(player);
                 return;
             }
-
+            message = Regex.Replace(message, "(~[a-zA-Z]~{1})|(!{(.*)})", "");
             message = Regex.Replace(message, "#([0-9A-Fa-f]{6})", m => "!{" + m.Groups[0].Value + "}");
 
             string publicMessage = "~b~(( " + player.GetUser().AdminLevel.GetName() + " " + player.Name + ": " + message + " ~b~))";
@@ -154,7 +154,7 @@ namespace reallife_gamemode.Server.Commands
                 return;
             }
 
-            msg = Regex.Replace(msg, "(!{(.*)})", "");
+            msg = Regex.Replace(msg, "(~[a-zA-Z]~{1})|(!{(.*)})", "");
 
             player.SendChatMessage("~y~PM an " + target.Name + ": " + msg + " ");
             string Message = "~y~PM von " + player.GetUser().AdminLevel.GetName() + " " + player.Name + ": " + msg + "";
@@ -208,7 +208,7 @@ namespace reallife_gamemode.Server.Commands
                 return;
             }
 
-            message = Regex.Replace(message, "(!{(.*)})", "");
+            message = Regex.Replace(message, "(~[a-zA-Z]~{1})|(!{(.*)})", "");
 
             ChatService.BroadcastAdmin("~r~[ADMINCHAT]~s~ " + player.GetUser().AdminLevel.GetName() + " " + player.Name + "~w~: " + message, AdminLevel.ADMIN);
         }
@@ -512,7 +512,7 @@ namespace reallife_gamemode.Server.Commands
                 return;
             }
 
-            reason = Regex.Replace(reason, "(!{(.*)})", "");
+            reason = Regex.Replace(reason, "(~[a-zA-Z]~{1})|(!{(.*)})", "");
 
             target.GetUser().BanPlayer(admin, reason, mins);
         }
diff --git a/Server/Commands/Faction.cs b/Server/Commands/Faction.cs
index e7737612..c162e78b 100644
--- a/Server/Commands/Faction.cs
+++ b/Server/Commands/Faction.cs
@@ -33,7 +33,7 @@ namespace reallife_gamemode.Server.Commands
                 return;
             }
 
-            message = Regex.Replace(message, "(!{(.*)})", "");
+            message = Regex.Replace(message, "(~[a-zA-Z]~{1})|(!{(.*)})", "");
 
             string broadcastMessage = "!{02FCFF}** " + player.GetUser().GetFactionRank().RankName + " " + player.Name + ": " + message + " )) **";
             ChatService.BroadcastFaction(broadcastMessage, f);
@@ -49,7 +49,7 @@ namespace reallife_gamemode.Server.Commands
                 return;
             }
 
-            message = Regex.Replace(message, "(!{(.*)})", "");
+            message = Regex.Replace(message, "(~[a-zA-Z]~{1})|(!{(.*)})", "");
 
             string broadcastMessage = "!{33AA33}** " + player.GetUser().GetFactionRank().RankName + " " + player.Name + ": " + message + ", over **";
             ChatService.BroadcastFaction(broadcastMessage, f);
@@ -65,7 +65,7 @@ namespace reallife_gamemode.Server.Commands
                 return;
             }
 
-            message = Regex.Replace(message, "(!{(.*)})", "");
+            message = Regex.Replace(message, "(~[a-zA-Z]~{1})|(!{(.*)})", "");
 
             string broadcastMessage = "!{CC3333}** " + player.GetUser().GetFactionRank().RankName + " " + player.Name + ": " + message + ", over **";
             using (var context = new DatabaseContext())
@@ -203,7 +203,7 @@ namespace reallife_gamemode.Server.Commands
                 return;
             }
 
-            message = Regex.Replace(message, "(!{(.*)})", "");
+            message = Regex.Replace(message, "(~[a-zA-Z]~{1})|(!{(.*)})", "");
 
             string broadcastMsg = "~y~[" + player.GetUser().GetFaction().Name + "] " + player.Name + ": " + message;
 
@@ -264,7 +264,7 @@ namespace reallife_gamemode.Server.Commands
             player.SendNotification("Du hast~g~" + target.Name + " ~s~geheilt.", false);
         }
         #endregion
-            #region Global Fraktions Commands
+        #region Global Fraktions Commands
         [Command("duty", "~m~Benutzung: ~s~/duty")]
         public void CmdFactionDuty(Client player)
         {
diff --git a/Server/Events/Chat.cs b/Server/Events/Chat.cs
index 5079f560..a2cc9b77 100644
--- a/Server/Events/Chat.cs
+++ b/Server/Events/Chat.cs
@@ -8,7 +8,7 @@ namespace reallife_gamemode.Server.Events
         [ServerEvent(Event.ChatMessage)]
         public void ChatEvent(Client player, string message)
         {
-            string serverMsg = Regex.Replace(message, "(!{(.*)})", "");
+            string serverMsg = Regex.Replace(message, "(~[a-zA-Z]~{1})|(!{(.*)})", "");
             if (serverMsg.Trim().Length == 0) return;
             NAPI.Player.GetPlayersInRadiusOfPlayer(10, player).ForEach(p => p.SendChatMessage($"{player.Name} sagt: {serverMsg}"));
         }