make user filter a little more fault tolerant

Author: GreemDev

src/Bot/Systems/Commands/Text/Modules/UserFilterModule.cs

@@ -226,11 +226,10 @@ private async Task<bool> HandleUserAsync(
             {
                 if (VolteStarscript.Hypervisor.Run(script, StarscriptHelper.Wrap(user)).GetBooleanValue())
                 {
+                    Debug(LogSource.Service, $"{user} matched filter {entry.Id} in guild {Context.Guild.Id}");
+
                     if (await entry.ExecuteAsync(Context.Guild, user))
-                    {
-                        Debug(LogSource.Service, $"{user} matched filter {entry.Id} in guild {Context.Guild.Id}");
                         return true;
-                    }
                 }
             }
             catch (FormatException)

src/Bot/Systems/UserFilter/UserFilterTable.cs

@@ -51,19 +51,19 @@ public class UserFilterEntry
     public async Task<bool> HandleAsync(IGuild guild, IGuildUser user)
     {
         StringSegment returnVal = null;
-        
+
         try
         {
-            var script = Starscript.Compile();
-
-            returnVal = VolteStarscript.Hypervisor.Run(script, StarscriptHelper.Wrap(user));
+            using (var script = Starscript.Compile())
+            {
+                returnVal = VolteStarscript.Hypervisor.Run(script, StarscriptHelper.Wrap(user));
+            }
 
             if (returnVal.GetBooleanValue())
             {
-                if (await ExecuteAsync(guild, user))
-                {
-                    Debug(LogSource.Service, $"{user} matched filter {Id} in guild {user.Guild.Id}");
-                }
+                Debug(LogSource.Service, $"{user} matched filter {Id} in guild {user.Guild.Id}");
+
+                _ = await ExecuteAsync(guild, user);
             }
 
             return true;
@@ -108,6 +108,7 @@ public async Task<bool> ExecuteAsync(IGuild guild, IGuildUser user)
                 try
                 {
                     await user.WarnAsync(VolteBot.Client.CurrentUser, VolteBot.Services, Reason);
+                    Debug(LogSource.Service, $"Warned {user} in guild {user.Guild.Id} because they matched filter {Id}");
                     return true;
                 }
                 catch (HttpException)
@@ -119,6 +120,7 @@ public async Task<bool> ExecuteAsync(IGuild guild, IGuildUser user)
                 {
                     await user.KickAsync(Reason,
                         DiscordHelper.RequestOptions(x => x.AuditLogReason = $"Triggered user filter {Id}"));
+                    Debug(LogSource.Service, $"Kicked {user} in guild {user.Guild.Id} because they matched filter {Id}");
                     return true;
                 }
                 catch (HttpException)
@@ -130,6 +132,7 @@ await user.KickAsync(Reason,
                 {
                     await guild.AddBanAsync(user.Id, 7, Reason,
                         DiscordHelper.RequestOptions(x => x.AuditLogReason = $"Triggered user filter {Id}"));
+                    Debug(LogSource.Service, $"Banned {user} in guild {user.Guild.Id} because they matched filter {Id}");
                     return true;
                 }
                 catch (HttpException)
@@ -142,14 +145,16 @@ await guild.AddBanAsync(user.Id, 7, Reason,
                     await guild.AddBanAsync(user.Id, 7, Reason,
                         DiscordHelper.RequestOptions(x => x.AuditLogReason = $"Triggered user filter {Id}"));
                     await guild.RemoveBanAsync(user.Id);
+                    Debug(LogSource.Service, $"Softbanned {user} in guild {user.Guild.Id} because they matched filter {Id}");
                     return true;
                 }
                 catch (HttpException)
                 {
                     return false;
                 }
             default:
-                throw new ArgumentOutOfRangeException(nameof(Action));
+                Debug(LogSource.Service, $"Unknown action type {Enum.GetName(Action)} for filter {Id}");
+                return false;
         }
     }
 }