Merge branch 'vnext'

Author: 13xforever

CompatBot/Database/Providers/ContentFilter.cs

@@ -102,7 +102,7 @@ select g.Key
         filters = newFilters;
     }
 
-    public static async ValueTask<bool> IsClean(DiscordClient client, DiscordMessage message)
+    public static async ValueTask<bool> IsClean(DiscordClient client, DiscordMessage message, bool logContent = false)
     {
         if (message.Channel?.IsPrivate is true)
             return true;
@@ -133,6 +133,15 @@ public static async ValueTask<bool> IsClean(DiscordClient client, DiscordMessage
 #endif
 
         var content = await message.GetMessageContentForFiltersAsync(client).ConfigureAwait(false);
+        if (logContent)
+        {
+            var prefix = $"[{message.Id % 100:00}]";
+            Config.Log.Debug($"""
+                {prefix} Filter content for message {message.JumpLink} from user {message.Author?.Username} ({message.Author?.Id}):
+                {content}
+                """
+            );
+        }
         var trigger = await FindTriggerAsync(FilterContext.Chat, content).ConfigureAwait(false);
         if (trigger is null)
             return true;

CompatBot/EventHandlers/ContentFilterMonitor.cs

@@ -19,14 +19,10 @@ public static async Task OnReaction(DiscordClient c, MessageReactionAddedEventAr
 
         var message = e.Message;
         if (message.Author is null)
-        {
-            message = await e.Channel.GetMessageCachedAsync(e.Message.Id).ConfigureAwait(false);
-            if (message?.Author is null)
-                message = await e.Channel.GetMessageAsync(e.Message.Id).ConfigureAwait(false);
-        }
+            message = await e.Channel.GetMessageAsync(e.Message.Id).ConfigureAwait(false);
         if (message.Attachments.Any() || message.Embeds.Any())
             MediaScreenshotMonitor.EnqueueOcrTask(message);
-        if (await ContentFilter.IsClean(c, message).ConfigureAwait(false))
+        if (await ContentFilter.IsClean(c, message, true).ConfigureAwait(false))
             await DiscordInviteFilter.CheckMessageInvitesAreSafeAsync(c, message).ConfigureAwait(false);
     }
 }

CompatBot/Utils/Extensions/DiscordMessageExtensions.cs

@@ -103,8 +103,10 @@ private static StringBuilder Append(this StringBuilder content, DiscordMessage m
         if (includeEmbeds)
             foreach (var embed in message.Embeds)
             {
+                if (embed.Author?.Name is {Length: >0} embedAuthor)
+                    content.AppendLine(embedAuthor);
                 content.AppendLine(embed.Title).AppendLine(embed.Description);
-                if (embed.Fields is not { Count: >0 })
+                if (embed.Fields is not {Count: >0})
                     continue;
 
                 foreach (var field in embed.Fields)