Merge branch 'main' into milkshake/pardon-warnings

Erisa · Erisa · commit c95aab50de79 · 2025-08-05T23:56:35.000+01:00
diff --git a/Events/MessageEvent.cs b/Events/MessageEvent.cs
@@ -279,7 +279,7 @@ public static async Task MessageHandlerAsync(DiscordClient client, MockDiscordMe
         {
             #region message logging fill to db
             // If db support is enabled, and this message is not in an excluded channel, cache it
-            if (message.Channel.GuildId == Program.cfgjson.ServerID
+            if (!wasAutoModBlock && message.Channel.GuildId == Program.cfgjson.ServerID
                 && Program.cfgjson.EnablePersistentDb
                 && !Program.cfgjson.MessageLogExcludedChannels.Contains(message.ChannelId)
                 && (message.Channel.ParentId is null || !Program.cfgjson.MessageLogExcludedChannels.Contains((ulong)message.Channel.ParentId)))

Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ public static async Task MessageHandlerAsync(DiscordClient client, MockDiscordMe`
`279`	`279`	`{`
`280`	`280`	`#region message logging fill to db`
`281`	`281`	`// If db support is enabled, and this message is not in an excluded channel, cache it`
`282`		`- if (message.Channel.GuildId == Program.cfgjson.ServerID`
	`282`	`+ if (!wasAutoModBlock && message.Channel.GuildId == Program.cfgjson.ServerID`
`283`	`283`	`&& Program.cfgjson.EnablePersistentDb`
`284`	`284`	`&& !Program.cfgjson.MessageLogExcludedChannels.Contains(message.ChannelId)`
`285`	`285`	`&& (message.Channel.ParentId is null \|\| !Program.cfgjson.MessageLogExcludedChannels.Contains((ulong)message.Channel.ParentId)))`