From 57e0397291df262f7f31e7d0ca9b7f1c5b1bc140 Mon Sep 17 00:00:00 2001 From: Chris Johnston Date: Sun, 2 Jun 2019 16:43:44 -0700 Subject: [PATCH] use null conditional operator instead of a null check --- .../Entities/Messages/MessageHelper.cs | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/Discord.Net.Rest/Entities/Messages/MessageHelper.cs b/src/Discord.Net.Rest/Entities/Messages/MessageHelper.cs index 9a76d32bb..a132eca52 100644 --- a/src/Discord.Net.Rest/Entities/Messages/MessageHelper.cs +++ b/src/Discord.Net.Rest/Entities/Messages/MessageHelper.cs @@ -152,13 +152,9 @@ namespace Discord.Rest { index = text.IndexOf("@everyone", index); if (index == -1) break; - IRole mentionedRole = null; - if (guild != null) - mentionedRole = guild.EveryoneRole; - var tagIndex = FindIndex(tags, index); if (tagIndex.HasValue) - tags.Insert(tagIndex.Value, new Tag(TagType.EveryoneMention, index, "@everyone".Length, 0, mentionedRole)); + tags.Insert(tagIndex.Value, new Tag(TagType.EveryoneMention, index, "@everyone".Length, 0, guild?.EveryoneRole)); index++; } @@ -167,13 +163,9 @@ namespace Discord.Rest { index = text.IndexOf("@here", index); if (index == -1) break; - IRole mentionedRole = null; - if (guild != null) - mentionedRole = guild.EveryoneRole; - var tagIndex = FindIndex(tags, index); if (tagIndex.HasValue) - tags.Insert(tagIndex.Value, new Tag(TagType.HereMention, index, "@here".Length, 0, mentionedRole)); + tags.Insert(tagIndex.Value, new Tag(TagType.HereMention, index, "@here".Length, 0, guild?.EveryoneRole)); index++; }