Fix paginator timeout, German supported lang name

Kord-Extensions · Jul 2, 2021 · b6064d0 · b6064d0
1 parent 2e7a1d7
commit b6064d0
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/kord-extensions/src/main/kotlin/com/kotlindiscord/kord/extensions/i18n/SupportedLocales.kt b/kord-extensions/src/main/kotlin/com/kotlindiscord/kord/extensions/i18n/SupportedLocales.kt
@@ -42,7 +42,7 @@ public object SupportedLocales {
         "fr" to FRENCH,
         "fr_fr" to FRENCH,
 
-        "deutsche" to GERMAN,
+        "deutsch" to GERMAN,
         "german" to GERMAN,
         "de" to GERMAN,
         "de_de" to GERMAN,

diff --git a/...sions/src/main/kotlin/com/kotlindiscord/kord/extensions/pagination/BaseButtonPaginator.kt b/...sions/src/main/kotlin/com/kotlindiscord/kord/extensions/pagination/BaseButtonPaginator.kt
@@ -80,6 +80,8 @@ public abstract class BaseButtonPaginator(
                 style = ButtonStyle.Secondary
 
                 check(defaultCheck)
+                check { active }
+
                 emoji(FIRST_PAGE_EMOJI)
 
                 action {
@@ -94,6 +96,8 @@ public abstract class BaseButtonPaginator(
                 style = ButtonStyle.Secondary
 
                 check(defaultCheck)
+                check { active }
+
                 emoji(LEFT_EMOJI)
 
                 action {
@@ -108,6 +112,8 @@ public abstract class BaseButtonPaginator(
                 style = ButtonStyle.Secondary
 
                 check(defaultCheck)
+                check { active }
+
                 emoji(RIGHT_EMOJI)
 
                 action {
@@ -122,6 +128,8 @@ public abstract class BaseButtonPaginator(
                 style = ButtonStyle.Secondary
 
                 check(defaultCheck)
+                check { active }
+
                 emoji(LAST_PAGE_EMOJI)
 
                 action {
@@ -138,6 +146,7 @@ public abstract class BaseButtonPaginator(
                 deferredAck = true
 
                 check(defaultCheck)
+                check { active }
 
                 label = if (keepEmbed) {
                     style = ButtonStyle.Primary
@@ -168,6 +177,7 @@ public abstract class BaseButtonPaginator(
                         style = ButtonStyle.Secondary
 
                         check(defaultCheck)
+                        check { active }
 
                         action {
                             switchGroup(group)
@@ -181,6 +191,8 @@ public abstract class BaseButtonPaginator(
                     deferredAck = true
 
                     check(defaultCheck)
+                    check { active }
+
                     emoji(switchEmoji)
 
                     label = if (allGroups.size == 2) {

diff --git a/...rc/main/kotlin/com/kotlindiscord/kord/extensions/pagination/InteractionButtonPaginator.kt b/...rc/main/kotlin/com/kotlindiscord/kord/extensions/pagination/InteractionButtonPaginator.kt
@@ -76,7 +76,6 @@ public class InteractionButtonPaginator(
         }
 
         active = false
-        components.stop()
 
         if (!keepEmbed) {
             embedInteraction!!.delete()
@@ -89,6 +88,7 @@ public class InteractionButtonPaginator(
         }
 
         runTimeoutCallbacks()
+        components.stop()
     }
 }
 

diff --git a/...ns/src/main/kotlin/com/kotlindiscord/kord/extensions/pagination/MessageButtonPaginator.kt b/...ns/src/main/kotlin/com/kotlindiscord/kord/extensions/pagination/MessageButtonPaginator.kt
@@ -85,7 +85,6 @@ public class MessageButtonPaginator(
         }
 
         active = false
-        components.stop()
 
         if (!keepEmbed) {
             message!!.delete()
@@ -99,6 +98,7 @@ public class MessageButtonPaginator(
         }
 
         runTimeoutCallbacks()
+        components.stop()
     }
 }
 

diff --git a/kord-extensions/src/test/kotlin/com/kotlindiscord/kord/extensions/test/bot/Bot.kt b/kord-extensions/src/test/kotlin/com/kotlindiscord/kord/extensions/test/bot/Bot.kt
@@ -31,10 +31,7 @@ suspend fun main() {
             add(::TestExtension)
 
             help {
-                deleteInvocationOnPaginatorTimeout = true
-                deletePaginatorOnTimeout = true
-
-                paginatorTimeout = 5_000L
+                paginatorTimeout = 5
             }
         }
     }