diff --git a/DisCatSharp.ApplicationCommands/ApplicationCommandsExtension.cs b/DisCatSharp.ApplicationCommands/ApplicationCommandsExtension.cs index 3bfdcf8702..54efefa0ed 100644 --- a/DisCatSharp.ApplicationCommands/ApplicationCommandsExtension.cs +++ b/DisCatSharp.ApplicationCommands/ApplicationCommandsExtension.cs @@ -737,14 +737,12 @@ private async Task RegisterCommands(List if (cs.Count is not 0) //translation.AddRange(cs.Select(c => JsonConvert.DeserializeObject(JsonConvert.SerializeObject(c))!)); - { foreach (var c in cs) { var json = JsonConvert.SerializeObject(c); var obj = JsonConvert.DeserializeObject(json); translation.Add(obj!); } - } } } diff --git a/DisCatSharp.Tools/DisCatSharp.Analyzer/DisCatSharp.Analyzer/AttributeAnalyzer.cs b/DisCatSharp.Tools/DisCatSharp.Analyzer/DisCatSharp.Analyzer/AttributeAnalyzer.cs index 6caad2ea5d..e22eb7ff38 100644 --- a/DisCatSharp.Tools/DisCatSharp.Analyzer/DisCatSharp.Analyzer/AttributeAnalyzer.cs +++ b/DisCatSharp.Tools/DisCatSharp.Analyzer/DisCatSharp.Analyzer/AttributeAnalyzer.cs @@ -192,7 +192,7 @@ private static void StatusAnalyzer(SyntaxNodeAnalysisContext context) context.ReportDiagnostic(Diagnostic.Create(s_requiresFeatureRule, invocation.GetLocation(), kind, name, message)); } } - catch(Exception ex) + catch (Exception ex) { Console.WriteLine($"StatusAnalyzer threw an exception: {ex.Message}"); if (!string.IsNullOrEmpty(ex.StackTrace)) @@ -211,8 +211,8 @@ private static void ExperimentalAnalyzer(SymbolAnalysisContext context) try { var syntaxTrees = from x in context.Symbol.Locations - where x.IsInSource - select x.SourceTree; + where x.IsInSource + select x.SourceTree; var declaration = context.Symbol; // ReSharper disable HeuristicUnreachableCode @@ -281,7 +281,7 @@ where x.IsInSource context.ReportDiagnostic(Diagnostic.Create(s_requiresFeatureRule, context.Symbol.Locations.FirstOrDefault(x => x.IsInSource), kind, name, message)); } } - catch(Exception ex) + catch (Exception ex) { Console.WriteLine($"StatusAnalyzer threw an exception: {ex.Message}"); if (!string.IsNullOrEmpty(ex.StackTrace)) diff --git a/DisCatSharp/Clients/DiscordClient.Events.cs b/DisCatSharp/Clients/DiscordClient.Events.cs index f2ebca9f06..202cd8cf09 100644 --- a/DisCatSharp/Clients/DiscordClient.Events.cs +++ b/DisCatSharp/Clients/DiscordClient.Events.cs @@ -360,9 +360,9 @@ public event AsyncEventHandler GuildBanR private AsyncEvent _guildBanRemoved; - #endregion +#endregion - #region Guild Timeout +#region Guild Timeout /// /// Fired when a guild member timeout gets added. diff --git a/DisCatSharp/Entities/Channel/DiscordChannel.cs b/DisCatSharp/Entities/Channel/DiscordChannel.cs index 44e9c7bce4..6c9d442afc 100644 --- a/DisCatSharp/Entities/Channel/DiscordChannel.cs +++ b/DisCatSharp/Entities/Channel/DiscordChannel.cs @@ -330,7 +330,7 @@ internal DiscordChannel(List? ignored = null) this._permissionOverwritesLazy = new(() => new ReadOnlyCollection(this.PermissionOverwritesInternal)); } - #region Methods +#region Methods /// /// Sends a message to this channel. @@ -965,7 +965,7 @@ public Task> GetInvitesAsync() => public Task CreateInviteAsync(int maxAge = 86400, int maxUses = 0, bool temporary = false, bool unique = false, TargetType? targetType = null, ulong? targetApplicationId = null, ulong? targetUser = null, string reason = null) => this.Discord.ApiClient.CreateChannelInviteAsync(this.Id, maxAge, maxUses, targetType, targetApplicationId, targetUser, temporary, unique, reason); - #region Voice Channel +#region Voice Channel /// /// Sets a voice channels status. @@ -988,9 +988,9 @@ public Task SetVoiceChannelStatusAsync(string status) public Task RemoveVoiceChannelStatusAsync(string reason = null) => this.Type != ChannelType.Voice ? throw new NotSupportedException("Cannot execute this request on a non-voice channel.") : this.Discord.ApiClient.ModifyVoiceChannelStatusAsync(this.Id, null); - #endregion +#endregion - #region Stage +#region Stage /// /// Opens a stage. @@ -1041,9 +1041,9 @@ public async Task CloseStageAsync(string reason = null) public async Task GetStageAsync() => await this.Discord.ApiClient.GetStageInstanceAsync(this.Id).ConfigureAwait(false); - #endregion +#endregion - #region Scheduled Events +#region Scheduled Events /// /// Creates a scheduled event based on the channel type. @@ -1067,9 +1067,9 @@ public async Task CreateScheduledEventAsync(string name, return await this.Guild.CreateScheduledEventAsync(name, scheduledStartTime, null, this, null, description, type, coverImage, reason).ConfigureAwait(false); } - #endregion +#endregion - #region Threads +#region Threads /// /// Creates a thread. @@ -1218,7 +1218,7 @@ public async Task CreateForumPostTagAsync(string name, DiscordEm public async Task DeleteForumPostTag(ulong id, string reason = null) => this.Type != ChannelType.Forum ? throw new NotSupportedException("Channel needs to be type of Forum") : await this.Discord.ApiClient.ModifyForumChannelAsync(this.Id, null, null, Optional.None, Optional.None, null, Optional.None, this.InternalAvailableTags?.Where(x => x.Id != id)?.ToList(), Optional.None, Optional.None, Optional.None, Optional.None, Optional.None, Optional.None, null, Optional.None, reason).ConfigureAwait(false); - #endregion +#endregion /// /// Adds a channel permission overwrite for specified role. @@ -1463,7 +1463,7 @@ public override string ToString() => ? $"Channel {this.Name} ({this.Id})" : $"Channel {this.Id}"; - #endregion +#endregion /// /// Checks whether this is equal to another object. diff --git a/DisCatSharp/Entities/Message/DiscordMessage.cs b/DisCatSharp/Entities/Message/DiscordMessage.cs index cc498de493..84e8ea134f 100644 --- a/DisCatSharp/Entities/Message/DiscordMessage.cs +++ b/DisCatSharp/Entities/Message/DiscordMessage.cs @@ -455,7 +455,7 @@ public bool HasPoll /// The fresh discord message. /// Thrown when the message has no poll, the author is not us, or the poll has been already ended. public async Task EndPollAsync() - => this.Poll is null + => this.Poll is null ? throw new InvalidOperationException("This message has no poll.") : this.Author.Id != this.Discord.CurrentUser.Id ? throw new InvalidOperationException("Can only end own polls.") @@ -527,7 +527,7 @@ private List GetMentions() var mentions = new List(); try - { + { if (this.ReferencedMessage is not null && this.MentionedUsersInternal.Count is not 0 && this.MentionedUsersInternal.Contains(this.ReferencedMessage.Author)) mentions.Add(new RepliedUserMention()); @@ -537,8 +537,8 @@ private List GetMentions() if (this.MentionedRoleIds.Count is not 0) mentions.AddRange(this.MentionedRoleIds.Select(r => (IMention)new RoleMention(r))); } - catch - { } + catch + { } return mentions; } diff --git a/DisCatSharp/Entities/Message/DiscordMessageBuilder.cs b/DisCatSharp/Entities/Message/DiscordMessageBuilder.cs index a9db23cd20..e9fc91511e 100644 --- a/DisCatSharp/Entities/Message/DiscordMessageBuilder.cs +++ b/DisCatSharp/Entities/Message/DiscordMessageBuilder.cs @@ -525,8 +525,7 @@ internal void Validate(bool isModify = false) this.Poll?.Validate(); } - else - if (this.Poll is not null) - throw new InvalidOperationException("Messages with polls can't be edited."); + else if (this.Poll is not null) + throw new InvalidOperationException("Messages with polls can't be edited."); } } diff --git a/DisCatSharp/Entities/Message/Polls/DiscordPoll.cs b/DisCatSharp/Entities/Message/Polls/DiscordPoll.cs index 2827ed1f5e..b61cd09b36 100644 --- a/DisCatSharp/Entities/Message/Polls/DiscordPoll.cs +++ b/DisCatSharp/Entities/Message/Polls/DiscordPoll.cs @@ -99,9 +99,9 @@ public async Task> GetAnswerVotersAsync(int answ /// The fresh discord message. /// Thrown when the author is not us, or the poll has been already ended. public async Task EndAsync() - => this.AuthorId != this.Discord.CurrentUser.Id - ? throw new InvalidOperationException("Can only end own polls.") - : this.Results?.IsFinalized ?? false - ? throw new InvalidOperationException("The poll was already ended.") - : await this.Discord.ApiClient.EndPollAsync(this.ChannelId, this.MessageId); + => this.AuthorId != this.Discord.CurrentUser.Id + ? throw new InvalidOperationException("Can only end own polls.") + : this.Results?.IsFinalized ?? false + ? throw new InvalidOperationException("The poll was already ended.") + : await this.Discord.ApiClient.EndPollAsync(this.ChannelId, this.MessageId); } diff --git a/DisCatSharp/Entities/Message/Polls/DiscordPollBuilder.cs b/DisCatSharp/Entities/Message/Polls/DiscordPollBuilder.cs index 205646972d..4f13072379 100644 --- a/DisCatSharp/Entities/Message/Polls/DiscordPollBuilder.cs +++ b/DisCatSharp/Entities/Message/Polls/DiscordPollBuilder.cs @@ -114,8 +114,8 @@ public DiscordPollBuilder AddAnswers(IEnumerable answers) throw new ArgumentException("Cannot add more than 10 answers to a poll!"); } - int answerId = 1; - foreach(var answer in answers) + var answerId = 1; + foreach (var answer in answers) { if (answer.PollMedia.Text.Length > 55) throw new ArgumentException($"Answers text cannot exceed 55 characters. Thrown in answer {answerId}"); diff --git a/DisCatSharp/Enums/Discord/DiscordIntents.cs b/DisCatSharp/Enums/Discord/DiscordIntents.cs index 2f0eb12430..03a802978b 100644 --- a/DisCatSharp/Enums/Discord/DiscordIntents.cs +++ b/DisCatSharp/Enums/Discord/DiscordIntents.cs @@ -204,7 +204,7 @@ public enum DiscordIntents /// AllUnprivileged = Guilds | GuildModeration | GuildEmojisAndStickers | GuildIntegrations | GuildWebhooks | GuildInvites | GuildVoiceStates | GuildMessages | GuildMessageReactions | GuildMessageTyping | DirectMessages | DirectMessageReactions | DirectMessageTyping | GuildScheduledEvents | AutoModerationConfiguration | AutoModerationExecution | - GuildMessagePolls | DirectMessagePolls, + GuildMessagePolls | DirectMessagePolls, /// /// Includes all intents. diff --git a/DisCatSharp/Enums/Message/PollLayoutType.cs b/DisCatSharp/Enums/Message/PollLayoutType.cs index 2fa48bcb10..2ca5e70693 100644 --- a/DisCatSharp/Enums/Message/PollLayoutType.cs +++ b/DisCatSharp/Enums/Message/PollLayoutType.cs @@ -8,11 +8,11 @@ public enum PollLayoutType /// /// The default layout type. /// - Default = 1/*, + Default = 1 /*, /// /// Poll answers are images only. /// - ImageOnlyAnswers = 2 - */ + ImageOnlyAnswers = 2 + */ } diff --git a/DisCatSharp/Net/Rest/DiscordApiClient.cs b/DisCatSharp/Net/Rest/DiscordApiClient.cs index fe42b0c8fd..0b9eab2f32 100644 --- a/DisCatSharp/Net/Rest/DiscordApiClient.cs +++ b/DisCatSharp/Net/Rest/DiscordApiClient.cs @@ -137,6 +137,7 @@ private DiscordMessage PrepareMessage(JToken msgRaw) ret.Poll.MessageId = ret.Id; ret.Poll.AuthorId = author.Id; } + return ret; } @@ -156,8 +157,8 @@ private DiscordMessage PrepareMessage(JToken msgRaw) ret.Channel = channel; #pragma warning disable CS0472 - if (ret.ChannelId == null!) - ret.ChannelId = ret.Channel.Id; + if (ret.ChannelId == null!) + ret.ChannelId = ret.Channel.Id; #pragma warning restore CS0472 if (ret.Poll is not null) { @@ -339,7 +340,7 @@ private Task DoMultipartAsync( // begin todo - #region Guild +#region Guild /// /// Gets the guild async. @@ -487,7 +488,7 @@ internal async Task CreateGuildAsync( var route = $"{Endpoints.GUILDS}"; var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new - { }, out var path); + { }, out var path); var url = Utilities.GetApiUriFor(path, this.Discord.Configuration); var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false); @@ -1960,11 +1961,11 @@ internal async Task DeleteAutomodRuleAsync(ulong guildId, ulong rul return ret; } - #endregion +#endregion // End todo - #region Guild Scheduled Events +#region Guild Scheduled Events /// /// Creates a scheduled event. @@ -2306,11 +2307,11 @@ internal async Task> GetGu return new ReadOnlyDictionary(new Dictionary(rspv)); } - #endregion +#endregion // begin todo - #region Channel +#region Channel /// /// Creates a guild channel. @@ -2927,7 +2928,7 @@ internal async Task CreateStageInstanceAsync(ulong channel var route = $"{Endpoints.STAGE_INSTANCES}"; var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new - { }, out var path); + { }, out var path); var headers = Utilities.GetBaseHeaders(); if (!string.IsNullOrWhiteSpace(reason)) headers.Add(REASON_HEADER_NAME, reason); @@ -3212,6 +3213,7 @@ internal Task DeleteMessagesAsync(ulong channelId, IEnumerable messageIds } #region Polls + /// /// Get a list of users that voted for a specific answer on a . /// @@ -3260,7 +3262,7 @@ internal async Task> GetAnswerVotersAsync(ulong voters.Add(usr); } - return new ReadOnlyCollection(new List(voters)); + return new(new List(voters)); } /// @@ -3282,6 +3284,7 @@ internal async Task EndPollAsync(ulong channelId, ulong messageI var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route); return DiscordJson.DeserializeObject(res.Response, this.Discord); } + #endregion /// @@ -3542,7 +3545,7 @@ internal async Task CreateGroupDmAsync(IEnumerable acc var route = $"{Endpoints.USERS}{Endpoints.ME}{Endpoints.CHANNELS}"; var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new - { }, out var path); + { }, out var path); var url = Utilities.GetApiUriFor(path, this.Discord.Configuration); var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false); @@ -3565,7 +3568,7 @@ internal async Task CreateDmAsync(ulong recipientId) var route = $"{Endpoints.USERS}{Endpoints.ME}{Endpoints.CHANNELS}"; var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new - { }, out var path); + { }, out var path); var url = Utilities.GetApiUriFor(path, this.Discord.Configuration); var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.POST, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false); @@ -3618,11 +3621,11 @@ internal async Task CrosspostMessageAsync(ulong channelId, ulong return DiscordJson.DeserializeObject(response.Response, this.Discord); } - #endregion +#endregion // End todo - #region Member +#region Member /// /// Gets the current user async. @@ -3755,7 +3758,7 @@ internal async Task ModifyCurrentUserAsync(string username, Optiona var route = $"{Endpoints.USERS}{Endpoints.ME}"; var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new - { }, out var path); + { }, out var path); var url = Utilities.GetApiUriFor(path, this.Discord.Configuration); var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false); @@ -3775,7 +3778,7 @@ internal async Task> GetCurrentUserGuildsAsync(int l var route = $"{Endpoints.USERS}{Endpoints.ME}{Endpoints.GUILDS}"; var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new - { }, out var path); + { }, out var path); var url = Utilities.GetApiUriBuilderFor(path, this.Discord.Configuration) .AddParameter($"limit", limit.ToString(CultureInfo.InvariantCulture)); @@ -3908,9 +3911,9 @@ internal Task ModifyCurrentMemberNicknameAsync(ulong guildId, string nick, strin return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, DiscordJson.SerializeObject(pld)); } - #endregion +#endregion - #region Roles +#region Roles /// /// Gets the guild roles async. @@ -4053,9 +4056,9 @@ internal async Task CreateGuildRoleAsync(ulong guildId, string name return ret; } - #endregion +#endregion - #region Prune +#region Prune /// /// Gets the guild prune count async. @@ -4074,8 +4077,8 @@ internal async Task GetGuildPruneCountAsync(ulong guildId, int days, IEnume }; var sb = includeRoles?.Aggregate(new StringBuilder(), - (sb, id) => sb.Append($"&include_roles={id}")) - ?? new StringBuilder(); + (sb, id) => sb.Append($"&include_roles={id}")) + ?? new StringBuilder(); var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.PRUNE}"; var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new @@ -4110,8 +4113,8 @@ internal async Task GetGuildPruneCountAsync(ulong guildId, int days, IEnume }; var sb = includeRoles?.Aggregate(new StringBuilder(), - (sb, id) => sb.Append($"&include_roles={id}")) - ?? new StringBuilder(); + (sb, id) => sb.Append($"&include_roles={id}")) + ?? new StringBuilder(); var headers = Utilities.GetBaseHeaders(); if (!string.IsNullOrWhiteSpace(reason)) @@ -4131,9 +4134,9 @@ internal async Task GetGuildPruneCountAsync(ulong guildId, int days, IEnume return pruned.Pruned; } - #endregion +#endregion - #region GuildVarious +#region GuildVarious /// /// Gets the template async. @@ -4327,9 +4330,9 @@ internal async Task> GetGuildInvitesAsync(ulong gui return invites; } - #endregion +#endregion - #region Invite +#region Invite /// /// Gets the invite async. @@ -4403,9 +4406,9 @@ internal async Task DeleteInviteAsync(string inviteCode, string? * } */ - #endregion +#endregion - #region Connections +#region Connections /// /// Gets the users connections async. @@ -4414,7 +4417,7 @@ internal async Task> GetUserConnectionsAsync() { var route = $"{Endpoints.USERS}{Endpoints.ME}{Endpoints.CONNECTIONS}"; var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new - { }, out var path); + { }, out var path); var url = Utilities.GetApiUriFor(path, this.Discord.Configuration); var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false); @@ -4475,9 +4478,9 @@ internal async Task> Upd return metadata; } - #endregion +#endregion - #region Voice +#region Voice /// /// Lists the voice regions async. @@ -4486,7 +4489,7 @@ internal async Task> ListVoiceRegionsAsync() { var route = $"{Endpoints.VOICE}{Endpoints.REGIONS}"; var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new - { }, out var path); + { }, out var path); var url = Utilities.GetApiUriFor(path, this.Discord.Configuration); var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false); @@ -4496,9 +4499,9 @@ internal async Task> ListVoiceRegionsAsync() return regions; } - #endregion +#endregion - #region Webhooks +#region Webhooks /// /// Creates the webhook async. @@ -5091,9 +5094,9 @@ internal Task DeleteWebhookMessageAsync(ulong webhookId, string webhookToken, ul internal Task DeleteWebhookMessageAsync(ulong webhookId, string webhookToken, ulong messageId, ulong threadId) => this.DeleteWebhookMessageAsync(webhookId, webhookToken, messageId.ToString(), threadId.ToString()); - #endregion +#endregion - #region Reactions +#region Reactions /// /// Creates the reaction async. @@ -5255,9 +5258,9 @@ internal Task DeleteReactionsEmojiAsync(ulong channelId, ulong messageId, string return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route, ratelimitWaitOverride: this.Discord.Configuration.UseRelativeRatelimit ? null : 0.26); } - #endregion +#endregion - #region Threads +#region Threads /// /// Creates the thread. @@ -5664,9 +5667,9 @@ internal Task ModifyThreadAsync(ulong threadId, ChannelType parentType, string n return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, DiscordJson.SerializeObject(pld)); } - #endregion +#endregion - #region Emoji +#region Emoji /// /// Gets the guild emojis async. @@ -5851,9 +5854,9 @@ internal Task DeleteGuildEmojiAsync(ulong guildId, ulong emojiId, string? reason return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route, headers); } - #endregion +#endregion - #region Stickers +#region Stickers /// /// Gets a sticker. @@ -5880,7 +5883,7 @@ internal async Task> GetStickerPacksAsync() { var route = $"{Endpoints.STICKERPACKS}"; var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new - { }, out var path); + { }, out var path); var url = Utilities.GetApiUriFor(path, this.Discord.Configuration); var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false); @@ -6020,9 +6023,9 @@ internal async Task DeleteGuildStickerAsync(ulong guildId, ulong stickerId, stri await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.DELETE, route, headers).ConfigureAwait(false); } - #endregion +#endregion - #region Application Commands +#region Application Commands /// /// Gets the global application commands. @@ -6773,9 +6776,9 @@ internal Task EditFollowupMessageAsync(ulong applicationId, stri internal Task DeleteFollowupMessageAsync(ulong applicationId, string interactionToken, ulong messageId) => this.DeleteWebhookMessageAsync(applicationId, interactionToken, messageId); - #endregion +#endregion - #region Misc +#region Misc /// /// Gets the published store sku listings (premium application subscription). @@ -6791,7 +6794,7 @@ internal async Task> GetPublishedListingsAsync(ul var route = $"{Endpoints.STORE}{Endpoints.PUBLISHED_LISTINGS}{Endpoints.SKUS}"; var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new - { }, out var path); + { }, out var path); var url = Utilities.GetApiUriFor(path, urlParams.Count != 0 ? BuildQueryString(urlParams) : "", this.Discord.Configuration); var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false); @@ -6936,7 +6939,7 @@ internal async Task GetCurrentApplicationInfoAsync() { var route = $"{Endpoints.APPLICATIONS}{Endpoints.ME}"; var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new - { }, out var path); + { }, out var path); var url = Utilities.GetApiUriFor(path, this.Discord.Configuration); var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route).ConfigureAwait(false); @@ -6980,7 +6983,7 @@ internal async Task ModifyCurrentApplicationInfoAsync( var route = $"{Endpoints.APPLICATIONS}{Endpoints.ME}"; var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new - { }, out var path); + { }, out var path); var url = Utilities.GetApiUriFor(path, this.Discord.Configuration); var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, payload: DiscordJson.SerializeObject(pld)).ConfigureAwait(false); @@ -7044,7 +7047,7 @@ internal async Task GetGatewayInfoAsync() if (this.Discord.Configuration.TokenType == TokenType.Bot) route += Endpoints.BOT; var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new - { }, out var path); + { }, out var path); var url = Utilities.GetApiUriFor(path, this.Discord.Configuration); var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.GET, route, headers).ConfigureAwait(false); @@ -7082,9 +7085,9 @@ internal void UploadGcpFile(GcpAttachmentUploadInformation target, Stream file) this.Rest.HttpClient.Send(request); } - #endregion +#endregion - #region OAuth2 +#region OAuth2 /// /// Gets the current oauth2 authorization information. @@ -7098,7 +7101,7 @@ internal async Task GetCurrentOAuth2Authorizati // ReSharper disable once HeuristicUnreachableCode var route = $"{Endpoints.OAUTH2}{Endpoints.ME}"; var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new - { }, out var path); + { }, out var path); var headers = Utilities.GetBaseHeaders(); headers.Add("Bearer", accessToken); @@ -7149,7 +7152,7 @@ internal async Task> GetCurrentUserConnectionsA // ReSharper disable once HeuristicUnreachableCode var route = $"{Endpoints.USERS}{Endpoints.ME}{Endpoints.CONNECTIONS}"; var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new - { }, out var path); + { }, out var path); var headers = Utilities.GetBaseHeaders(); headers.Add("Bearer", accessToken); @@ -7172,7 +7175,7 @@ internal async Task> GetCurrentUserGuildsAsync(strin // ReSharper disable once HeuristicUnreachableCode var route = $"{Endpoints.USERS}{Endpoints.ME}{Endpoints.GUILDS}"; var bucket = this.Rest.GetBucket(RestRequestMethod.GET, route, new - { }, out var path); + { }, out var path); var headers = Utilities.GetBaseHeaders(); headers.Add("Bearer", accessToken); @@ -7282,7 +7285,7 @@ internal async Task ExchangeOAuth2AccessTokenAsync(string co // ReSharper disable once HeuristicUnreachableCode var route = $"{Endpoints.OAUTH2}{Endpoints.TOKEN}"; var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new - { }, out var path); + { }, out var path); var formData = new Dictionary { @@ -7312,7 +7315,7 @@ internal async Task RefreshOAuth2AccessTokenAsync(string ref // ReSharper disable once HeuristicUnreachableCode var route = $"{Endpoints.OAUTH2}{Endpoints.TOKEN}"; var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new - { }, out var path); + { }, out var path); var formData = new Dictionary { @@ -7343,7 +7346,7 @@ internal Task RevokeOAuth2TokenAsync(string token, string type) // ReSharper disable once HeuristicUnreachableCode var route = $"{Endpoints.OAUTH2}{Endpoints.TOKEN}{Endpoints.REVOKE}"; var bucket = this.Rest.GetBucket(RestRequestMethod.POST, route, new - { }, out var path); + { }, out var path); var authorizationString = Encoding.UTF8.GetBytes($"{this.OAuth2Client.ClientId.ToString(CultureInfo.InvariantCulture)}:{this.OAuth2Client.ClientSecret}"); var base64EncodedAuthorizationString = Convert.ToBase64String(authorizationString); @@ -7362,5 +7365,5 @@ internal Task RevokeOAuth2TokenAsync(string token, string type) return Task.CompletedTask; } - #endregion +#endregion }