DSharpPlus · akiraveliara · Sep 29, 2023 · Apr 24, 2023 · Apr 24, 2023 · Apr 24, 2023
diff --git a/.editorconfig b/.editorconfig
@@ -9,7 +9,7 @@ indent_style = space
 
 # XML project files
 [*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]
-indent_size = 2
+indent_size = 4
 
 # XML config files
 [*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}]
@@ -105,6 +105,10 @@ dotnet_naming_symbols.async_methods.required_modifiers = async
 
 # Don't force namespaces to match their folder names
 dotnet_diagnostic.IDE0130.severity = none
+dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
+dotnet_style_operator_placement_when_wrapping = beginning_of_line
+tab_width = 4
+end_of_line = crlf
 
 ###############################
 # C# Coding Conventions       #
@@ -180,3 +184,8 @@ csharp_space_between_method_call_empty_parameter_list_parentheses = false
 # Wrapping preferences
 csharp_preserve_single_line_statements = true
 csharp_preserve_single_line_blocks = true
+csharp_using_directive_placement = inside_namespace:silent
+csharp_prefer_simple_using_statement = true:suggestion
+csharp_style_prefer_method_group_conversion = true:silent
+csharp_style_prefer_top_level_statements = true:silent
+csharp_style_expression_bodied_local_functions = false:warning
diff --git a/DSharpPlus.Rest/DiscordRestClient.cs b/DSharpPlus.Rest/DiscordRestClient.cs
diff --git a/DSharpPlus/Clients/BaseDiscordClient.cs b/DSharpPlus/Clients/BaseDiscordClient.cs
@@ -160,8 +160,8 @@ public async Task<DiscordApplication> GetCurrentApplicationAsync()
         /// </summary>
         /// <returns></returns>
         /// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
-        public Task<IReadOnlyList<DiscordVoiceRegion>> ListVoiceRegionsAsync()
-            => this.ApiClient.ListVoiceRegionsAsync();
+        public async Task<IReadOnlyList<DiscordVoiceRegion>> ListVoiceRegionsAsync()
+            => await this.ApiClient.ListVoiceRegionsAsync();
 
         /// <summary>
         /// Initializes this client. This method fetches information about current user, application, and voice regions.

diff --git a/DSharpPlus/Clients/DiscordClient.WebSocket.cs b/DSharpPlus/Clients/DiscordClient.WebSocket.cs
@@ -113,14 +113,16 @@ internal async Task InternalConnectAsync()
             this._webSocketClient.MessageReceived += SocketOnMessage;
             this._webSocketClient.ExceptionThrown += SocketOnException;
 
-            var gwuri = new QueryUriBuilder(this.GatewayUri)
+            QueryUriBuilder gwuri = new QueryUriBuilder(this.GatewayUri.ToString())
                 .AddParameter("v", "10")
                 .AddParameter("encoding", "json");
 
             if (this.Configuration.GatewayCompressionLevel == GatewayCompressionLevel.Stream)
+            {
                 gwuri.AddParameter("compress", "zlib-stream");
+            }
 
-            await this._webSocketClient.ConnectAsync(gwuri.Build());
+            await this._webSocketClient.ConnectAsync(new Uri(gwuri.Build()));
 
             Task SocketOnConnect(IWebSocketClient sender, SocketEventArgs e)
                 => this._socketOpened.InvokeAsync(this, e);

diff --git a/DSharpPlus/Clients/DiscordClient.cs b/DSharpPlus/Clients/DiscordClient.cs
diff --git a/DSharpPlus/Clients/DiscordWebhookClient.cs b/DSharpPlus/Clients/DiscordWebhookClient.cs
@@ -79,7 +79,7 @@ public DiscordWebhookClient(IWebProxy proxy = null, TimeSpan? timeout = null, bo
 
             var parsedTimeout = timeout ?? TimeSpan.FromSeconds(10);
 
-            this._apiclient = new DiscordApiClient(proxy, parsedTimeout, useRelativeRateLimit, this.Logger);
+            this._apiclient = new DiscordApiClient(proxy, parsedTimeout, this.Logger);
             this._hooks = new List<DiscordWebhook>();
             this.Webhooks = new ReadOnlyCollection<DiscordWebhook>(this._hooks);
         }

diff --git a/DSharpPlus/DSharpPlus.csproj b/DSharpPlus/DSharpPlus.csproj
@@ -7,7 +7,8 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
     <PackageReference Include="Newtonsoft.Json" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
+    <PackageReference Include="Polly" />
   </ItemGroup>
 </Project>
diff --git a/DSharpPlus/Entities/AutoModeration/DiscordAutoModerationRule.cs b/DSharpPlus/Entities/AutoModeration/DiscordAutoModerationRule.cs
@@ -90,8 +90,8 @@ public class DiscordAutoModerationRule : SnowflakeObject
     /// Deletes the rule in the guild.
     /// </summary>
     /// <param name="reason">Reason for audits logs.</param>
-    public Task DeleteAsync(string reason = null)
-        => this.Discord.ApiClient.DeleteGuildAutoModerationRuleAsync(this.GuildId, this.Id, reason);
+    public async Task DeleteAsync(string reason = null)
+        => await this.Discord.ApiClient.DeleteGuildAutoModerationRuleAsync(this.GuildId, this.Id, reason);
 
     /// <summary>
     /// Modify the rule in the guild.

diff --git a/DSharpPlus/Entities/Channel/DiscordChannel.cs b/DSharpPlus/Entities/Channel/DiscordChannel.cs
diff --git a/DSharpPlus/Entities/Channel/DiscordDmChannel.cs b/DSharpPlus/Entities/Channel/DiscordDmChannel.cs
@@ -51,8 +51,8 @@ public string IconUrl
         /// <exception cref="Exceptions.NotFoundException">Thrown when the channel does not exist.</exception>
         /// <exception cref="Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
         /// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
-        public Task AddDmRecipientAsync(ulong user_id, string accesstoken, string nickname)
-            => this.Discord.ApiClient.AddGroupDmRecipientAsync(this.Id, user_id, accesstoken, nickname);
+        public async Task AddDmRecipientAsync(ulong user_id, string accesstoken, string nickname)
+            => await this.Discord.ApiClient.AddGroupDmRecipientAsync(this.Id, user_id, accesstoken, nickname);
 
         /// <summary>
         /// Only use for Group DMs!
@@ -62,7 +62,7 @@ public Task AddDmRecipientAsync(ulong user_id, string accesstoken, string nickna
         /// <exception cref="Exceptions.NotFoundException">Thrown when the channel does not exist.</exception>
         /// <exception cref="Exceptions.BadRequestException">Thrown when an invalid parameter was provided.</exception>
         /// <exception cref="Exceptions.ServerErrorException">Thrown when Discord is unable to process the request.</exception>
-        public Task RemoveDmRecipientAsync(ulong user_id, string accesstoken)
-            => this.Discord.ApiClient.RemoveGroupDmRecipientAsync(this.Id, user_id);
+        public async Task RemoveDmRecipientAsync(ulong user_id, string accesstoken)
+            => await this.Discord.ApiClient.RemoveGroupDmRecipientAsync(this.Id, user_id);
     }
 }