Merge pull request #113 from rGunti/hotfix/command-whitelist

Command Limitations now accept simple user names instead of User Identifiers
rGunti · Apr 19, 2023 · 72ddb5f · 72ddb5f
2 parents 9a7e335 + d5d30c0
commit 72ddb5f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/FloppyBot.Commands.Custom.Execution/CustomCommandExecutor.cs b/src/FloppyBot.Commands.Custom.Execution/CustomCommandExecutor.cs
@@ -54,7 +54,8 @@ public CustomCommandExecutor(
         author.AssertLevel(description.Limitations.MinLevel);
 
         if (description.Limitations.LimitedToUsers.Any() &&
-            !description.Limitations.LimitedToUsers.Contains(author.Identifier.ToString().ToLowerInvariant()))
+            !description.Limitations.LimitedToUsers.Contains(author.Identifier.ToString().ToLowerInvariant()) &&
+            !description.Limitations.LimitedToUsers.Contains(author.Identifier.Channel.ToLowerInvariant()))
         {
             _logger.LogDebug(
                 "User {UserId} is not whitelisted for command {CommandId} ({CommandName}), command execution skipped",

diff --git a/src/FloppyBot.Commands.Custom.Tests/Execution/CustomCommandExecutorTests.cs b/src/FloppyBot.Commands.Custom.Tests/Execution/CustomCommandExecutorTests.cs
@@ -227,7 +227,7 @@ public void HandlesUserLimitationCorrectly(string inputUser, bool expectResult)
                 Limitations = CommandDescription.Limitations with
                 {
                     LimitedToUsers = ImmutableHashSet.Create<string>()
-                        .Add("Mock/CoolUser")
+                        .Add("CoolUser".ToLowerInvariant())
                 }
             })
             .ToArray();