Browse Source

Fix non value type options not being included in autocomplete

pull/1923/head
quin lynch 3 years ago
parent
commit
8f9eb07206
2 changed files with 3 additions and 5 deletions
  1. +1
    -1
      src/Discord.Net.WebSocket/DiscordSocketClient.cs
  2. +2
    -4
      src/Discord.Net.WebSocket/Entities/Interaction/Slash Commands/SocketAutocompleteInteractionData.cs

+ 1
- 1
src/Discord.Net.WebSocket/DiscordSocketClient.cs View File

@@ -74,7 +74,7 @@ namespace Discord.WebSocket
internal WebSocketProvider WebSocketProvider { get; private set; } internal WebSocketProvider WebSocketProvider { get; private set; }
internal bool AlwaysDownloadUsers { get; private set; } internal bool AlwaysDownloadUsers { get; private set; }
internal int? HandlerTimeout { get; private set; } internal int? HandlerTimeout { get; private set; }
internal new DiscordSocketApiClient ApiClient => base.ApiClient as DiscordSocketApiClient;
internal new DiscordSocketApiClient ApiClient => base.ApiClient;
/// <inheritdoc /> /// <inheritdoc />
public override IReadOnlyCollection<SocketGuild> Guilds => State.Guilds; public override IReadOnlyCollection<SocketGuild> Guilds => State.Guilds;
/// <inheritdoc/> /// <inheritdoc/>


+ 2
- 4
src/Discord.Net.WebSocket/Entities/Interaction/Slash Commands/SocketAutocompleteInteractionData.cs View File

@@ -60,14 +60,12 @@ namespace Discord.WebSocket
{ {
var options = new List<AutocompleteOption>(); var options = new List<AutocompleteOption>();


options.Add(new AutocompleteOption(model.Type, model.Name, model.Value.GetValueOrDefault(null), model.Focused.GetValueOrDefault(false)));

if (model.Options.IsSpecified) if (model.Options.IsSpecified)
{ {
options.AddRange(model.Options.Value.SelectMany(GetOptions)); options.AddRange(model.Options.Value.SelectMany(GetOptions));
} }
else if(model.Focused.IsSpecified)
{
options.Add(new AutocompleteOption(model.Type, model.Name, model.Value.GetValueOrDefault(null), model.Focused.Value));
}


return options; return options;
} }


Loading…
Cancel
Save