Fix permissions on /clear and properly apply D#+ permissions changes

Author: FloatingMilkshake

Commands/InteractionCommands/ClearInteractions.cs

@@ -5,7 +5,7 @@ public class ClearInteractions : ApplicationCommandModule
         public static Dictionary<ulong, List<DiscordMessage>> MessagesToClear = new();
 
         [SlashCommand("clear", "Delete many messages from the current channel.", defaultPermission: false)]
-        [HomeServer, SlashRequireHomeserverPerm(ServerPermLevel.TrialModerator), RequireBotPermissions(permissions: [DiscordPermission.ManageMessages, DiscordPermission.ModerateMembers])]
+        [HomeServer, SlashRequireHomeserverPerm(ServerPermLevel.TrialModerator), RequireBotPermissions(permissions: DiscordPermission.ManageMessages), SlashCommandPermissions(permissions: DiscordPermission.ModerateMembers)]
         public async Task ClearSlashCommand(InteractionContext ctx,
             [Option("count", "The number of messages to consider for deletion. Required if you don't use the 'up_to' argument.")] long count = 0,
             [Option("up_to", "Optionally delete messages up to (not including) this one. Accepts IDs and links.")] string upTo = "",

Events/InteractionEvents.cs

@@ -185,8 +185,8 @@ await LogChannelHelper.LogDeletedMessagesAsync(
                 var newMockOverwrite = new MockUserOverwrite
                 {
                     Id = mockOverwrite.Id,
-                    Allowed = newOverwrite.Allowed | existingOverwrite.Allowed,
-                    Denied = newOverwrite.Denied | existingOverwrite.Denied
+                    Allowed = newOverwrite.Allowed.Add(existingOverwrite.Allowed.EnumeratePermissions().ToArray()),
+                    Denied = newOverwrite.Denied.Add(existingOverwrite.Denied.EnumeratePermissions().ToArray())
                 };
 
                 // Cursed conversion again

Events/VoiceEvents.cs

@@ -187,7 +187,7 @@ public static async Task UserLeft(DiscordClient client, VoiceStateUpdatedEventAr
                             // User has other overrides set, so we should only remove the Send Messages override
                             if (overwrite.Allowed.HasPermission(DiscordPermission.SendMessages))
                             {
-                                await e.Before.Channel.AddOverwriteAsync(member, (DiscordPermissions)(overwrite.Allowed - DiscordPermission.SendMessages), overwrite.Denied, "User left voice channel.");
+                                await e.Before.Channel.AddOverwriteAsync(member, overwrite.Allowed.Remove(DiscordPermission.SendMessages), overwrite.Denied, "User left voice channel.");
                             }
                             else
                             {

Helpers/LockdownHelpers.cs

@@ -36,11 +36,11 @@ public static async Task<bool> LockChannelAsync(DiscordUser user, DiscordChannel
 
                             if (overwrite.Allowed.HasPermission(DiscordPermission.SendMessages))
                             {
-                                await channel.AddOverwriteAsync(await overwrite.GetRoleAsync(), (DiscordPermissions)(overwrite.Allowed - DiscordPermission.SendMessages), DiscordPermission.SendMessages | overwrite.Denied, "Reinstating existing overrides for lockdown.");
+                                await channel.AddOverwriteAsync(await overwrite.GetRoleAsync(), overwrite.Allowed.Remove(DiscordPermission.SendMessages), overwrite.Denied.Add(DiscordPermission.SendMessages), "Reinstating existing overrides for lockdown.");
                             }
                             else
                             {
-                                await channel.AddOverwriteAsync(await overwrite.GetRoleAsync(), overwrite.Allowed, DiscordPermission.SendMessages | overwrite.Denied, "Reinstating existing overrides for lockdown.");
+                                await channel.AddOverwriteAsync(await overwrite.GetRoleAsync(), overwrite.Allowed, overwrite.Denied.Add(DiscordPermission.SendMessages), "Reinstating existing overrides for lockdown.");
                             }
                         }
                         else
@@ -56,11 +56,11 @@ public static async Task<bool> LockChannelAsync(DiscordUser user, DiscordChannel
 
                             if (overwrite.Allowed.HasPermission(DiscordPermission.SendMessages))
                             {
-                                await channel.AddOverwriteAsync(await overwrite.GetRoleAsync(), (DiscordPermissions)(overwrite.Allowed - DiscordPermission.SendMessages), DiscordPermission.SendMessages | overwrite.Denied, "Reinstating existing overrides for lockdown.");
+                                await channel.AddOverwriteAsync(await overwrite.GetRoleAsync(), overwrite.Allowed.Remove(DiscordPermission.SendMessages), overwrite.Denied.Add(DiscordPermission.SendMessages), "Reinstating existing overrides for lockdown.");
                             }
                             else
                             {
-                                await channel.AddOverwriteAsync(await overwrite.GetRoleAsync(), overwrite.Allowed, DiscordPermission.SendMessages | overwrite.Denied, "Reinstating existing overrides for lockdown.");
+                                await channel.AddOverwriteAsync(await overwrite.GetRoleAsync(), overwrite.Allowed, overwrite.Denied.Add(DiscordPermission.SendMessages), "Reinstating existing overrides for lockdown.");
                             }
                         }
 
@@ -133,15 +133,15 @@ public static async Task<bool> UnlockChannel(DiscordChannel discordChannel, Disc
                             newOverwrite = new(discordChannel.Guild.EveryoneRole)
                             {
                                 Allowed = permission.Allowed,
-                                Denied = permission.Denied - DiscordPermission.SendMessages - DiscordPermission.SendThreadMessages
+                                Denied = permission.Denied.Remove([DiscordPermission.SendMessages, DiscordPermission.SendThreadMessages])
                             };
                         }
                         else
                         {
                             newOverwrite = new(discordChannel.Guild.EveryoneRole)
                             {
                                 Allowed = permission.Allowed,
-                                Denied = (DiscordPermissions)(permission.Denied - DiscordPermission.SendMessages)
+                                Denied = permission.Denied.Remove(DiscordPermission.SendMessages)
                             };
                         }
 
@@ -161,7 +161,7 @@ public static async Task<bool> UnlockChannel(DiscordChannel discordChannel, Disc
                     if (role == await discordChannel.Guild.GetRoleAsync(Program.cfgjson.ModRole)
                         && permission.Allowed == new DiscordPermissions([DiscordPermission.SendMessages, DiscordPermission.ViewChannel]))
                     {
-                        await discordChannel.AddOverwriteAsync(await discordChannel.Guild.GetRoleAsync(Program.cfgjson.ModRole), (DiscordPermissions)(permission.Allowed - DiscordPermission.SendMessages), DiscordPermissions.None);
+                        await discordChannel.AddOverwriteAsync(await discordChannel.Guild.GetRoleAsync(Program.cfgjson.ModRole), permission.Allowed.Remove(DiscordPermission.SendMessages), DiscordPermissions.None);
                     }
 
                 }