From 6b5a6e7f1fba738d13a465977b5c4ac7cf107d14 Mon Sep 17 00:00:00 2001 From: Alex Gravely Date: Thu, 17 Aug 2017 01:47:37 -0400 Subject: [PATCH] Fix everyone mention. (#755) * Update RestRole.cs Fix everyone mention. * Update SocketRole.cs Fix everyone mention. * I'm good at this, I swear. --- src/Discord.Net.Rest/Entities/Roles/RestRole.cs | 2 +- src/Discord.Net.WebSocket/Entities/Roles/SocketRole.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Discord.Net.Rest/Entities/Roles/RestRole.cs b/src/Discord.Net.Rest/Entities/Roles/RestRole.cs index 9807b8357..486f41b9e 100644 --- a/src/Discord.Net.Rest/Entities/Roles/RestRole.cs +++ b/src/Discord.Net.Rest/Entities/Roles/RestRole.cs @@ -19,7 +19,7 @@ namespace Discord.Rest public DateTimeOffset CreatedAt => SnowflakeUtils.FromSnowflake(Id); public bool IsEveryone => Id == Guild.Id; - public string Mention => MentionUtils.MentionRole(Id); + public string Mention => IsEveryone ? "@everyone" : MentionUtils.MentionRole(Id); internal RestRole(BaseDiscordClient discord, IGuild guild, ulong id) : base(discord, id) diff --git a/src/Discord.Net.WebSocket/Entities/Roles/SocketRole.cs b/src/Discord.Net.WebSocket/Entities/Roles/SocketRole.cs index 7d24d8e1c..c366258cc 100644 --- a/src/Discord.Net.WebSocket/Entities/Roles/SocketRole.cs +++ b/src/Discord.Net.WebSocket/Entities/Roles/SocketRole.cs @@ -23,7 +23,7 @@ namespace Discord.WebSocket public DateTimeOffset CreatedAt => SnowflakeUtils.FromSnowflake(Id); public bool IsEveryone => Id == Guild.Id; - public string Mention => MentionUtils.MentionRole(Id); + public string Mention => IsEveryone ? "@everyone" : MentionUtils.MentionRole(Id); public IEnumerable Members => Guild.Users.Where(x => x.Roles.Any(r => r.Id == Id));