fix ignored roles

TrickfireRobotics · Dec 29, 2024 · 2954210 · 2954210
1 parent a14a2d0
commit 2954210
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/TrickFireDiscordBot/Services/RoleSyncer.cs b/TrickFireDiscordBot/Services/RoleSyncer.cs
@@ -75,7 +75,7 @@ Task<PaginatedList<Page>> nextPageQuery(string? cursor) =>
         DiscordRole inactiveRole = _discordRoleCache.Values.First(role => role.Id == options.Value.InactiveRoleId);
         await foreach (DiscordMember member in discordService.MainGuild.GetAllMembersAsync())
         {
-            if (processedMembers.Contains(member))
+            if (processedMembers.Contains(member) || member.Roles.Any(role => options.Value.SafeRoleIds.Contains(role.Id)))
             {
                 continue;
             }
@@ -113,7 +113,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
         {
             try
             {
-                await SyncRoles(await _pageQueue.Reader.ReadAsync(stoppingToken), true);
+                await SyncRoles(await _pageQueue.Reader.ReadAsync(stoppingToken), false);
             }
             catch (Exception ex)
             {
@@ -142,11 +142,6 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
         if (!dryRun)
         {
             int highestRole = discordService.MainGuild.CurrentMember.Roles.Max(role => role.Position);
-            if (member.Roles.Any(role => options.Value.SafeRoleIds.Contains(role.Id)))
-            {
-                return member;
-            }
-
             await member.ModifyAsync(model =>
             {
                 List<DiscordRole> rolesWithLeadership = new(newRoles);

diff --git a/TrickFireDiscordBot/config.json b/TrickFireDiscordBot/config.json
@@ -16,7 +16,7 @@
     "TechnicalLeadRoleId": 1314341103603810384,
     "TechnicalLeadRegex": "(.* ((Team Lead)|(Mission Director)))|(System Integrator)",
     "InactiveRoleId": 1183543002036174918,
-    "SafeRoleIds": [ 593164234905354261 ]
+    "SafeRoleIds": [ 593164234905354261, 593275442408980550 ]
   },
   "BotStateOptions": {
     "FileLocation": "state.json"