fix: changes not out yet

Aiko-IT-Systems · Aug 23, 2024 · d3b0ffe · d3b0ffe
1 parent 347ea9d
commit d3b0ffe
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/DisCatSharp.ApplicationCommands/Context/BaseContext.cs b/DisCatSharp.ApplicationCommands/Context/BaseContext.cs
@@ -120,7 +120,7 @@ internal BaseContext(DisCatSharpCommandType type)
 	/// <param name="type">The type of the response.</param>
 	/// <param name="builder">The data to be sent, if any.</param>
 	/// <returns></returns>
-	public async Task<DiscordMessage> CreateResponseAsync(InteractionResponseType type, DiscordInteractionResponseBuilder? builder = null)
+	public async Task CreateResponseAsync(InteractionResponseType type, DiscordInteractionResponseBuilder? builder = null)
 		=> await this.Interaction.CreateResponseAsync(type, builder);
 
 	/// <summary>

diff --git a/DisCatSharp.Interactivity/Extensions/InteractionExtensions.cs b/DisCatSharp.Interactivity/Extensions/InteractionExtensions.cs
@@ -63,7 +63,8 @@ public static async Task<PaginatedModalResponse> CreatePaginatedModalResponseAsy
 
 			if (previousInteraction.Type is InteractionType.Ping or InteractionType.ModalSubmit)
 			{
-				var originalResponse = await previousInteraction.CreateResponseAsync(InteractionResponseType.ChannelMessageWithSource, b.OpenMessage.AddComponents(b.OpenButton)).ConfigureAwait(false);
+				await previousInteraction.CreateResponseAsync(InteractionResponseType.ChannelMessageWithSource, b.OpenMessage.AddComponents(b.OpenButton)).ConfigureAwait(false);
+				var originalResponse = await previousInteraction.GetOriginalResponseAsync().ConfigureAwait(false);
 				var modalOpen = await interactivity.WaitForButtonAsync(originalResponse, new List<DiscordButtonComponent>
 				{
 					b.OpenButton

diff --git a/DisCatSharp.Interactivity/InteractivityExtension.cs b/DisCatSharp.Interactivity/InteractivityExtension.cs
@@ -822,7 +822,8 @@ public async Task SendPaginatedResponseAsync(DiscordInteraction interaction, boo
 				.AddComponents(bts.ButtonArray);
 			if (ephemeral)
 				builder = builder.AsEphemeral();
-			message = await interaction.CreateResponseAsync(InteractionResponseType.ChannelMessageWithSource, builder).ConfigureAwait(false);
+			await interaction.CreateResponseAsync(InteractionResponseType.ChannelMessageWithSource, builder).ConfigureAwait(false);
+			message = await interaction.GetOriginalResponseAsync().ConfigureAwait(false);
 		}
 
 		var req = new InteractionPaginationRequest(interaction, message, user, bhv, del, bts, pages, token);

diff --git a/DisCatSharp/Entities/Interaction/DiscordInteraction.cs b/DisCatSharp/Entities/Interaction/DiscordInteraction.cs
@@ -145,7 +145,7 @@ public DiscordChannel Channel
 	/// </summary>
 	/// <param name="type">The type of the response.</param>
 	/// <param name="builder">The data, if any, to send.</param>
-	public async Task<DiscordMessage> CreateResponseAsync(InteractionResponseType type, DiscordInteractionResponseBuilder? builder = null)
+	public async Task CreateResponseAsync(InteractionResponseType type, DiscordInteractionResponseBuilder? builder = null)
 		=> await this.Discord.ApiClient.CreateInteractionResponseAsync(this.Id, this.Token, type, builder);
 
 	/// <summary>

diff --git a/DisCatSharp/Net/Rest/DiscordApiClient.cs b/DisCatSharp/Net/Rest/DiscordApiClient.cs
@@ -6884,7 +6884,10 @@ internal async Task<DiscordMessage> CreateInteractionResponseAsync(ulong interac
 
 		try
 		{
-			return DiscordJson.DeserializeObject<DiscordMessage>(response.Response, this.Discord);
+			if (response.ResponseCode is not HttpStatusCode.NoContent && !string.IsNullOrEmpty(response.Response))
+				return DiscordJson.DeserializeObject<DiscordMessage>(response.Response, this.Discord);
+			else
+				return null!;
 		}
 		catch
 		{