From 1f55f018662243b64a2ab361986da41b4239e416 Mon Sep 17 00:00:00 2001 From: Chris Johnston Date: Sun, 2 Jun 2019 16:53:26 -0700 Subject: [PATCH] feature(internal): Set the @everyone IRole for @everyone and @here tags (#1313) * Set the @everyone IRole for @everyone and @here tags Adds support for setting the IRole corresponding to @everyone or @here in a the tags of a message. Previously this would only set the TagType, but leave the value as null. This does not distinguish between @everyone and @here, as that's done using TagType. The values of both will be the same. This issue was suggested by @TheCasino * use the EveryoneRole property oops * use null conditional operator instead of a null check --- src/Discord.Net.Rest/Entities/Messages/MessageHelper.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Discord.Net.Rest/Entities/Messages/MessageHelper.cs b/src/Discord.Net.Rest/Entities/Messages/MessageHelper.cs index b963fd532..a132eca52 100644 --- a/src/Discord.Net.Rest/Entities/Messages/MessageHelper.cs +++ b/src/Discord.Net.Rest/Entities/Messages/MessageHelper.cs @@ -152,10 +152,9 @@ namespace Discord.Rest { index = text.IndexOf("@everyone", index); if (index == -1) break; - var tagIndex = FindIndex(tags, index); if (tagIndex.HasValue) - tags.Insert(tagIndex.Value, new Tag(TagType.EveryoneMention, index, "@everyone".Length, 0, null)); + tags.Insert(tagIndex.Value, new Tag(TagType.EveryoneMention, index, "@everyone".Length, 0, guild?.EveryoneRole)); index++; } @@ -164,10 +163,9 @@ namespace Discord.Rest { index = text.IndexOf("@here", index); if (index == -1) break; - var tagIndex = FindIndex(tags, index); if (tagIndex.HasValue) - tags.Insert(tagIndex.Value, new Tag(TagType.HereMention, index, "@here".Length, 0, null)); + tags.Insert(tagIndex.Value, new Tag(TagType.HereMention, index, "@here".Length, 0, guild?.EveryoneRole)); index++; }