guild_settings restore_roles

src/Commands/Moderation/GuildSettingsCommand/GuildSettingsCommand.RestoreRoles.cs

@@ -0,0 +1,34 @@
+using System.Threading.Tasks;
+using DSharpPlus.Commands;
+using DSharpPlus.Commands.ContextChecks;
+using DSharpPlus.Entities;
+using OoLunar.Tomoe.Database.Models;
+
+namespace OoLunar.Tomoe.Commands.Moderation
+{
+    public sealed partial class GuildSettingsCommand
+    {
+        /// <summary>
+        /// Whether or not to restore roles when a member rejoins the server.
+        /// </summary>
+        /// <param name="restoreRoles">Whether or not to restore roles when a member rejoins the server.</param>
+        [Command("restore_roles")]
+        [RequirePermissions(DiscordPermissions.ManageRoles, DiscordPermissions.ManageGuild)]
+        public static async ValueTask RestoreRolesAsync(CommandContext context, bool restoreRoles = false)
+        {
+            GuildSettingsModel? settings = await GuildSettingsModel.GetSettingsAsync(context.Guild!.Id);
+            if (settings is null)
+            {
+                await context.RespondAsync(NOT_SETUP_TEXT);
+                return;
+            }
+
+            await GuildSettingsModel.UpdateSettingsAsync(settings with
+            {
+                RestoreRoles = restoreRoles
+            });
+
+            await context.RespondAsync("I will " + (restoreRoles ? "now restore" : "no longer restore") + " a member's previous roles when they rejoin server.");
+        }
+    }
+}

src/Database/Models/GuildMemberModel.cs

@@ -104,7 +104,7 @@ ON CONFLICT (user_id, guild_id) DO UPDATE
             _countMembersWithRole.Parameters.Add(new("@guild_id", NpgsqlDbType.Bigint));
             _countMembersWithRole.Parameters.Add(new("@role_id", NpgsqlDbType.Bigint));
 
-            _countMembersOfGuild = new("SELECT COUNT(guild_id) FROM guild_members WHERE guild_id = @guild_id;");
+            _countMembersOfGuild = new("SELECT COUNT(guild_id) FROM guild_members WHERE guild_id = @guild_id AND state & 1 = 0;");
             _countMembersOfGuild.Parameters.Add(new("@guild_id", NpgsqlDbType.Bigint));
 
             _findMutualGuild = new("SELECT guild_id FROM guild_members WHERE user_id = @user_id AND state | 1 = 1;");

src/Events/Handlers/GuildMemberEventHandlers.cs

@@ -72,9 +72,12 @@ public async Task HandleEventAsync(DiscordClient sender, GuildMemberAddedEventAr
 
             try
             {
-                // Assign roles all at once instead of one at a time for ratelimiting purposes.
-                // TODO: Configuration setting
-                await eventArgs.Member.ReplaceRolesAsync(assignedRoles);
+                if (await GuildSettingsModel.GetRestoreRolesAsync(eventArgs.Guild.Id))
+                {
+                    // Assign roles all at once instead of one at a time for ratelimiting purposes.
+                    await eventArgs.Member.ReplaceRolesAsync(assignedRoles);
+                }
+
                 guildMemberModel.RoleIds = assignedRoles.Select(x => x.Id).ToList();
             }
             catch (Exception error)