Browse Source

fix upstream merge errors

pull/2395/head
Cenngo 2 years ago
parent
commit
0e40c6b5ac
2 changed files with 3 additions and 7 deletions
  1. +1
    -1
      src/Discord.Net.Core/Entities/Interactions/SlashCommands/SlashCommandBuilder.cs
  2. +2
    -6
      src/Discord.Net.Interactions/Utilities/ApplicationCommandRestUtil.cs

+ 1
- 1
src/Discord.Net.Core/Entities/Interactions/SlashCommands/SlashCommandBuilder.cs View File

@@ -556,7 +556,7 @@ namespace Discord
MinValue = MinValue, MinValue = MinValue,
MaxValue = MaxValue, MaxValue = MaxValue,
NameLocalizations = _nameLocalizations, NameLocalizations = _nameLocalizations,
DescriptionLocalizations = _descriptionLocalizations
DescriptionLocalizations = _descriptionLocalizations,
MinLength = MinLength, MinLength = MinLength,
MaxLength = MaxLength, MaxLength = MaxLength,
}; };


+ 2
- 6
src/Discord.Net.Interactions/Utilities/ApplicationCommandRestUtil.cs View File

@@ -30,7 +30,7 @@ namespace Discord.Interactions
MaxValue = parameterInfo.MaxValue, MaxValue = parameterInfo.MaxValue,
MinValue = parameterInfo.MinValue, MinValue = parameterInfo.MinValue,
NameLocalizations = localizationManager?.GetAllNames(parameterPath, LocalizationTarget.Parameter) ?? ImmutableDictionary<string, string>.Empty, NameLocalizations = localizationManager?.GetAllNames(parameterPath, LocalizationTarget.Parameter) ?? ImmutableDictionary<string, string>.Empty,
DescriptionLocalizations = localizationManager?.GetAllDescriptions(parameterPath, LocalizationTarget.Parameter) ?? ImmutableDictionary<string, string>.Empty
DescriptionLocalizations = localizationManager?.GetAllDescriptions(parameterPath, LocalizationTarget.Parameter) ?? ImmutableDictionary<string, string>.Empty,
MinLength = parameterInfo.MinLength, MinLength = parameterInfo.MinLength,
MaxLength = parameterInfo.MaxLength, MaxLength = parameterInfo.MaxLength,
}; };
@@ -269,13 +269,9 @@ namespace Discord.Interactions
}).ToList(), }).ToList(),
Options = commandOption.Options?.Select(x => x.ToApplicationCommandOptionProps()).ToList(), Options = commandOption.Options?.Select(x => x.ToApplicationCommandOptionProps()).ToList(),
NameLocalizations = commandOption.NameLocalizations?.ToImmutableDictionary(), NameLocalizations = commandOption.NameLocalizations?.ToImmutableDictionary(),
DescriptionLocalizations = commandOption.DescriptionLocalizations?.ToImmutableDictionary()
DescriptionLocalizations = commandOption.DescriptionLocalizations?.ToImmutableDictionary(),
MaxLength = commandOption.MaxLength, MaxLength = commandOption.MaxLength,
MinLength = commandOption.MinLength, MinLength = commandOption.MinLength,
MaxValue = commandOption.MaxValue,
MinValue = commandOption.MinValue,
IsAutocomplete = commandOption.IsAutocomplete.GetValueOrDefault(),
ChannelTypes = commandOption.ChannelTypes.ToList(),
}; };


public static Modal ToModal(this ModalInfo modalInfo, string customId, Action<ModalBuilder> modifyModal = null) public static Modal ToModal(this ModalInfo modalInfo, string customId, Action<ModalBuilder> modifyModal = null)


Loading…
Cancel
Save