Don't add controls to paginated messages multiple times (#24)

nyxx-discord · Nov 7, 2023 · cb0a428 · cb0a428
1 parent ffa5abf
commit cb0a428
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/lib/src/message.dart b/lib/src/message.dart
@@ -8,18 +8,18 @@ extension MessageUtils on Message {
   /// Sends a reply to the message.
   Future<Message> sendReply(MessageBuilder builder) {
     final copiedBuilder = MessageBuilder(
-        allowedMentions: builder.allowedMentions,
-        attachments: builder.attachments,
-        components: builder.components,
-        content: builder.content,
-        embeds: builder.embeds,
-        nonce: builder.nonce,
-        replyId: id,
-        requireReplyToExist: builder.requireReplyToExist,
-        stickerIds: builder.stickerIds,
-        suppressEmbeds: builder.suppressEmbeds,
-        suppressNotifications: builder.suppressNotifications,
-        tts: builder.tts,
+      allowedMentions: builder.allowedMentions,
+      attachments: builder.attachments,
+      components: builder.components,
+      content: builder.content,
+      embeds: builder.embeds,
+      nonce: builder.nonce,
+      replyId: id,
+      requireReplyToExist: builder.requireReplyToExist,
+      stickerIds: builder.stickerIds,
+      suppressEmbeds: builder.suppressEmbeds,
+      suppressNotifications: builder.suppressNotifications,
+      tts: builder.tts,
     );
 
     return channel.sendMessage(copiedBuilder);

diff --git a/lib/src/pagination.dart b/lib/src/pagination.dart
@@ -432,6 +432,12 @@ class _PaginationState {
       throw NyxxException('Cannot add pagination controls to builder: too many component rows');
     }
 
+    final knownIds = {jumpToStartId, jumpToEndId, previousId, nextId};
+    if (builder.components?.any((row) => row.components.any((element) => element is ButtonBuilder && knownIds.contains(element.customId))) == true) {
+      // We've already added controls to this builder, likely when the user navigated to this page previously.
+      return;
+    }
+
     final showJumpToEnds = options?.showJumpToEnds ?? pagination.options.showJumpToEnds ?? true;
     final showPageIndex = options?.showPageIndex ?? pagination.options.showPageIndex ?? true;