fix(interactivity): Fix pagination components being re-wrapped in action rows (#1978)

VelvetToroyashi · web-flow · commit 15f2ce50f17c · 2024-06-30T11:02:19.000+02:00
* fix(interactivity): Fix pagination components being re-wrapped in action rows

* refactor(interactivity): Update variable names
diff --git a/DSharpPlus.Interactivity/InteractivityExtension.cs b/DSharpPlus.Interactivity/InteractivityExtension.cs
@@ -783,9 +783,9 @@ public async Task SendPaginatedMessageAsync(
             .AddEmbed(pageArray[0].Embed)
             .AddComponents(bts.ButtonArray);
 
-        foreach (DiscordActionRowComponent acr in pageArray[0].Components)
+        if (pageArray[0].Components is [..] pac)
         {
-            builder.AddComponents(acr);
+            builder.AddComponents(pac);
         }
 
         DiscordMessage message = await builder.SendAsync(channel);
@@ -947,23 +947,36 @@ public async Task SendPaginatedResponseAsync(DiscordInteraction interaction, boo
 
             buttonArray = [.. buttonList];
         }
+
+        Page[] pageArray = pages.ToArray();
+
         if (asEditResponse)
         {
             DiscordWebhookBuilder builder = new DiscordWebhookBuilder()
-                .WithContent(pages.First().Content)
-                .AddEmbed(pages.First().Embed)
+                .WithContent(pageArray[0].Content)
+                .AddEmbed(pageArray[0].Embed)
                 .AddComponents(buttonArray);
 
+            if (pageArray[0].Components is [..] pageArrayComponents)
+            {
+                builder.AddComponents(pageArrayComponents);
+            }
+
             message = await interaction.EditOriginalResponseAsync(builder);
         }
         else
         {
             DiscordInteractionResponseBuilder builder = new DiscordInteractionResponseBuilder()
-                .WithContent(pages.First().Content)
-                .AddEmbed(pages.First().Embed)
+                .WithContent(pageArray[0].Content)
+                .AddEmbed(pageArray[0].Embed)
                 .AsEphemeral(ephemeral)
                 .AddComponents(buttonArray);
 
+            if (pageArray[0].Components is [..] pageArrayComponents)
+            {
+                builder.AddComponents(pageArrayComponents);
+            }
+
             await interaction.CreateResponseAsync(DiscordInteractionResponseType.ChannelMessageWithSource, builder);
             message = await interaction.GetOriginalResponseAsync();
         }
