Conditional-expression-simplification (discord-net#193)

quinchs · Sep 24, 2021 · a8ffa5d · a8ffa5d
1 parent 0b47c71
commit a8ffa5d
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 16 deletions.
diff --git a/src/Discord.Net.Core/Entities/Interactions/Message Components/ComponentBuilder.cs b/src/Discord.Net.Core/Entities/Interactions/Message Components/ComponentBuilder.cs
@@ -207,8 +207,10 @@ public ComponentBuilder WithButton(ButtonBuilder button, int row = 0)
 
             if (_actionRows == null)
             {
-                _actionRows = new List<ActionRowBuilder>();
-                _actionRows.Add(new ActionRowBuilder().AddComponent(builtButton));
+                _actionRows = new List<ActionRowBuilder>
+                {
+                    new ActionRowBuilder().AddComponent(builtButton)
+                };
             }
             else
             {

diff --git a/src/Discord.Net.Rest/API/Rest/CreateStickerParams.cs b/src/Discord.Net.Rest/API/Rest/CreateStickerParams.cs
@@ -19,11 +19,12 @@ internal class CreateStickerParams
 
         public IReadOnlyDictionary<string, object> ToDictionary()
         {
-            var d = new Dictionary<string, object>();
-
-            d["name"] = $"{Name}";
-            d["description"] = Description;
-            d["tags"] = Tags;
+            var d = new Dictionary<string, object>
+            {
+                ["name"] = $"{Name}",
+                ["description"] = Description,
+                ["tags"] = Tags
+            };
 
             string contentType = "image/png";
 

diff --git a/src/Discord.Net.Rest/API/Rest/CreateWebhookMessageParams.cs b/src/Discord.Net.Rest/API/Rest/CreateWebhookMessageParams.cs
@@ -51,9 +51,10 @@ public IReadOnlyDictionary<string, object> ToDictionary()
                 d["file"] = File.Value;
             }
 
-            var payload = new Dictionary<string, object>();
-
-            payload["content"] = Content;
+            var payload = new Dictionary<string, object>
+            {
+                ["content"] = Content
+            };
 
             if (IsTTS.IsSpecified)
                 payload["tts"] = IsTTS.Value.ToString();

diff --git a/src/Discord.Net.Rest/Extensions/EntityExtensions.cs b/src/Discord.Net.Rest/Extensions/EntityExtensions.cs
@@ -39,7 +39,7 @@ public static RoleTags ToEntity(this API.RoleTags model)
             return new RoleTags(
                 model.BotId.IsSpecified ? model.BotId.Value : null,
                 model.IntegrationId.IsSpecified ? model.IntegrationId.Value : null,
-                model.IsPremiumSubscriber.IsSpecified ? true : false);
+                model.IsPremiumSubscriber.IsSpecified);
         }
         public static API.Embed ToModel(this Embed entity)
         {

diff --git a/src/Discord.Net.Rest/Net/Queue/RequestQueueBucket.cs b/src/Discord.Net.Rest/Net/Queue/RequestQueueBucket.cs
@@ -377,7 +377,7 @@ private void UpdateRateLimit(int id, IRequest request, RateLimitInfo info, bool
                     Debug.WriteLine($"[{id}] Retry-After: {info.RetryAfter.Value} ({info.RetryAfter.Value} ms)");
 #endif
                 }
-                else if (info.ResetAfter.HasValue && (request.Options.UseSystemClock.HasValue ? !request.Options.UseSystemClock.Value : false))
+                else if (info.ResetAfter.HasValue && (request.Options.UseSystemClock.HasValue && !request.Options.UseSystemClock.Value))
                 {
                     resetTick = DateTimeOffset.UtcNow.Add(info.ResetAfter.Value);
 #if DEBUG_LIMITS

diff --git a/src/Discord.Net.WebSocket/DiscordSocketClient.cs b/src/Discord.Net.WebSocket/DiscordSocketClient.cs
@@ -2453,7 +2453,7 @@ private async Task ProcessMessageAsync(GatewayOpCode opCode, int? seq, string ty
 
                                     SocketStageChannel before = type == "STAGE_INSTANCE_UPDATE" ? stageChannel.Clone() : null;
 
-                                    stageChannel.Update(data, type == "STAGE_INSTANCE_CREATE" ? true : type == "STAGE_INSTANCE_DELETE" ? false : false);
+                                    stageChannel.Update(data, type == "STAGE_INSTANCE_CREATE");
 
                                     switch (type)
                                     {

diff --git a/src/Discord.Net.WebSocket/Entities/Stickers/SocketSticker.cs b/src/Discord.Net.WebSocket/Entities/Stickers/SocketSticker.cs
@@ -95,9 +95,7 @@ public override bool Equals(object obj)
                     stickerModel.Type == this.Type &&
                     stickerModel.SortValue == this.SortOrder &&
                     stickerModel.Available == this.Available &&
-                    (stickerModel.Tags.IsSpecified ?
-                        stickerModel.Tags.Value == string.Join(", ", this.Tags) :
-                        true);
+                    (!stickerModel.Tags.IsSpecified || stickerModel.Tags.Value == string.Join(", ", this.Tags));
             }
             else
                 return base.Equals(obj);