Fix ratelimit exception

DRSchlaubi · Oct 25, 2024 · 1308185 · 1308185
1 parent 37437fe
commit 1308185
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/api/src/main/kotlin/dev/schlaubi/mikbot/plugin/api/owner/OwnerApi.kt b/api/src/main/kotlin/dev/schlaubi/mikbot/plugin/api/owner/OwnerApi.kt
@@ -1,6 +1,8 @@
 package dev.schlaubi.mikbot.plugin.api.owner
 
 import com.kotlindiscord.kord.extensions.commands.application.slash.SlashCommand
+import dev.kord.common.entity.ApplicationIntegrationType
+import dev.kord.common.entity.InteractionContextType
 import dev.kord.common.entity.Permission
 import dev.schlaubi.mikbot.plugin.api.*
 import dev.schlaubi.mikbot.plugin.api.config.Config
@@ -31,4 +33,6 @@ public interface OwnerExtensionPoint : ModuleExtensionPoint<OwnerModule> {
 public fun SlashCommand<*, *, *>.ownerOnly() {
     guildId = Config.OWNER_GUILD ?: error("Cannot register owner command without OWNER_GUILD value")
     requirePermission(Permission.Administrator)
+    allowedContexts.add(InteractionContextType.Guild)
+    allowedInstallTypes.add(ApplicationIntegrationType.GuildInstall)
 }
diff --git a/...netes/src/main/kotlin/dev/schlaubi/mikbot/core/health/ratelimit/DistributedRateLimiter.kt b/...netes/src/main/kotlin/dev/schlaubi/mikbot/core/health/ratelimit/DistributedRateLimiter.kt
@@ -15,6 +15,7 @@ import kotlinx.datetime.toJavaInstant
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.Executors
 import kotlin.time.Duration
+import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.minutes
 import kotlin.time.toJavaDuration
 
@@ -85,7 +86,7 @@ class DistributedRateLimiter(proxyManager: ProxyManager<String>) : RequestRateLi
                 .capacity(limit.remaining.value)
                 .refillIntervallyAligned(
                     limit.total.value,
-                    (reset.value - Clock.System.now()).coerceAtMost(Duration.ZERO).toJavaDuration(),
+                    (reset.value - Clock.System.now()).coerceAtLeast(1.milliseconds).toJavaDuration(),
                     start.toJavaInstant()
                 )
         }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -6,7 +6,7 @@ coroutines = "1.9.0"
 serialization = "1.7.3"
 ktor = "3.0.0"
 kord = "feature-user-apps-20241022.210712-8"
-api = "3.37.13"
+api = "3.37.14"
 ksp = "2.0.21-1.0.25"
 lavakord = "7.1.0"