From a8ffa5d02c713d739447c1775e50b47ca091ac65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Hjorth=C3=B8j?= Date: Fri, 24 Sep 2021 14:49:30 +0200 Subject: [PATCH] Conditional-expression-simplification (#193) --- .../Message Components/ComponentBuilder.cs | 6 ++++-- src/Discord.Net.Rest/API/Rest/CreateStickerParams.cs | 11 ++++++----- .../API/Rest/CreateWebhookMessageParams.cs | 7 ++++--- src/Discord.Net.Rest/Extensions/EntityExtensions.cs | 2 +- src/Discord.Net.Rest/Net/Queue/RequestQueueBucket.cs | 2 +- src/Discord.Net.WebSocket/DiscordSocketClient.cs | 2 +- .../Entities/Stickers/SocketSticker.cs | 4 +--- 7 files changed, 18 insertions(+), 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 index 8dbcb4319..7725688b8 100644 --- 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 @@ namespace Discord if (_actionRows == null) { - _actionRows = new List(); - _actionRows.Add(new ActionRowBuilder().AddComponent(builtButton)); + _actionRows = new List + { + 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 index 405d3e04e..225caaaae 100644 --- a/src/Discord.Net.Rest/API/Rest/CreateStickerParams.cs +++ b/src/Discord.Net.Rest/API/Rest/CreateStickerParams.cs @@ -19,11 +19,12 @@ namespace Discord.API.Rest public IReadOnlyDictionary ToDictionary() { - var d = new Dictionary(); - - d["name"] = $"{Name}"; - d["description"] = Description; - d["tags"] = Tags; + var d = new Dictionary + { + ["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 index e21cae845..aea4b9538 100644 --- a/src/Discord.Net.Rest/API/Rest/CreateWebhookMessageParams.cs +++ b/src/Discord.Net.Rest/API/Rest/CreateWebhookMessageParams.cs @@ -51,9 +51,10 @@ namespace Discord.API.Rest d["file"] = File.Value; } - var payload = new Dictionary(); - - payload["content"] = Content; + var payload = new Dictionary + { + ["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 index 0c2e0f8c2..ca36bc6d6 100644 --- a/src/Discord.Net.Rest/Extensions/EntityExtensions.cs +++ b/src/Discord.Net.Rest/Extensions/EntityExtensions.cs @@ -39,7 +39,7 @@ namespace Discord.Rest 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 index d2a7cabee..52fea021b 100644 --- a/src/Discord.Net.Rest/Net/Queue/RequestQueueBucket.cs +++ b/src/Discord.Net.Rest/Net/Queue/RequestQueueBucket.cs @@ -377,7 +377,7 @@ namespace Discord.Net.Queue 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 index 3e5a6d543..72f22c9a5 100644 --- a/src/Discord.Net.WebSocket/DiscordSocketClient.cs +++ b/src/Discord.Net.WebSocket/DiscordSocketClient.cs @@ -2453,7 +2453,7 @@ namespace Discord.WebSocket 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 index eaf80f9c2..5e4e09aa8 100644 --- a/src/Discord.Net.WebSocket/Entities/Stickers/SocketSticker.cs +++ b/src/Discord.Net.WebSocket/Entities/Stickers/SocketSticker.cs @@ -95,9 +95,7 @@ namespace Discord.WebSocket 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);