Fix discord-net#289 and add configureawaits to rest based interactions

quinchs · Nov 21, 2021 · e596312 · e596312
1 parent 7c615cb
commit e596312
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 9 deletions.
diff --git a/src/Discord.Net.Rest/Entities/Interactions/CommandBase/RestCommandBase.cs b/src/Discord.Net.Rest/Entities/Interactions/CommandBase/RestCommandBase.cs
@@ -51,7 +51,7 @@ internal RestCommandBase(DiscordRestClient client, Model model)
 
         internal override async Task UpdateAsync(DiscordRestClient client, Model model)
         {
-            await base.UpdateAsync(client, model);
+            await base.UpdateAsync(client, model).ConfigureAwait(false);
 
             var data = model.Data.IsSpecified
                 ? (DataModel)model.Data.Value

diff --git a/src/Discord.Net.Rest/Entities/Interactions/CommandBase/RestCommandBaseData.cs b/src/Discord.Net.Rest/Entities/Interactions/CommandBase/RestCommandBaseData.cs
@@ -30,7 +30,7 @@ internal RestCommandBaseData(BaseDiscordClient client, Model model)
         internal static async Task<RestCommandBaseData> CreateAsync(DiscordRestClient client, Model model, IGuild guild, IRestMessageChannel channel)
         {
             var entity = new RestCommandBaseData(client, model);
-            await entity.UpdateAsync(client, model, guild, channel);
+            await entity.UpdateAsync(client, model, guild, channel).ConfigureAwait(false);
             return entity;
         }
 

diff --git a/....Net.Rest/Entities/Interactions/ContextMenuCommands/MessageCommands/RestMessageCommand.cs b/....Net.Rest/Entities/Interactions/ContextMenuCommands/MessageCommands/RestMessageCommand.cs
@@ -29,7 +29,7 @@ internal RestMessageCommand(DiscordRestClient client, Model model)
 
         internal override async Task UpdateAsync(DiscordRestClient client, Model model)
         {
-            await base.UpdateAsync(client, model);
+            await base.UpdateAsync(client, model).ConfigureAwait(false);
 
             var dataModel = model.Data.IsSpecified
                 ? (DataModel)model.Data.Value

diff --git a/src/Discord.Net.Rest/Entities/Interactions/MessageComponents/RestMessageComponent.cs b/src/Discord.Net.Rest/Entities/Interactions/MessageComponents/RestMessageComponent.cs
@@ -41,12 +41,12 @@ internal RestMessageComponent(BaseDiscordClient client, Model model)
         internal new static async Task<RestMessageComponent> CreateAsync(DiscordRestClient client, Model model)
         {
             var entity = new RestMessageComponent(client, model);
-            await entity.UpdateAsync(client, model);
+            await entity.UpdateAsync(client, model).ConfigureAwait(false);
             return entity;
         }
         internal override async Task UpdateAsync(DiscordRestClient discord, Model model)
         {
-            await base.UpdateAsync(discord, model);
+            await base.UpdateAsync(discord, model).ConfigureAwait(false);
 
             if (model.Message.IsSpecified && model.ChannelId.IsSpecified)
             {

diff --git a/src/Discord.Net.Rest/Entities/Interactions/SlashCommands/RestSlashCommand.cs b/src/Discord.Net.Rest/Entities/Interactions/SlashCommands/RestSlashCommand.cs
@@ -26,17 +26,19 @@ internal RestSlashCommand(DiscordRestClient client, Model model)
         internal new static async Task<RestSlashCommand> CreateAsync(DiscordRestClient client, Model model)
         {
             var entity = new RestSlashCommand(client, model);
-            await entity.UpdateAsync(client, model);
+            await entity.UpdateAsync(client, model).ConfigureAwait(false);
             return entity;
         }
 
         internal override async Task UpdateAsync(DiscordRestClient client, Model model)
         {
+            await base.UpdateAsync(client, model).ConfigureAwait(false);
+
             var dataModel = model.Data.IsSpecified
                 ? (DataModel)model.Data.Value
                 : null;
 
-            Data = await RestSlashCommandData.CreateAsync(client, dataModel, Guild, Channel);
+            Data = await RestSlashCommandData.CreateAsync(client, dataModel, Guild, Channel).ConfigureAwait(false);
         }
 
         //ISlashCommandInteraction

diff --git a/src/Discord.Net.Rest/Entities/Interactions/SlashCommands/RestSlashCommandData.cs b/src/Discord.Net.Rest/Entities/Interactions/SlashCommands/RestSlashCommandData.cs
@@ -17,12 +17,12 @@ internal RestSlashCommandData(DiscordRestClient client, Model model)
         internal static new async Task<RestSlashCommandData> CreateAsync(DiscordRestClient client, Model model, IGuild guild, IRestMessageChannel channel)
         {
             var entity = new RestSlashCommandData(client, model);
-            await entity.UpdateAsync(client, model, guild, channel);
+            await entity.UpdateAsync(client, model, guild, channel).ConfigureAwait(false);
             return entity;
         }
         internal override async Task UpdateAsync(DiscordRestClient client, Model model, IGuild guild, IRestMessageChannel channel)
         {
-            await base.UpdateAsync(client, model, guild, channel);
+            await base.UpdateAsync(client, model, guild, channel).ConfigureAwait(false);
 
             Options = model.Options.IsSpecified
                 ? model.Options.Value.Select(x => new RestSlashCommandDataOption(this, x)).ToImmutableArray()