Merge Labs 3.X into dev (#1923)
* meta: bump version * Null or empty fix (#176) * Add components and stickers to ReplyAsync extension * Fixed null or empty * Changed Label to Description * -||- Co-authored-by: quin lynch <lynchquin@gmail.com> * More regions (#177) * Preconditions * ChannelHelper * RestDMChannel * RestGroupChannel * RestBan * RestGroupUser * EntityExtensions * DiscordSocketClient * DiscordSocketClient * Discord.net.core.xml fix (#178) * Changed Label to Description * Added Discord- .MessageComponent .ISticker[] ,Discord.MessageComponent,Discord.ISticker[] to ReplyAsync * Remove references to labs * Update Discord.Net.sln * Added SendMessagesInThreads and StartEmbeddedActivities. (#175) * Added SendMessagesInThreads and StartEmbeddedActivities. Adjusted owner perms. Change UsePublicThreads -> CreatePublicThreads Change UsePrivateThreads -> CreatePrivateThreads * removed extra /// * Added UsePublicThreads and UsePrivateThreads back with Obsolete Attribute * removed 'false' from Obsolete Attribute * Squashed commit of the following: commit dca41a348e36a9b4e7006ef3a76377eb32aad276 Author: quin lynch <lynchquin@gmail.com> Date: Thu Sep 23 07:02:19 2021 -0300 Autocomplete commands * meta: xml. closes #171 * Revert user agent and $device to dnet * meta: bump version * meta: bump vers * Fix sticker args * Grammer fix (#179) * Made IVoiceChannel mentionable * Embeds array for send message async (#181) * meta: bump version * meta: bump vers * Fix sticker args * Grammer fix (#179) * Added embeds for SendMessageAsync * [JsonProperty("embed")] forgot to remove this public Optional<Embed> Embed { get; set; } * It has been done as requested. * Changed the old way of handeling single embeds * Moved embeds param and added options param * xmls Co-authored-by: quin lynch <lynchquin@gmail.com> * Fix thread permissions (#183) * Update GuildPermissionsTests.cs * Update GuildPermissions.cs * Use compound assignment (#186) * Used compound assignment * -||- * -||- * Remove unnecessary suppression (#188) * Inlined variable declarations (#185) * Fixed some warnings (#184) * Fixed some warnings * Another fixed warning * Changed the SSendFileAsync to SendFileAsync * Removed para AlwaysAcknowledgeInteractions * Moved it back to the previous version * Added periods to the end like quin requested!! :(( Co-authored-by: MrCakeSlayer <13650699+MrCakeSlayer@users.noreply.github.com> * Object initialization can be simplified fixed (#189) * Conditional-expression-simplification (#193) * Capitlazation fixes (#192) * Removed-this. (#191) * Use 'switch' expression (#187) * Use 'switch' expression * Reverted it to the old switch case * Fixed-compiler-error (#194) * Submitting updates to include new permissions. (#195) * Submitting updates to include new permissions. * Make old permissions obsolete and update tests Co-authored-by: quin lynch <lynchquin@gmail.com> * Update azure-pipelines.yml * Update azure-pipelines.yml * Update azure-pipelines.yml * Add support for long in autocomplete option * Add support for sending files with multiple embeds (#196) * Add support for sending files with multiple embeds * Simplify prepending single embed to embed array * Consistency for embeds endpoints (#197) * Changed the way of handling prepending of embeds. For consistency. * reformatted the summary * Revert pipeline * Fix duplicate merge conflicts * Changed minimum slash command name length to 1 per Discord API docs (#198) * Channel endpoints requirements correction (#199) * Added some requirements to channels for topic * Changed check from NotNullOrEmpty to NotNullOrEmpty * Added some requirements to channels for name Preconditions.LessThan * Formatting of file * Added restriction for description not being null (#200) * Update azure-pipelines.yml * Update deploy.yml * Remove version tag from proj * Update deploy.yml * Removed versions from project files * Removed style of the nuget badge and added logo (#201) The style was not properly added to it and the plastic version does not look good with the discord badge. I thought it would look better with a logo * Fix Type not being set in SocketApplicationCommand * Remove useless GuildId property * meta: update XML * Add Autocomplete to SlashCommandOptionBuilder * Added autocomplete in SlashCommandOptionBuilder. (#206) Co-authored-by: Quin Lynch <49576606+quinchs@users.noreply.github.com> * Fix duplicate autocomplete * Fix #208 * Fix sub commands being interpreted as a parameter for autocomplete * Fix exposed optional * Support the discord:// protocol in buttons (#207) * Update UrlValidation.cs * Update ComponentBuilder.cs * Add docs and better error messages. * Fix wonky intentation * Add competing activity status type (#205) * Update GuildPermissionsTests.cs * Update GuildPermissions.cs * Add competing status type * Add Icons to IRole (#204) * Added icon field to IRole * Added GetGuildRoleIconUrl() * Added Clean Content Function (#174) * Added Clean Content Function * Fixed Spelling problems and bad var handling * Add StripMarkDown Method * Clean Content Expanded (#212) * Implement CleanContent In IMessage & RestMessage * Update Spelling and Documentation * Add SanatizeMessage to MessageHelper and Refactor Rest and Socket Message * Add event for autocomplete interaction (#214) * Spelling corrections (#215) * Remove null collections * Followup with file async warnings (#216) * Changed from NotNullOrWhitespace to NotNullOrEmpty * Added NotNullOrEmpty on filename * Added system to interpret from the path * Added a check for if it contains a period * It has been done, how ever it will break stuff * Changed to use ??= how ever still added error check * Added space under check * Changed from with a period to valid file extension * Added checks for SendFileAsync * Removed filename != null && * Add channel types in application command options. (#217) * add channel types in application command options * Indent Docs * Stage instance audit logs as well as thread audit log type * Update azure-pipelines.yml * Update azure-pipelines.yml * Fix system messages not including mentioned users. Added ContextMenuCommand message type * Remove file extension check (#218) * Fix NRE in modify guild channel * Fix 429's not being accounted for in ratelimit updates * meta: add net5 framework Co-Authored-By: MrCakeSlayer <13650699+MrCakeSlayer@users.noreply.github.com> * Proper doc logos (#221) * Update GuildPermissionsTests.cs * Update GuildPermissions.cs * Add competing activity status type * logo changes * logo text as path * add missing logo * Update package logo and favicon * Update docfx references * Remove XML files and use original pipeline format * Remove console writeline * Remove Console.WriteLine * Remove useless log * Rename Available sticker field to IsAvailable * Rename Available to IsAvailable in stickers * Add summary indent for role members * Add summary indent to SocketInvite * Rename DefaultPermission to IsDefaultPermission * Rename Default to IsDefault and Required to IsRequired in IApplicationCommandOption * Rename Default and Required to IsDefault and IsRequired in IApplicationCommandOption. Rename DefaultPermission to IsDefaultPermission in IApplicationCommand * Remove extra white spaces * Renamed Joined, Archived, and Locked to HasJoined, IsArchived, and IsLocked * Rename Live and DiscoverableDisabled to IsDiscoverableDisabled and IsLive in IStageChannel * Remove newline * Add indent to summaries * Remove unnecessary json serializer field * Fix ToEntity for roletags incorrectly using IsPremiumSubscriber * Update RestChannel for new channel types * Fix different rest channels not deserializing properly * fully qualify internal for UrlValidation and add indent to summary * Add missing periods to InteractionResponseType * Fix summary in IApplicationCommandOptionChoice * Update IApplicationCommandOption summaries * Update IApplicationCommandInteractionDataOption summaries * Update IApplicationCommandInteractionData summaries * Update IApplicationCommand summaries * Update ApplicationCommandType summaries * rename DefaultPermission to IsDefaultPermission in ApplicationCommandProperties * update ApplicationCommandOptionChoiceProperties summaries * Rename Default, Required, and Autocomplete to IsDefault, IsRequired, and IsAutocomplete in ApplicationCommandOptionProperties * Update SlashCommandProperties summaries * update SlashCommandBuilder boolean field names, summaries, and choice parameters * Update SelectMenuOption summaries, Rename Default to IsDefault in SelectMenuOption * update SelectMenuComponent summaries. Rename Disabled to IsDisabled in SelectMenuComponent * update ComponentBuilder summaries and boolean fields. * Update ButtonComponent summaries and boolean fields * update ActionRowComponent summaries * Update UserCommandBuilder * Update MessageCommandBuilder summaries and boolean properties * Update IGuild summary * Update IGuild summaries * Update StagePrivacyLevel summary * update IThreadChannel summaries * Update IStageChannel summaries * Refactor summaries and boolean property names * General cleanup (#223) * General cleanup * Add Async suffix to SendAutocompleteResult * Fix more formatting * Fix unused RequestOptions in GetActiveThreadsAsync * Add message to ArgumentNullException * Ephemeral attachments * Add missing jsonproperty attribute * Add IMessage.Interaction * Update attachment checks for embed urls * meta: bump version * Remove old package configs and update image * Update package logos * Fix logo reference for azure * Deprecate old package definitions in favor for target file * Deprecate old package definitions in favor for target file Co-authored-by: Jared L <48422312+lhjt@users.noreply.github.com> * Update package ids * Fix url validation * meta: bump version * Fix assignment of UserMentions (#233) * Fix CleanContent (#231) * Fix SocketSlashCommandData access modifier. (#237) Fixes #229 * Update README with better header (#232) * Update README with better header Adds HTML elements that implement the main logo & improve the redirection tag positions. * Resolving border issue in light-mode * Update sponsor section * Implement checks for interaction respond times and multiple interaction responses. closes #236, #235 * Add response check to socket auto complete * meta: bump versions * Fix #239 * meta: bump version * meta: update logo * meta: bump versions * Revert received at time, confirmed by discord staff to be accurate * Merge branch 'release/3.x' of https://github.com/Discord-Net-Labs/Discord.Net-Labs into merger-labs Update requested changes of obsolete and references to labs. Added `Interaction` to `IMessage` Fixed grammar Fixed bugs relating to interactions. * Update docs * Update CHANGELOG.md * meta: docs building * Update docs.yml * Update docs.yml * Fix docfx version * Update docs.yml * Update docs.bat * Rename docs repo for clone * update docfx version * Update docs.bat * Update docfx version * Remove docs from pipeline * FAQ revamped, metadata updated (#241) * FAQ revamped, metadata updated * Update FAQ.md * Update README.md * Docs index improvement * Fix InvalidOperationException in modify channel * feature: guild avatars, closes #238 * feature: modify role icons * meta: changelog * meta: bump version * Update README.md * Fix non value type options not being included in autocomplete * Add new activity flags (#254) * Add new activity flags * Add missing commas * Added support for GUILD_JOIN_REQUEST_DELETE event (#253) Fixes #247 * Adding BotHTTPInteraction user flag (#252) * animated guild banner support (#255) * Docs work (WIP) (#242) * Main page work * Metadata logo dir * More main page edits * Naming change * Dnet guide entries pruned * Add student hub guild directory channel (#256) * animated guild banner support * Add guild directory channel * Fix followup with file overwrite having incorrect parameter locations * Merge labs 3.x * Update GUILD_JOIN_REQUEST_DELETE event * Update head.tmpl.partial * Removed BannerId and AccentColor (#260) * Removed BannerId property, GetBannerURL method, and AccentColor property from IUser and socket entities. * Fixed errors in IUser.cs * Added back summary for GetAvatarUrl method in IUser.cs * Support Guild Boost Progress Bars (#262) * Support Guild Boost Progress Bars * Update SocketChannel.cs * Fix non-optional and unnecessary values. * Spelling * Reordering and consistency. * Remove log for reconnect * Add missing flags to SystemChannelMessageDeny (#267) * Fix labs reference in analyzer project and provider project * Rename new activity flags * Guild feature revamp and smart gateway intent checks * Get thread user implementation * Amend creating slash command guide (#269) * Adding BotHTTPInteraction user flag * Added comments explaining the Global command create stipulations. * Fix numeric type check for options * Add state checking to ConnectionManager.StartAsync (#272) * initial interface changes * Multi file upload + attachment editing * meta: bump versions * Update CHANGELOG.md * Update CHANGELOG.md * Support Min and Max values on ApplicationCommandOptions (#273) * Support Min and Max values on ApplicationCommandOptions * Support decimal min/max values * Docs imrpovments + use ToNullable * Logomark, doc settings edit (#258) * Logomark, doc settings edit * Replace standard logo * Bumping docfx plugins to latest release * Bump version metadata * Logo svg fix * Change default sticker behavior and add AlwaysResolveSticker to the config * Implement rest based interactions. Added ED25519 checks. Updated summaries. * Update package logo * Automatically fix ordering of optional command options (#276) * auto fix optional command option order * clean up indentation * Fix maximum number of Select Menu Options (#282) As of https://discord.com/developers/docs/interactions/message-components#select-menu-object-select-menu-structure the maximum number of options is 25, not less than 25. Hopefully the change catches all necessary locations * Add voice region to modify voice channels * Update summaries on rest interactions * Interaction Specific Interfaces (#283) * added interaction specific interfaces * fix build error * implement change requests * Update application * Add Guild Scheduled Events (#279) * guild events initial * sharded events * Add new gateway intents and fix bugs * More work on new changes to guild events * Update guild scheduled events * Added events to extended guild and add event start event * Update preconditions * Implement breaking changes guild guild events. Add guild event permissions * Update tests and change privacy level requirements * Update summaries and add docs for guild events * meta: bump version * Increment meta version (#285) * Increment meta version * Update docfx.json * Fix #289 and add configureawaits to rest based interactions * meta: bump version * Add GUILD_SCHEDULED_EVENT_USER_ADD and GUILD_SCHEDULED_EVENT_USER_REMOVE (#287) * Remove newline * Fix autocomplete result value * meta: bump versions * Add `GuildScheduledEventUserAdd` and `GuildScheduledEventUserRemove` to sharded client * Make RestUserCommand public (#292) * Fix Components not showing on FUWF (#288) (#293) Adds Components to Payload JSON Generation * Implement smarter rest resolvable interaction data. Fixes #294 * Add UseInteractionSnowflakeDate to config #286 * Implement Better Discord Errors (#291) * Initial error parsing * Implement better errors * Add missing error codes * Add voice disconnect opcodes * Remove unused class, add summaries to discordjsonerror, and remove public constructor of slash command properties * Add error code summary * Update error message summary * Update src/Discord.Net.Core/DiscordJsonError.cs Co-authored-by: Jared L <48422312+lhjt@users.noreply.github.com> * Update src/Discord.Net.WebSocket/API/Voice/VoiceCloseCode.cs Co-authored-by: Jared L <48422312+lhjt@users.noreply.github.com> * Fix autocomplete result value Co-authored-by: Jared L <48422312+lhjt@users.noreply.github.com> * Change the minimum length of slash commands to 1 (#284) * Change the minimum length of slash commands to 1. This is the correct value according to the docs and it has been changed after user feedback. * Fix the limit in 3 other places Co-authored-by: quin lynch <lynchquin@gmail.com> * Add new thread creation properties * Add role emoji. Fixes #295 * Fix mocked text channel * Fix precondition checks. Closes #281 * Initial fix (#297) * meta: bump version * Update from release/3.x * Remove more labs references * Remove doc file for Discord.Net.Analyzers Co-authored-by: Simon Hjorthøj <sh2@live.dk> Co-authored-by: drobbins329 <drobbins329@gmail.com> Co-authored-by: MrCakeSlayer <13650699+MrCakeSlayer@users.noreply.github.com> Co-authored-by: d4n3436 <dan3436@hotmail.com> Co-authored-by: Will <WilliamWelsh@users.noreply.github.com> Co-authored-by: Eugene Garbuzov <kkxo.mail@gmail.com> Co-authored-by: CottageDwellingCat <80918250+CottageDwellingCat@users.noreply.github.com> Co-authored-by: Emily <89871431+emillly-b@users.noreply.github.com> Co-authored-by: marens101 <marens101@gmail.com> Co-authored-by: Jared L <48422312+lhjt@users.noreply.github.com> Co-authored-by: Armano den Boef <68127614+Rozen4334@users.noreply.github.com> Co-authored-by: Bill <billchirico@gmail.com> Co-authored-by: Liege72 <65319395+Liege72@users.noreply.github.com> Co-authored-by: Floowey <floowey@gmx.at> Co-authored-by: Cenk Ergen <57065323+Cenngo@users.noreply.github.com> Co-authored-by: exsersewo <exsersewo@systemexit.co.uk> Co-authored-by: Dennis Fischer <fischer_dennis@live.de>
This commit is contained in:
Quin Lynch
542
src/Discord.Net.Rest/Entities/Interactions/InteractionHelper.cs
Normal file
542
src/Discord.Net.Rest/Entities/Interactions/InteractionHelper.cs
Normal file
@@ -0,0 +1,542 @@
|
||||
using Discord.API;
|
||||
using Discord.API.Rest;
|
||||
using Discord.Net;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Net;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Discord.Rest
|
||||
{
|
||||
internal static class InteractionHelper
|
||||
{
|
||||
public const double ResponseTimeLimit = 3;
|
||||
public const double ResponseAndFollowupLimit = 15;
|
||||
|
||||
#region InteractionHelper
|
||||
public static bool CanSendResponse(IDiscordInteraction interaction)
|
||||
{
|
||||
return (DateTime.UtcNow - interaction.CreatedAt).TotalSeconds < ResponseTimeLimit;
|
||||
}
|
||||
public static bool CanRespondOrFollowup(IDiscordInteraction interaction)
|
||||
{
|
||||
return (DateTime.UtcNow - interaction.CreatedAt).TotalMinutes <= ResponseAndFollowupLimit;
|
||||
}
|
||||
|
||||
public static Task DeleteAllGuildCommandsAsync(BaseDiscordClient client, ulong guildId, RequestOptions options = null)
|
||||
{
|
||||
return client.ApiClient.BulkOverwriteGuildApplicationCommandsAsync(guildId, Array.Empty<CreateApplicationCommandParams>(), options);
|
||||
}
|
||||
|
||||
public static Task DeleteAllGlobalCommandsAsync(BaseDiscordClient client, RequestOptions options = null)
|
||||
{
|
||||
return client.ApiClient.BulkOverwriteGlobalApplicationCommandsAsync(Array.Empty<CreateApplicationCommandParams>(), options);
|
||||
}
|
||||
|
||||
public static Task SendInteractionResponseAsync(BaseDiscordClient client, InteractionResponse response,
|
||||
ulong interactionId, string interactionToken, RequestOptions options = null)
|
||||
{
|
||||
return client.ApiClient.CreateInteractionResponseAsync(response, interactionId, interactionToken, options);
|
||||
}
|
||||
|
||||
public static async Task<RestInteractionMessage> GetOriginalResponseAsync(BaseDiscordClient client, IMessageChannel channel,
|
||||
IDiscordInteraction interaction, RequestOptions options = null)
|
||||
{
|
||||
var model = await client.ApiClient.GetInteractionResponseAsync(interaction.Token, options).ConfigureAwait(false);
|
||||
return RestInteractionMessage.Create(client, model, interaction.Token, channel);
|
||||
}
|
||||
|
||||
public static async Task<RestFollowupMessage> SendFollowupAsync(BaseDiscordClient client, CreateWebhookMessageParams args,
|
||||
string token, IMessageChannel channel, RequestOptions options = null)
|
||||
{
|
||||
var model = await client.ApiClient.CreateInteractionFollowupMessageAsync(args, token, options).ConfigureAwait(false);
|
||||
|
||||
var entity = RestFollowupMessage.Create(client, model, token, channel);
|
||||
return entity;
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Global commands
|
||||
public static async Task<RestGlobalCommand> GetGlobalCommandAsync(BaseDiscordClient client, ulong id,
|
||||
RequestOptions options = null)
|
||||
{
|
||||
var model = await client.ApiClient.GetGlobalApplicationCommandAsync(id, options).ConfigureAwait(false);
|
||||
|
||||
return RestGlobalCommand.Create(client, model);
|
||||
}
|
||||
public static Task<ApplicationCommand> CreateGlobalCommandAsync<TArg>(BaseDiscordClient client,
|
||||
Action<TArg> func, RequestOptions options = null) where TArg : ApplicationCommandProperties
|
||||
{
|
||||
var args = Activator.CreateInstance(typeof(TArg));
|
||||
func((TArg)args);
|
||||
return CreateGlobalCommandAsync(client, (TArg)args, options);
|
||||
}
|
||||
public static async Task<ApplicationCommand> CreateGlobalCommandAsync(BaseDiscordClient client,
|
||||
ApplicationCommandProperties arg, RequestOptions options = null)
|
||||
{
|
||||
Preconditions.NotNullOrEmpty(arg.Name, nameof(arg.Name));
|
||||
|
||||
var model = new CreateApplicationCommandParams
|
||||
{
|
||||
Name = arg.Name.Value,
|
||||
Type = arg.Type,
|
||||
DefaultPermission = arg.IsDefaultPermission.IsSpecified
|
||||
? arg.IsDefaultPermission.Value
|
||||
: Optional<bool>.Unspecified
|
||||
};
|
||||
|
||||
if (arg is SlashCommandProperties slashProps)
|
||||
{
|
||||
Preconditions.NotNullOrEmpty(slashProps.Description, nameof(slashProps.Description));
|
||||
|
||||
model.Description = slashProps.Description.Value;
|
||||
|
||||
model.Options = slashProps.Options.IsSpecified
|
||||
? slashProps.Options.Value.Select(x => new ApplicationCommandOption(x)).ToArray()
|
||||
: Optional<ApplicationCommandOption[]>.Unspecified;
|
||||
}
|
||||
|
||||
return await client.ApiClient.CreateGlobalApplicationCommandAsync(model, options).ConfigureAwait(false);
|
||||
}
|
||||
|
||||
public static async Task<ApplicationCommand[]> BulkOverwriteGlobalCommandsAsync(BaseDiscordClient client,
|
||||
ApplicationCommandProperties[] args, RequestOptions options = null)
|
||||
{
|
||||
Preconditions.NotNull(args, nameof(args));
|
||||
|
||||
var models = new List<CreateApplicationCommandParams>();
|
||||
|
||||
foreach (var arg in args)
|
||||
{
|
||||
Preconditions.NotNullOrEmpty(arg.Name, nameof(arg.Name));
|
||||
|
||||
var model = new CreateApplicationCommandParams
|
||||
{
|
||||
Name = arg.Name.Value,
|
||||
Type = arg.Type,
|
||||
DefaultPermission = arg.IsDefaultPermission.IsSpecified
|
||||
? arg.IsDefaultPermission.Value
|
||||
: Optional<bool>.Unspecified
|
||||
};
|
||||
|
||||
if (arg is SlashCommandProperties slashProps)
|
||||
{
|
||||
Preconditions.NotNullOrEmpty(slashProps.Description, nameof(slashProps.Description));
|
||||
|
||||
model.Description = slashProps.Description.Value;
|
||||
|
||||
model.Options = slashProps.Options.IsSpecified
|
||||
? slashProps.Options.Value.Select(x => new ApplicationCommandOption(x)).ToArray()
|
||||
: Optional<ApplicationCommandOption[]>.Unspecified;
|
||||
}
|
||||
|
||||
models.Add(model);
|
||||
}
|
||||
|
||||
return await client.ApiClient.BulkOverwriteGlobalApplicationCommandsAsync(models.ToArray(), options).ConfigureAwait(false);
|
||||
}
|
||||
|
||||
public static async Task<IReadOnlyCollection<ApplicationCommand>> BulkOverwriteGuildCommandsAsync(BaseDiscordClient client, ulong guildId,
|
||||
ApplicationCommandProperties[] args, RequestOptions options = null)
|
||||
{
|
||||
Preconditions.NotNull(args, nameof(args));
|
||||
|
||||
var models = new List<CreateApplicationCommandParams>();
|
||||
|
||||
foreach (var arg in args)
|
||||
{
|
||||
Preconditions.NotNullOrEmpty(arg.Name, nameof(arg.Name));
|
||||
|
||||
var model = new CreateApplicationCommandParams
|
||||
{
|
||||
Name = arg.Name.Value,
|
||||
Type = arg.Type,
|
||||
DefaultPermission = arg.IsDefaultPermission.IsSpecified
|
||||
? arg.IsDefaultPermission.Value
|
||||
: Optional<bool>.Unspecified
|
||||
};
|
||||
|
||||
if (arg is SlashCommandProperties slashProps)
|
||||
{
|
||||
Preconditions.NotNullOrEmpty(slashProps.Description, nameof(slashProps.Description));
|
||||
|
||||
model.Description = slashProps.Description.Value;
|
||||
|
||||
model.Options = slashProps.Options.IsSpecified
|
||||
? slashProps.Options.Value.Select(x => new ApplicationCommandOption(x)).ToArray()
|
||||
: Optional<ApplicationCommandOption[]>.Unspecified;
|
||||
}
|
||||
|
||||
models.Add(model);
|
||||
}
|
||||
|
||||
return await client.ApiClient.BulkOverwriteGuildApplicationCommandsAsync(guildId, models.ToArray(), options).ConfigureAwait(false);
|
||||
}
|
||||
|
||||
private static TArg GetApplicationCommandProperties<TArg>(IApplicationCommand command)
|
||||
where TArg : ApplicationCommandProperties
|
||||
{
|
||||
bool isBaseClass = typeof(TArg) == typeof(ApplicationCommandProperties);
|
||||
|
||||
switch (true)
|
||||
{
|
||||
case true when (typeof(TArg) == typeof(SlashCommandProperties) || isBaseClass) && command.Type == ApplicationCommandType.Slash:
|
||||
return new SlashCommandProperties() as TArg;
|
||||
case true when (typeof(TArg) == typeof(MessageCommandProperties) || isBaseClass) && command.Type == ApplicationCommandType.Message:
|
||||
return new MessageCommandProperties() as TArg;
|
||||
case true when (typeof(TArg) == typeof(UserCommandProperties) || isBaseClass) && command.Type == ApplicationCommandType.User:
|
||||
return new UserCommandProperties() as TArg;
|
||||
default:
|
||||
throw new InvalidOperationException($"Cannot modify application command of type {command.Type} with the parameter type {typeof(TArg).FullName}");
|
||||
}
|
||||
}
|
||||
|
||||
public static Task<ApplicationCommand> ModifyGlobalCommandAsync<TArg>(BaseDiscordClient client, IApplicationCommand command,
|
||||
Action<TArg> func, RequestOptions options = null) where TArg : ApplicationCommandProperties
|
||||
{
|
||||
var arg = GetApplicationCommandProperties<TArg>(command);
|
||||
func(arg);
|
||||
return ModifyGlobalCommandAsync(client, command, arg, options);
|
||||
}
|
||||
|
||||
public static async Task<ApplicationCommand> ModifyGlobalCommandAsync(BaseDiscordClient client, IApplicationCommand command,
|
||||
ApplicationCommandProperties args, RequestOptions options = null)
|
||||
{
|
||||
if (args.Name.IsSpecified)
|
||||
{
|
||||
Preconditions.AtMost(args.Name.Value.Length, 32, nameof(args.Name));
|
||||
Preconditions.AtLeast(args.Name.Value.Length, 1, nameof(args.Name));
|
||||
}
|
||||
|
||||
var model = new ModifyApplicationCommandParams
|
||||
{
|
||||
Name = args.Name,
|
||||
DefaultPermission = args.IsDefaultPermission.IsSpecified
|
||||
? args.IsDefaultPermission.Value
|
||||
: Optional<bool>.Unspecified
|
||||
};
|
||||
|
||||
if (args is SlashCommandProperties slashProps)
|
||||
{
|
||||
if (slashProps.Description.IsSpecified)
|
||||
{
|
||||
Preconditions.AtMost(slashProps.Description.Value.Length, 100, nameof(slashProps.Description));
|
||||
Preconditions.AtLeast(slashProps.Description.Value.Length, 1, nameof(slashProps.Description));
|
||||
}
|
||||
|
||||
if (slashProps.Options.IsSpecified)
|
||||
{
|
||||
if (slashProps.Options.Value.Count > 10)
|
||||
throw new ArgumentException("Option count must be 10 or less");
|
||||
}
|
||||
|
||||
model.Description = slashProps.Description;
|
||||
|
||||
model.Options = slashProps.Options.IsSpecified
|
||||
? slashProps.Options.Value.Select(x => new ApplicationCommandOption(x)).ToArray()
|
||||
: Optional<ApplicationCommandOption[]>.Unspecified;
|
||||
}
|
||||
|
||||
return await client.ApiClient.ModifyGlobalApplicationCommandAsync(model, command.Id, options).ConfigureAwait(false);
|
||||
}
|
||||
|
||||
public static async Task DeleteGlobalCommandAsync(BaseDiscordClient client, IApplicationCommand command, RequestOptions options = null)
|
||||
{
|
||||
Preconditions.NotNull(command, nameof(command));
|
||||
Preconditions.NotEqual(command.Id, 0, nameof(command.Id));
|
||||
|
||||
await client.ApiClient.DeleteGlobalApplicationCommandAsync(command.Id, options).ConfigureAwait(false);
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Guild Commands
|
||||
public static Task<ApplicationCommand> CreateGuildCommandAsync<TArg>(BaseDiscordClient client, ulong guildId,
|
||||
Action<TArg> func, RequestOptions options) where TArg : ApplicationCommandProperties
|
||||
{
|
||||
var args = Activator.CreateInstance(typeof(TArg));
|
||||
func((TArg)args);
|
||||
return CreateGuildCommandAsync(client, guildId, (TArg)args, options);
|
||||
}
|
||||
|
||||
public static async Task<ApplicationCommand> CreateGuildCommandAsync(BaseDiscordClient client, ulong guildId,
|
||||
ApplicationCommandProperties arg, RequestOptions options = null)
|
||||
{
|
||||
var model = new CreateApplicationCommandParams
|
||||
{
|
||||
Name = arg.Name.Value,
|
||||
Type = arg.Type,
|
||||
DefaultPermission = arg.IsDefaultPermission.IsSpecified
|
||||
? arg.IsDefaultPermission.Value
|
||||
: Optional<bool>.Unspecified
|
||||
};
|
||||
|
||||
if (arg is SlashCommandProperties slashProps)
|
||||
{
|
||||
Preconditions.NotNullOrEmpty(slashProps.Description, nameof(slashProps.Description));
|
||||
|
||||
model.Description = slashProps.Description.Value;
|
||||
|
||||
model.Options = slashProps.Options.IsSpecified
|
||||
? slashProps.Options.Value.Select(x => new ApplicationCommandOption(x)).ToArray()
|
||||
: Optional<ApplicationCommandOption[]>.Unspecified;
|
||||
}
|
||||
|
||||
return await client.ApiClient.CreateGuildApplicationCommandAsync(model, guildId, options).ConfigureAwait(false);
|
||||
}
|
||||
|
||||
public static Task<ApplicationCommand> ModifyGuildCommandAsync<TArg>(BaseDiscordClient client, IApplicationCommand command, ulong guildId,
|
||||
Action<TArg> func, RequestOptions options = null) where TArg : ApplicationCommandProperties
|
||||
{
|
||||
var arg = GetApplicationCommandProperties<TArg>(command);
|
||||
func(arg);
|
||||
return ModifyGuildCommandAsync(client, command, guildId, arg, options);
|
||||
}
|
||||
|
||||
public static async Task<ApplicationCommand> ModifyGuildCommandAsync(BaseDiscordClient client, IApplicationCommand command, ulong guildId,
|
||||
ApplicationCommandProperties arg, RequestOptions options = null)
|
||||
{
|
||||
var model = new ModifyApplicationCommandParams
|
||||
{
|
||||
Name = arg.Name,
|
||||
DefaultPermission = arg.IsDefaultPermission.IsSpecified
|
||||
? arg.IsDefaultPermission.Value
|
||||
: Optional<bool>.Unspecified
|
||||
};
|
||||
|
||||
if (arg is SlashCommandProperties slashProps)
|
||||
{
|
||||
Preconditions.NotNullOrEmpty(slashProps.Description, nameof(slashProps.Description));
|
||||
|
||||
model.Description = slashProps.Description.Value;
|
||||
|
||||
model.Options = slashProps.Options.IsSpecified
|
||||
? slashProps.Options.Value.Select(x => new ApplicationCommandOption(x)).ToArray()
|
||||
: Optional<ApplicationCommandOption[]>.Unspecified;
|
||||
}
|
||||
|
||||
return await client.ApiClient.ModifyGuildApplicationCommandAsync(model, guildId, command.Id, options).ConfigureAwait(false);
|
||||
}
|
||||
|
||||
public static async Task DeleteGuildCommandAsync(BaseDiscordClient client, ulong guildId, IApplicationCommand command, RequestOptions options = null)
|
||||
{
|
||||
Preconditions.NotNull(command, nameof(command));
|
||||
Preconditions.NotEqual(command.Id, 0, nameof(command.Id));
|
||||
|
||||
await client.ApiClient.DeleteGuildApplicationCommandAsync(guildId, command.Id, options).ConfigureAwait(false);
|
||||
}
|
||||
|
||||
public static Task DeleteUnknownApplicationCommandAsync(BaseDiscordClient client, ulong? guildId, IApplicationCommand command, RequestOptions options = null)
|
||||
{
|
||||
return guildId.HasValue
|
||||
? DeleteGuildCommandAsync(client, guildId.Value, command, options)
|
||||
: DeleteGlobalCommandAsync(client, command, options);
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Responses
|
||||
public static async Task<Message> ModifyFollowupMessageAsync(BaseDiscordClient client, RestFollowupMessage message, Action<MessageProperties> func,
|
||||
RequestOptions options = null)
|
||||
{
|
||||
var args = new MessageProperties();
|
||||
func(args);
|
||||
|
||||
var embed = args.Embed;
|
||||
var embeds = args.Embeds;
|
||||
|
||||
bool hasText = args.Content.IsSpecified ? !string.IsNullOrEmpty(args.Content.Value) : !string.IsNullOrEmpty(message.Content);
|
||||
bool hasEmbeds = embed.IsSpecified && embed.Value != null || embeds.IsSpecified && embeds.Value?.Length > 0 || message.Embeds.Any();
|
||||
bool hasComponents = args.Components.IsSpecified && args.Components.Value != null;
|
||||
|
||||
if (!hasComponents && !hasText && !hasEmbeds)
|
||||
Preconditions.NotNullOrEmpty(args.Content.IsSpecified ? args.Content.Value : string.Empty, nameof(args.Content));
|
||||
|
||||
var apiEmbeds = embed.IsSpecified || embeds.IsSpecified ? new List<API.Embed>() : null;
|
||||
|
||||
if (embed.IsSpecified && embed.Value != null)
|
||||
{
|
||||
apiEmbeds.Add(embed.Value.ToModel());
|
||||
}
|
||||
|
||||
if (embeds.IsSpecified && embeds.Value != null)
|
||||
{
|
||||
apiEmbeds.AddRange(embeds.Value.Select(x => x.ToModel()));
|
||||
}
|
||||
|
||||
Preconditions.AtMost(apiEmbeds?.Count ?? 0, 10, nameof(args.Embeds), "A max of 10 embeds are allowed.");
|
||||
|
||||
var apiArgs = new ModifyInteractionResponseParams
|
||||
{
|
||||
Content = args.Content,
|
||||
Embeds = apiEmbeds?.ToArray() ?? Optional<API.Embed[]>.Unspecified,
|
||||
AllowedMentions = args.AllowedMentions.IsSpecified ? args.AllowedMentions.Value.ToModel() : Optional<API.AllowedMentions>.Unspecified,
|
||||
Components = args.Components.IsSpecified ? args.Components.Value?.Components.Select(x => new API.ActionRowComponent(x)).ToArray() : Optional<API.ActionRowComponent[]>.Unspecified
|
||||
};
|
||||
|
||||
return await client.ApiClient.ModifyInteractionFollowupMessageAsync(apiArgs, message.Id, message.Token, options).ConfigureAwait(false);
|
||||
}
|
||||
public static async Task DeleteFollowupMessageAsync(BaseDiscordClient client, RestFollowupMessage message, RequestOptions options = null)
|
||||
=> await client.ApiClient.DeleteInteractionFollowupMessageAsync(message.Id, message.Token, options);
|
||||
public static async Task<Message> ModifyInteractionResponseAsync(BaseDiscordClient client, string token, Action<MessageProperties> func,
|
||||
RequestOptions options = null)
|
||||
{
|
||||
var args = new MessageProperties();
|
||||
func(args);
|
||||
|
||||
var embed = args.Embed;
|
||||
var embeds = args.Embeds;
|
||||
|
||||
bool hasText = !string.IsNullOrEmpty(args.Content.GetValueOrDefault());
|
||||
bool hasEmbeds = embed.IsSpecified && embed.Value != null || embeds.IsSpecified && embeds.Value?.Length > 0;
|
||||
bool hasComponents = args.Components.IsSpecified && args.Components.Value != null;
|
||||
|
||||
if (!hasComponents && !hasText && !hasEmbeds)
|
||||
Preconditions.NotNullOrEmpty(args.Content.IsSpecified ? args.Content.Value : string.Empty, nameof(args.Content));
|
||||
|
||||
var apiEmbeds = embed.IsSpecified || embeds.IsSpecified ? new List<API.Embed>() : null;
|
||||
|
||||
if (embed.IsSpecified && embed.Value != null)
|
||||
{
|
||||
apiEmbeds.Add(embed.Value.ToModel());
|
||||
}
|
||||
|
||||
if (embeds.IsSpecified && embeds.Value != null)
|
||||
{
|
||||
apiEmbeds.AddRange(embeds.Value.Select(x => x.ToModel()));
|
||||
}
|
||||
|
||||
Preconditions.AtMost(apiEmbeds?.Count ?? 0, 10, nameof(args.Embeds), "A max of 10 embeds are allowed.");
|
||||
|
||||
var apiArgs = new ModifyInteractionResponseParams
|
||||
{
|
||||
Content = args.Content,
|
||||
Embeds = apiEmbeds?.ToArray() ?? Optional<API.Embed[]>.Unspecified,
|
||||
AllowedMentions = args.AllowedMentions.IsSpecified ? args.AllowedMentions.Value?.ToModel() : Optional<API.AllowedMentions>.Unspecified,
|
||||
Components = args.Components.IsSpecified ? args.Components.Value?.Components.Select(x => new API.ActionRowComponent(x)).ToArray() : Optional<API.ActionRowComponent[]>.Unspecified,
|
||||
Flags = args.Flags
|
||||
};
|
||||
|
||||
return await client.ApiClient.ModifyInteractionResponseAsync(apiArgs, token, options).ConfigureAwait(false);
|
||||
}
|
||||
|
||||
public static async Task DeleteInteractionResponseAsync(BaseDiscordClient client, RestInteractionMessage message, RequestOptions options = null)
|
||||
=> await client.ApiClient.DeleteInteractionFollowupMessageAsync(message.Id, message.Token, options);
|
||||
|
||||
public static Task SendAutocompleteResultAsync(BaseDiscordClient client, IEnumerable<AutocompleteResult> result, ulong interactionId,
|
||||
string interactionToken, RequestOptions options)
|
||||
{
|
||||
result ??= Array.Empty<AutocompleteResult>();
|
||||
|
||||
Preconditions.AtMost(result.Count(), 20, nameof(result), "A maximum of 20 choices are allowed!");
|
||||
|
||||
var apiArgs = new InteractionResponse
|
||||
{
|
||||
Type = InteractionResponseType.ApplicationCommandAutocompleteResult,
|
||||
Data = new InteractionCallbackData
|
||||
{
|
||||
Choices = result.Any()
|
||||
? result.Select(x => new ApplicationCommandOptionChoice { Name = x.Name, Value = x.Value }).ToArray()
|
||||
: Array.Empty<ApplicationCommandOptionChoice>()
|
||||
}
|
||||
};
|
||||
|
||||
return client.ApiClient.CreateInteractionResponseAsync(apiArgs, interactionId, interactionToken, options);
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Guild permissions
|
||||
public static async Task<IReadOnlyCollection<GuildApplicationCommandPermission>> GetGuildCommandPermissionsAsync(BaseDiscordClient client,
|
||||
ulong guildId, RequestOptions options)
|
||||
{
|
||||
var models = await client.ApiClient.GetGuildApplicationCommandPermissionsAsync(guildId, options);
|
||||
return models.Select(x =>
|
||||
new GuildApplicationCommandPermission(x.Id, x.ApplicationId, guildId, x.Permissions.Select(
|
||||
y => new ApplicationCommandPermission(y.Id, y.Type, y.Permission))
|
||||
.ToArray())
|
||||
).ToArray();
|
||||
}
|
||||
|
||||
public static async Task<GuildApplicationCommandPermission> GetGuildCommandPermissionAsync(BaseDiscordClient client,
|
||||
ulong guildId, ulong commandId, RequestOptions options)
|
||||
{
|
||||
try
|
||||
{
|
||||
var model = await client.ApiClient.GetGuildApplicationCommandPermissionAsync(guildId, commandId, options);
|
||||
return new GuildApplicationCommandPermission(model.Id, model.ApplicationId, guildId, model.Permissions.Select(
|
||||
y => new ApplicationCommandPermission(y.Id, y.Type, y.Permission)).ToArray());
|
||||
}
|
||||
catch (HttpException x)
|
||||
{
|
||||
if (x.HttpCode == HttpStatusCode.NotFound)
|
||||
return null;
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
public static async Task<GuildApplicationCommandPermission> ModifyGuildCommandPermissionsAsync(BaseDiscordClient client, ulong guildId, ulong commandId,
|
||||
ApplicationCommandPermission[] args, RequestOptions options)
|
||||
{
|
||||
Preconditions.NotNull(args, nameof(args));
|
||||
Preconditions.AtMost(args.Length, 10, nameof(args));
|
||||
Preconditions.AtLeast(args.Length, 0, nameof(args));
|
||||
|
||||
var permissionsList = new List<ApplicationCommandPermissions>();
|
||||
|
||||
foreach (var arg in args)
|
||||
{
|
||||
var permissions = new ApplicationCommandPermissions
|
||||
{
|
||||
Id = arg.TargetId,
|
||||
Permission = arg.Permission,
|
||||
Type = arg.TargetType
|
||||
};
|
||||
|
||||
permissionsList.Add(permissions);
|
||||
}
|
||||
|
||||
var model = new ModifyGuildApplicationCommandPermissionsParams
|
||||
{
|
||||
Permissions = permissionsList.ToArray()
|
||||
};
|
||||
|
||||
var apiModel = await client.ApiClient.ModifyApplicationCommandPermissionsAsync(model, guildId, commandId, options);
|
||||
|
||||
return new GuildApplicationCommandPermission(apiModel.Id, apiModel.ApplicationId, guildId, apiModel.Permissions.Select(
|
||||
x => new ApplicationCommandPermission(x.Id, x.Type, x.Permission)).ToArray());
|
||||
}
|
||||
|
||||
public static async Task<IReadOnlyCollection<GuildApplicationCommandPermission>> BatchEditGuildCommandPermissionsAsync(BaseDiscordClient client, ulong guildId,
|
||||
IDictionary<ulong, ApplicationCommandPermission[]> args, RequestOptions options)
|
||||
{
|
||||
Preconditions.NotNull(args, nameof(args));
|
||||
Preconditions.NotEqual(args.Count, 0, nameof(args));
|
||||
|
||||
var models = new List<ModifyGuildApplicationCommandPermissions>();
|
||||
|
||||
foreach (var arg in args)
|
||||
{
|
||||
Preconditions.AtMost(arg.Value.Length, 10, nameof(args));
|
||||
|
||||
var model = new ModifyGuildApplicationCommandPermissions
|
||||
{
|
||||
Id = arg.Key,
|
||||
Permissions = arg.Value.Select(x => new ApplicationCommandPermissions
|
||||
{
|
||||
Id = x.TargetId,
|
||||
Permission = x.Permission,
|
||||
Type = x.TargetType
|
||||
}).ToArray()
|
||||
};
|
||||
|
||||
models.Add(model);
|
||||
}
|
||||
|
||||
var apiModels = await client.ApiClient.BatchModifyApplicationCommandPermissionsAsync(models.ToArray(), guildId, options);
|
||||
|
||||
return apiModels.Select(
|
||||
x => new GuildApplicationCommandPermission(x.Id, x.ApplicationId, x.GuildId, x.Permissions.Select(
|
||||
y => new ApplicationCommandPermission(y.Id, y.Type, y.Permission)).ToArray())).ToArray();
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user