Browse Source

Fix #289 and add configureawaits to rest based interactions

pull/1923/head
quin lynch 3 years ago
parent
commit
e5963126f1
6 changed files with 11 additions and 9 deletions
  1. +1
    -1
      src/Discord.Net.Rest/Entities/Interactions/CommandBase/RestCommandBase.cs
  2. +1
    -1
      src/Discord.Net.Rest/Entities/Interactions/CommandBase/RestCommandBaseData.cs
  3. +1
    -1
      src/Discord.Net.Rest/Entities/Interactions/ContextMenuCommands/MessageCommands/RestMessageCommand.cs
  4. +2
    -2
      src/Discord.Net.Rest/Entities/Interactions/MessageComponents/RestMessageComponent.cs
  5. +4
    -2
      src/Discord.Net.Rest/Entities/Interactions/SlashCommands/RestSlashCommand.cs
  6. +2
    -2
      src/Discord.Net.Rest/Entities/Interactions/SlashCommands/RestSlashCommandData.cs

+ 1
- 1
src/Discord.Net.Rest/Entities/Interactions/CommandBase/RestCommandBase.cs View File

@@ -51,7 +51,7 @@ namespace Discord.Rest


internal override async Task UpdateAsync(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 var data = model.Data.IsSpecified
? (DataModel)model.Data.Value ? (DataModel)model.Data.Value


+ 1
- 1
src/Discord.Net.Rest/Entities/Interactions/CommandBase/RestCommandBaseData.cs View File

@@ -30,7 +30,7 @@ namespace Discord.Rest
internal static async Task<RestCommandBaseData> CreateAsync(DiscordRestClient client, Model model, IGuild guild, IRestMessageChannel channel) internal static async Task<RestCommandBaseData> CreateAsync(DiscordRestClient client, Model model, IGuild guild, IRestMessageChannel channel)
{ {
var entity = new RestCommandBaseData(client, model); var entity = new RestCommandBaseData(client, model);
await entity.UpdateAsync(client, model, guild, channel);
await entity.UpdateAsync(client, model, guild, channel).ConfigureAwait(false);
return entity; return entity;
} }




+ 1
- 1
src/Discord.Net.Rest/Entities/Interactions/ContextMenuCommands/MessageCommands/RestMessageCommand.cs View File

@@ -29,7 +29,7 @@ namespace Discord.Rest


internal override async Task UpdateAsync(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 var dataModel = model.Data.IsSpecified
? (DataModel)model.Data.Value ? (DataModel)model.Data.Value


+ 2
- 2
src/Discord.Net.Rest/Entities/Interactions/MessageComponents/RestMessageComponent.cs View File

@@ -41,12 +41,12 @@ namespace Discord.Rest
internal new static async Task<RestMessageComponent> CreateAsync(DiscordRestClient client, Model model) internal new static async Task<RestMessageComponent> CreateAsync(DiscordRestClient client, Model model)
{ {
var entity = new RestMessageComponent(client, model); var entity = new RestMessageComponent(client, model);
await entity.UpdateAsync(client, model);
await entity.UpdateAsync(client, model).ConfigureAwait(false);
return entity; return entity;
} }
internal override async Task UpdateAsync(DiscordRestClient discord, Model model) 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) if (model.Message.IsSpecified && model.ChannelId.IsSpecified)
{ {


+ 4
- 2
src/Discord.Net.Rest/Entities/Interactions/SlashCommands/RestSlashCommand.cs View File

@@ -26,17 +26,19 @@ namespace Discord.Rest
internal new static async Task<RestSlashCommand> CreateAsync(DiscordRestClient client, Model model) internal new static async Task<RestSlashCommand> CreateAsync(DiscordRestClient client, Model model)
{ {
var entity = new RestSlashCommand(client, model); var entity = new RestSlashCommand(client, model);
await entity.UpdateAsync(client, model);
await entity.UpdateAsync(client, model).ConfigureAwait(false);
return entity; return entity;
} }


internal override async Task UpdateAsync(DiscordRestClient client, Model model) internal override async Task UpdateAsync(DiscordRestClient client, Model model)
{ {
await base.UpdateAsync(client, model).ConfigureAwait(false);

var dataModel = model.Data.IsSpecified var dataModel = model.Data.IsSpecified
? (DataModel)model.Data.Value ? (DataModel)model.Data.Value
: null; : null;


Data = await RestSlashCommandData.CreateAsync(client, dataModel, Guild, Channel);
Data = await RestSlashCommandData.CreateAsync(client, dataModel, Guild, Channel).ConfigureAwait(false);
} }


//ISlashCommandInteraction //ISlashCommandInteraction


+ 2
- 2
src/Discord.Net.Rest/Entities/Interactions/SlashCommands/RestSlashCommandData.cs View File

@@ -17,12 +17,12 @@ namespace Discord.Rest
internal static new async Task<RestSlashCommandData> CreateAsync(DiscordRestClient client, Model model, IGuild guild, IRestMessageChannel channel) internal static new async Task<RestSlashCommandData> CreateAsync(DiscordRestClient client, Model model, IGuild guild, IRestMessageChannel channel)
{ {
var entity = new RestSlashCommandData(client, model); var entity = new RestSlashCommandData(client, model);
await entity.UpdateAsync(client, model, guild, channel);
await entity.UpdateAsync(client, model, guild, channel).ConfigureAwait(false);
return entity; return entity;
} }
internal override async Task UpdateAsync(DiscordRestClient client, Model model, IGuild guild, IRestMessageChannel channel) 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 Options = model.Options.IsSpecified
? model.Options.Value.Select(x => new RestSlashCommandDataOption(this, x)).ToImmutableArray() ? model.Options.Value.Select(x => new RestSlashCommandDataOption(this, x)).ToImmutableArray()


Loading…
Cancel
Save