Merge branch 'vnext'

Author: 13xforever

CompatBot/Database/Providers/ContentFilter.cs

@@ -128,17 +128,21 @@ public static async ValueTask<bool> IsClean(DiscordClient client, DiscordMessage
 #endif
 
         var content = new StringBuilder();
-        
-        DumpMessageContent(message, ref content);
+        Config.Log.Debug($"[{nameof(ContentFilter)}.{nameof(IsClean)}] Message length: {message.Content.Length}");
+        DumpMessageContent(message, content);
+        Config.Log.Debug($"[{nameof(ContentFilter)}.{nameof(IsClean)}] Dumped content length: {content.Length}");
         if (message.Reference is {Type: DiscordMessageReferenceType.Forward} refMsg)
         {
             try
             {
+                Config.Log.Debug($"[{nameof(ContentFilter)}.{nameof(IsClean)}] Message has a forwarded message, getting it…");
                 var msg = await client.GetMessageAsync(refMsg.Channel, refMsg.Message.Id).ConfigureAwait(false);
                 if (msg is not null)
                 {
+                    Config.Log.Debug($"[{nameof(ContentFilter)}.{nameof(IsClean)}] Forwarded message length: {msg.Content.Length}");
                     content.AppendLine();
-                    DumpMessageContent(msg, ref content);
+                    DumpMessageContent(msg, content);
+                    Config.Log.Debug($"[{nameof(ContentFilter)}.{nameof(IsClean)}] Dumped content length: {content.Length}");
                 }
             }
             catch (Exception e)
@@ -149,8 +153,12 @@ public static async ValueTask<bool> IsClean(DiscordClient client, DiscordMessage
 
         var trigger = await FindTriggerAsync(FilterContext.Chat, content.ToString()).ConfigureAwait(false);
         if (trigger is null)
+        {
+            Config.Log.Debug($"[{nameof(ContentFilter)}.{nameof(IsClean)}] Nothing found");
             return true;
+        }
 
+        Config.Log.Debug($"[{nameof(ContentFilter)}.{nameof(IsClean)}] Cleaning…");
         await PerformFilterActions(client, message, trigger, suppressActions).ConfigureAwait(false);
         return (trigger.Actions & ~suppressActions & (FilterAction.IssueWarning | FilterAction.RemoveContent)) == 0;
     }
@@ -304,7 +312,7 @@ public static async ValueTask PerformFilterActions(
             ? m.Groups[0].Value.Trim(256)
             : null;
 
-    private static void DumpMessageContent(DiscordMessage message, ref StringBuilder content)
+    private static void DumpMessageContent(DiscordMessage message, StringBuilder content)
     {
         if (content is {Length: >0})
             content.AppendLine(message.Content);

CompatBot/EventHandlers/ContentFilterMonitor.cs

@@ -14,14 +14,9 @@ public static async Task OnReaction(DiscordClient c, MessageReactionAddedEventAr
             return;
 
         var emoji = c.GetEmoji(":piratethink:", Config.Reactions.PiracyCheck);
-        Config.Log.Debug($"[{nameof(ContentFilterMonitor)}] Resolved emoji: {emoji}, reaction emoji: {e.Emoji}");
         if (e.Emoji != emoji)
-        {
-            Config.Log.Debug($"[{nameof(ContentFilterMonitor)}] Wrong emoji, skipping");
             return;
-        }
 
-        Config.Log.Debug($"[{nameof(ContentFilterMonitor)}] Message has content: {(e.Message is { Content.Length: >0 })}");
         await ContentFilter.IsClean(c, e.Message).ConfigureAwait(false);
     }
 }