Unify lookalike mappings

Erisa · Jan 12, 2025 · d7fbd0c · d7fbd0c
1 parent c22a32b
commit d7fbd0c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 20 deletions.
diff --git a/Checks/ListChecks.cs b/Checks/ListChecks.cs
@@ -4,10 +4,10 @@ namespace Cliptok.Checks
 {
     public class ListChecks
     {
-        // Map of Cyrillic to Latin characters, to catch attempted bypasses using Cyrillic lookalikes
-        // <string, string> is <Cyrillic, Latin>
-        public static Dictionary<string, string> cyrillicAlphabetMap = new()
+        // Map of lookalike to Latin characters, to catch attempted bypasses using different language lookalikes
+        public static Dictionary<string, string> lookalikeAlphabetMap = new()
                             {
+                                // <string, string> is <Cyrillic, Latin>
                                 { "А", "A" },
                                 { "В", "B" },
                                 { "С", "C" },
@@ -47,13 +47,9 @@ public class ListChecks
                                 { "ѡ", "w" },
                                 { "х", "x" },
                                 { "у", "y" },
-                                { "У", "y" }
-                            };
-
-        // Map of Greek to Latin characters, to catch attempted bypasses using Greek lookalikes
-        // <string, string> is <Greek, Latin>
-        public static Dictionary<string, string> greekAlphabetMap = new()
-                            {
+                                { "У", "y" },
+
+                                // <string, string> is <Greek, Latin>
                                 { "Α", "A" },
                                 { "Β", "B" },
                                 { "Ε", "E" },
@@ -83,17 +79,13 @@ public class ListChecks
                                 { "υ", "y" },
                                 { "ζ", "z" },
                             };
-
+        
         public static (bool success, string? flaggedWord) CheckForNaughtyWords(string input, WordListJson naughtyWordList)
         {
-            // Replace any Cyrillic letters found in message with Latin characters, if in the dictionary
-            foreach (var letter in cyrillicAlphabetMap)
+            // Replace any lookalike letters found in message with Latin characters, if in the dictionary
+            foreach (var letter in lookalikeAlphabetMap)
                 input = input.Replace(letter.Key, letter.Value);
 
-            // and Greek letters
-            foreach (var letter in greekAlphabetMap)
-                input = input.Replace(letter.Key, letter.Value);
-
             string[] naughtyWords = naughtyWordList.Words;
             input = input.Replace("\0", "");
             if (naughtyWordList.WholeWord)

diff --git a/Events/MessageEvent.cs b/Events/MessageEvent.cs
@@ -646,9 +646,7 @@ public static async Task MessageHandlerAsync(DiscordClient client, MockDiscordMe
 
                     // attempted to ping @everyone/@here
                     var msgContent = message.Content;
-                    foreach (var letter in Checks.ListChecks.cyrillicAlphabetMap)
-                        msgContent = msgContent.Replace(letter.Key, letter.Value);
-                    foreach (var letter in Checks.ListChecks.greekAlphabetMap)
+                    foreach (var letter in Checks.ListChecks.lookalikeAlphabetMap)
                         msgContent = msgContent.Replace(letter.Key, letter.Value);
                     if (Program.cfgjson.EveryoneFilter && !member.Roles.Any(role => Program.cfgjson.EveryoneExcludedRoles.Contains(role.Id)) && !Program.cfgjson.EveryoneExcludedChannels.Contains(channel.Id) && (msgContent.Contains("@everyone") || msgContent.Contains("@here")))
                     {