From f13412d77ad8ba52dcf23d811cdb110e8153d70b Mon Sep 17 00:00:00 2001
From: dalbodeule <11470513+dalbodeule@users.noreply.github.com>
Date: Wed, 14 Aug 2024 20:50:58 +0900
Subject: [PATCH] asdf13

---
 .../space/mori/chzzk_bot/webserver/Main.kt    |  4 ++--
 .../webserver/utils/DiscordGuildCache.kt      |  5 +++--
 .../webserver/utils/DiscordRatelimits.kt      | 19 +++++++++++++++----
 3 files changed, 20 insertions(+), 8 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 2cf18a1..9a4b1b1 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.isLimited()) {
+    if(DiscordRatelimits.isLimited()) {
         delay(DiscordRatelimits.getRateReset())
     }
 
@@ -309,7 +309,7 @@ suspend fun getDiscordUser(accessToken: String): DiscordMeAPI? {
 }
 
 suspend fun getUserGuilds(accessToken: String): List<DiscordGuildListAPI> {
-    while(DiscordRatelimits.isLimited()) {
+    if(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 cdd5098..b426a93 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
@@ -31,7 +31,7 @@ object DiscordGuildCache {
 
     private suspend fun fetchGuilds(beforeGuildId: String? = null): List<DiscordGuildListAPI> {
         if(DiscordRatelimits.isLimited()) {
-            delay(DiscordRatelimits.getRateReset().takeIf { it > 1000L } ?: 3000L)
+            delay(DiscordRatelimits.getRateReset())
         }
         val result = applicationHttpClient.get("https://discord.com/api/users/@me/guilds") {
             headers {
@@ -57,7 +57,7 @@ object DiscordGuildCache {
         while (true) {
             try {
                 val guilds = fetchGuilds(lastGuildId)
-                if (guilds.isEmpty() || guilds.size <= 200) {
+                if (guilds.isEmpty()) {
                     break
                 }
 
@@ -68,6 +68,7 @@ object DiscordGuildCache {
                     )
                 }
                 lastGuildId = guilds.last().id
+                if(guilds.size <= 200) break
             } catch(e: Exception) {
                 logger.info("Exception in discord caches. ${e.stackTraceToString()}")
                 return
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 90a40f8..5337c0f 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
@@ -1,25 +1,36 @@
 package space.mori.chzzk_bot.webserver.utils
 
+import java.time.Duration
+import java.time.Instant
+
 object DiscordRatelimits {
-    private var rateLimit = RateLimit(0, 5, 0L)
+    private var rateLimit = RateLimit(0, 5, Instant.now())
 
     fun isLimited(): Boolean {
         return rateLimit.remainin == 0
     }
 
-    fun getRateReset() = (rateLimit.resetAfter * 1000) + 300L
+    fun getRateReset(): Long {
+        val now = Instant.now()
+        val resetInstant = rateLimit.resetAfter
+        return if (resetInstant.isAfter(now)) {
+            Duration.between(now, resetInstant).toMillis()
+        } else {
+            0L // 이미 Rate Limit이 해제된 경우, 대기 시간은 0
+        }
+    }
 
     private fun setRateLimit(rateLimit: RateLimit) {
         this.rateLimit = rateLimit
     }
 
     fun setRateLimit(limit: Int?, remaining: Int?, resetAfter: Long?) {
-        return setRateLimit(RateLimit(limit ?: 0, remaining ?: 0, resetAfter ?: 0L))
+        return setRateLimit(RateLimit(limit ?: 0, remaining ?: 0, Instant.now().plusSeconds(resetAfter ?: 0L)))
     }
 }
 
 data class RateLimit(
     val limit: Int,
     val remainin: Int,
-    val resetAfter: Long,
+    val resetAfter: Instant,
 )
\ No newline at end of file