Merge branch 'vnext'

Author: 13xforever

CompatBot/EventHandlers/DiscordInviteFilter.cs

@@ -53,13 +53,13 @@ public static async Task<bool> CheckMessageInvitesAreSafeAsync(DiscordClient cli
             {
                 DeletedMessagesMonitor.RemovedByBotCache.Set(message.Id, true, DeletedMessagesMonitor.CacheRetainTime);
                 await message.DeleteAsync("Not a white-listed discord invite link").ConfigureAwait(false);
-                await client.ReportAsync("🛃 An unapproved discord invite", message, "In invalid or expired invite",  null, null, null, ReportSeverity.Low).ConfigureAwait(false);
+                await client.ReportAsync("🛃 An unapproved discord invite", message, "An invalid or expired invite",  null, null, null, ReportSeverity.Low).ConfigureAwait(false);
                 await message.Channel.SendMessageAsync($"{message.Author.Mention} please refrain from posting invites that were not approved by a moderator, especially expired or invalid.").ConfigureAwait(false);
             }
             catch (Exception e)
             {
                 Config.Log.Warn(e);
-                await client.ReportAsync("🛃 An unapproved discord invite", message, "In invalid or expired invite", null, null, null, ReportSeverity.Medium).ConfigureAwait(false);
+                await client.ReportAsync("🛃 An unapproved discord invite", message, "An invalid or expired invite", null, null, null, ReportSeverity.Medium).ConfigureAwait(false);
                 await message.ReactWithAsync(Config.Reactions.Moderated,
                     $"{message.Author.Mention} please remove this expired or invalid invite, and refrain from posting it again until you have received an approval from a moderator.",
                     true

CompatBot/Utils/ResultFormatters/LogParserResultFormatter.WeirdSettingsSection.cs

@@ -369,7 +369,7 @@ private static void BuildWeirdSettingsSection(DiscordEmbedBuilder builder, LogPa
                 && memoryMaps.TryGetValue("BAR", out var barMemory)
                 && deviceLocalMemory != barMemory)
             {
-                generalNotes.Add("⚠️ [Re-BAR](<https://www.nvidia.com/en-us/geforce/news/geforce-rtx-30-series-resizable-bar-support/>) (or SAM) is not [enabled](<https://www.intel.com/content/www/us/en/support/articles/000090831/graphics.html>) on this system, which may impact performance");
+                generalNotes.Add("⚠️ [Re-BAR](<https://www.nvidia.com/en-us/geforce/news/geforce-rtx-30-series-resizable-bar-support/>) (or SAM) is [not enabled](<https://www.intel.com/content/www/us/en/support/articles/000090831/graphics.html>) on this system, which may impact performance");
             }
         }