From dd8e5065dfdcc3cb175c5fad971ad453e4118e00 Mon Sep 17 00:00:00 2001
From: dalbodeule <11470513+dalbodeule@users.noreply.github.com>
Date: Wed, 14 Aug 2024 19:18:50 +0900
Subject: [PATCH] avoid discord limits. - fix DiscordRatelimits

---
 .../src/main/kotlin/space/mori/chzzk_bot/webserver/Main.kt    | 4 ++--
 .../space/mori/chzzk_bot/webserver/utils/DiscordGuildCache.kt | 2 +-
 .../space/mori/chzzk_bot/webserver/utils/DiscordRatelimits.kt | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/Main.kt b/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/Main.kt
index d6c79cb..343ab35 100644
--- a/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/Main.kt
+++ b/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/Main.kt
@@ -289,7 +289,7 @@ data class DiscordGuildListAPI(
 )
 
 suspend fun getDiscordUser(accessToken: String): DiscordMeAPI? {
-    while(!DiscordRatelimits.getRateLimit()) {
+    while(!DiscordRatelimits.isLimited()) {
         delay(DiscordRatelimits.getRateReset())
     }
 
@@ -309,7 +309,7 @@ suspend fun getDiscordUser(accessToken: String): DiscordMeAPI? {
 }
 
 suspend fun getUserGuilds(accessToken: String): List<DiscordGuildListAPI> {
-    while(!DiscordRatelimits.getRateLimit()) {
+    while(!DiscordRatelimits.isLimited()) {
         delay(DiscordRatelimits.getRateReset())
     }
 
diff --git a/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/utils/DiscordGuildCache.kt b/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/utils/DiscordGuildCache.kt
index 72c1192..02f6c19 100644
--- a/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/utils/DiscordGuildCache.kt
+++ b/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/utils/DiscordGuildCache.kt
@@ -53,7 +53,7 @@ object DiscordGuildCache {
     private suspend fun fetchAllGuilds() {
         var lastGuildId: String? = null
         while (true) {
-            while(!DiscordRatelimits.getRateLimit()) {
+            while(!DiscordRatelimits.isLimited()) {
                 delay(DiscordRatelimits.getRateReset())
             }
             val guilds = fetchGuilds(lastGuildId)
diff --git a/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/utils/DiscordRatelimits.kt b/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/utils/DiscordRatelimits.kt
index 678abbf..4f4cfb3 100644
--- a/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/utils/DiscordRatelimits.kt
+++ b/webserver/src/main/kotlin/space/mori/chzzk_bot/webserver/utils/DiscordRatelimits.kt
@@ -3,8 +3,8 @@ package space.mori.chzzk_bot.webserver.utils
 object DiscordRatelimits {
     private var rateLimit = RateLimit(0, 5, 0L)
 
-    fun getRateLimit(): Boolean {
-        return rateLimit.remainin != 0
+    fun isLimited(): Boolean {
+        return rateLimit.remainin == 0
     }
 
     fun getRateReset() = rateLimit.resetAfter