CHANGELOG.md

@@ -2,13 +2,6 @@
 
 *a,c,f,r,o*
 
-## [6.0.12] - 20.03.2025
-
-### Fixed
-- `.antispamignore` fixed for the last time hopefully
-    - protection commands are some of the oldest commands, and they might get overhauled in future updates
-    - please report if you find any other weird issue with them
-
 ## [6.0.11] - 20.03.2025
 
 ### Changed

src/EllieBot/EllieBot.csproj

@@ -4,7 +4,7 @@
         <Nullable>enable</Nullable>
         <ImplicitUsings>true</ImplicitUsings>
         <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
-        <Version>6.0.12</Version>
+        <Version>6.0.11</Version>
 
         <!-- Output/build -->
         <RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>

src/EllieBot/Modules/Administration/Protection/ProtectionService.cs

@@ -27,7 +27,6 @@ public class ProtectionService : IReadyExecutor, IEService
     private readonly UserPunishService _punishService;
     private readonly INotifySubscriber _notifySub;
     private readonly ShardData _shardData;
-    
     private readonly Channel<PunishQueueItem> _punishUserQueue =
         Channel.CreateUnbounded<PunishQueueItem>(new()
         {
@@ -177,7 +176,10 @@ public class ProtectionService : IReadyExecutor, IEService
             try
             {
                 if (!_antiSpamGuilds.TryGetValue(channel.Guild.Id, out var spamSettings)
-                    || spamSettings.AntiSpamSettings.IgnoredChannels.Any(x => x.ChannelId == channel.Id))
+                    || spamSettings.AntiSpamSettings.IgnoredChannels.Contains(new()
+                    {
+                        ChannelId = channel.Id
+                    }))
                     return;
 
                 var stats = spamSettings.UserStats.AddOrUpdate(msg.Author.Id,
@@ -273,25 +275,23 @@ public class ProtectionService : IReadyExecutor, IEService
         await using var uow = _db.GetDbContext();
 
         await uow.GetTable<AntiRaidSetting>()
-            .InsertOrUpdateAsync(() => new()
-                {
-                    GuildId = guildId,
-                    Action = action,
-                    Seconds = seconds,
-                    UserThreshold = userThreshold,
-                    PunishDuration = minutesDuration
-                },
-                _ => new()
-                {
-                    Action = action,
-                    Seconds = seconds,
-                    UserThreshold = userThreshold,
-                    PunishDuration = minutesDuration
-                },
-                () => new()
-                {
-                    GuildId = guildId
-                });
+           .InsertOrUpdateAsync(() => new()
+           {
+               GuildId = guildId,
+               Action = action,
+               Seconds = seconds,
+               UserThreshold = userThreshold,
+               PunishDuration = minutesDuration
+           }, _ => new()
+           {
+               Action = action,
+               Seconds = seconds,
+               UserThreshold = userThreshold,
+               PunishDuration = minutesDuration
+           }, () => new()
+           {
+               GuildId = guildId
+           });
 
 
         return stats;
@@ -364,25 +364,23 @@ public class ProtectionService : IReadyExecutor, IEService
         await using var uow = _db.GetDbContext();
         await uow.GetTable<AntiSpamSetting>()
             .InsertOrUpdateAsync(() => new()
-                {
-                    GuildId = guildId,
-                    Action = stats.AntiSpamSettings.Action,
-                    MessageThreshold = stats.AntiSpamSettings.MessageThreshold,
-                    MuteTime = stats.AntiSpamSettings.MuteTime,
-                    RoleId = stats.AntiSpamSettings.RoleId
-                },
-                (old) => new()
-                {
-                    GuildId = guildId,
-                    Action = stats.AntiSpamSettings.Action,
-                    MessageThreshold = stats.AntiSpamSettings.MessageThreshold,
-                    MuteTime = stats.AntiSpamSettings.MuteTime,
-                    RoleId = stats.AntiSpamSettings.RoleId
-                },
-                () => new()
-                {
-                    GuildId = guildId
-                });
+            {
+                GuildId = guildId,
+                Action = stats.AntiSpamSettings.Action,
+                MessageThreshold = stats.AntiSpamSettings.MessageThreshold,
+                MuteTime = stats.AntiSpamSettings.MuteTime,
+                RoleId = stats.AntiSpamSettings.RoleId
+            }, (old) => new()
+            {
+                GuildId = guildId,
+                Action = stats.AntiSpamSettings.Action,
+                MessageThreshold = stats.AntiSpamSettings.MessageThreshold,
+                MuteTime = stats.AntiSpamSettings.MuteTime,
+                RoleId = stats.AntiSpamSettings.RoleId
+            }, () => new()
+            {
+                GuildId = guildId
+            });
 
         return stats;
     }
@@ -407,7 +405,7 @@ public class ProtectionService : IReadyExecutor, IEService
         if (spam.IgnoredChannels.All(x => x.ChannelId != channelId))
         {
             if (_antiSpamGuilds.TryGetValue(guildId, out var temp))
-                temp.AntiSpamSettings.IgnoredChannels.Add(obj);
+                temp.AntiSpamSettings.IgnoredChannels.Add(obj); // add to local cache
 
             spam.IgnoredChannels.Add(obj);
             added = true;
@@ -419,7 +417,7 @@ public class ProtectionService : IReadyExecutor, IEService
             uow.Set<AntiSpamIgnore>().Remove(toRemove);
 
             if (_antiSpamGuilds.TryGetValue(guildId, out var temp))
-                temp.AntiSpamSettings.IgnoredChannels.RemoveAll(x => x.ChannelId == channelId);
+                temp.AntiSpamSettings.IgnoredChannels.Remove(toRemove); // remove from local cache
 
             added = false;
         }
@@ -464,24 +462,22 @@ public class ProtectionService : IReadyExecutor, IEService
 
         await uow.GetTable<AntiAltSetting>()
             .InsertOrUpdateAsync(() => new()
-                {
-                    GuildId = guildId,
-                    Action = action,
-                    ActionDurationMinutes = actionDurationMinutes,
-                    MinAge = TimeSpan.FromMinutes(minAgeMinutes),
-                    RoleId = roleId
-                },
-                _ => new()
-                {
-                    Action = action,
-                    ActionDurationMinutes = actionDurationMinutes,
-                    MinAge = TimeSpan.FromMinutes(minAgeMinutes),
-                    RoleId = roleId
-                },
-                () => new()
-                {
-                    GuildId = guildId
-                });
+            {
+                GuildId = guildId,
+                Action = action,
+                ActionDurationMinutes = actionDurationMinutes,
+                MinAge = TimeSpan.FromMinutes(minAgeMinutes),
+                RoleId = roleId
+            }, _ => new()
+            {
+                Action = action,
+                ActionDurationMinutes = actionDurationMinutes,
+                MinAge = TimeSpan.FromMinutes(minAgeMinutes),
+                RoleId = roleId
+            }, () => new()
+            {
+                GuildId = guildId
+            });
 
         _antiAltGuilds[guildId] = new(new()
         {