fix fetch of discord users (#69)

Astra-Interactive · Aug 10, 2024 · 48fdc3b · 48fdc3b
1 parent bfaf1c7
commit 48fdc3b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -12,7 +12,7 @@ makeevrserg.java.ktarget=21
 # Project
 makeevrserg.project.name=AspeKt
 makeevrserg.project.group=ru.astrainteractive.aspekt
-makeevrserg.project.version.string=2.23.2
+makeevrserg.project.version.string=2.23.3
 makeevrserg.project.description=Essentials plugin for EmpireProjekt
 makeevrserg.project.developers=makeevrserg|Makeev Roman|[email protected]
 makeevrserg.project.url=https://empireprojekt.ru

diff --git a/.../ru/astrainteractive/aspekt/module/adminprivate/command/discordlink/job/DiscordLinkJob.kt b/.../ru/astrainteractive/aspekt/module/adminprivate/command/discordlink/job/DiscordLinkJob.kt
@@ -38,19 +38,21 @@ internal class DiscordLinkJob(
             .linkedAccounts
             .keys
             .toSet()
+        val verifiedDiscordUsersChunks = verifiedDiscordUsers.chunked(32)
         if (verifiedDiscordUsers.isEmpty()) return
 
         discordRoleController.removeRoleFromMembersWithRole(
             whitelistedUserIds = verifiedDiscordUsers,
             roleId = discordRoleId,
             guild = guild
         )
-
-        discordRoleController.addRoleToMembers(
-            memberIds = verifiedDiscordUsers,
-            roleId = discordRoleId,
-            guild = guild
-        )
+        verifiedDiscordUsersChunks.forEach { chunk ->
+            discordRoleController.addRoleToMembers(
+                memberIds = chunk.toSet(),
+                roleId = discordRoleId,
+                guild = guild
+            )
+        }
     }
 
     private suspend fun processLuckPermsRoles() {

diff --git a/...rc/main/kotlin/ru/astrainteractive/aspekt/module/towny/discord/job/TownyDiscordRoleJob.kt b/...rc/main/kotlin/ru/astrainteractive/aspekt/module/towny/discord/job/TownyDiscordRoleJob.kt
@@ -41,16 +41,20 @@ internal class TownyDiscordRoleJob(
                     .map { entry -> entry.value }
                     .toSet()
 
+                val mayorsDiscordIdsChunked = mayorsDiscordIds.chunked(32)
+
                 discordRoleController.removeRoleFromMembersWithRole(
                     whitelistedUserIds = mayorsDiscordIds,
                     roleId = configuration.towny.leaderRoleConfiguration.roleId,
                     guild = guild
                 )
-                discordRoleController.addRoleToMembers(
-                    memberIds = mayorsDiscordIds,
-                    roleId = configuration.towny.leaderRoleConfiguration.roleId,
-                    guild = guild
-                )
+                mayorsDiscordIdsChunked.forEach { chunk ->
+                    discordRoleController.addRoleToMembers(
+                        memberIds = chunk.toSet(),
+                        roleId = configuration.towny.leaderRoleConfiguration.roleId,
+                        guild = guild
+                    )
+                }
             }
         }
     }