From 78076bd9df6ef603a95bd868080199c8286ba2df Mon Sep 17 00:00:00 2001
From: Mushroom <othergithub@watchingyour.tv>
Date: Fri, 3 Mar 2017 01:51:46 +0000
Subject: [PATCH] Added support for reaction 'me' field

---
 .../Entities/Messages/IUserMessage.cs                 |  2 +-
 .../Entities/Messages/ReactionMetadata.cs             | 11 +++++++++++
 .../Entities/Messages/RestUserMessage.cs              |  2 +-
 .../Entities/Messages/RpcUserMessage.cs               |  2 +-
 .../Entities/Messages/SocketUserMessage.cs            |  2 +-
 5 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 src/Discord.Net.Core/Entities/Messages/ReactionMetadata.cs

diff --git a/src/Discord.Net.Core/Entities/Messages/IUserMessage.cs b/src/Discord.Net.Core/Entities/Messages/IUserMessage.cs
index 73d402041..f238ca6bc 100644
--- a/src/Discord.Net.Core/Entities/Messages/IUserMessage.cs
+++ b/src/Discord.Net.Core/Entities/Messages/IUserMessage.cs
@@ -14,7 +14,7 @@ namespace Discord
         Task UnpinAsync(RequestOptions options = null);
 
         /// <summary> Returns all reactions included in this message. </summary>
-        IReadOnlyDictionary<Emoji, int> Reactions { get; }
+        IReadOnlyDictionary<Emoji, ReactionMetadata> Reactions { get; }
 
         /// <summary> Adds a reaction to this message. </summary>
         Task AddReactionAsync(Emoji emoji, RequestOptions options = null);
diff --git a/src/Discord.Net.Core/Entities/Messages/ReactionMetadata.cs b/src/Discord.Net.Core/Entities/Messages/ReactionMetadata.cs
new file mode 100644
index 000000000..005276202
--- /dev/null
+++ b/src/Discord.Net.Core/Entities/Messages/ReactionMetadata.cs
@@ -0,0 +1,11 @@
+namespace Discord
+{
+    public struct ReactionMetadata
+    {
+        /// <summary> Gets the number of reactions </summary>
+        public int ReactionCount { get; internal set; }
+
+        /// <summary> Returns true if the current user has used this reaction </summary>
+        public bool IsMe { get; internal set; }
+    }
+}
diff --git a/src/Discord.Net.Rest/Entities/Messages/RestUserMessage.cs b/src/Discord.Net.Rest/Entities/Messages/RestUserMessage.cs
index ee806dbc1..a9197188e 100644
--- a/src/Discord.Net.Rest/Entities/Messages/RestUserMessage.cs
+++ b/src/Discord.Net.Rest/Entities/Messages/RestUserMessage.cs
@@ -29,7 +29,7 @@ namespace Discord.Rest
         public override IReadOnlyCollection<ulong> MentionedRoleIds => MessageHelper.FilterTagsByKey(TagType.RoleMention, _tags);
         public override IReadOnlyCollection<RestUser> MentionedUsers => MessageHelper.FilterTagsByValue<RestUser>(TagType.UserMention, _tags);
         public override IReadOnlyCollection<ITag> Tags => _tags;
-        public IReadOnlyDictionary<Emoji, int> Reactions => _reactions.ToDictionary(x => x.Emoji, x => x.Count);
+        public IReadOnlyDictionary<Emoji, ReactionMetadata> Reactions => _reactions.ToDictionary(x => x.Emoji, x => new ReactionMetadata { ReactionCount = x.Count, IsMe = x.Me });
 
         internal RestUserMessage(BaseDiscordClient discord, ulong id, IMessageChannel channel, IUser author)
             : base(discord, id, channel, author)
diff --git a/src/Discord.Net.Rpc/Entities/Messages/RpcUserMessage.cs b/src/Discord.Net.Rpc/Entities/Messages/RpcUserMessage.cs
index 240290fab..23d277dd9 100644
--- a/src/Discord.Net.Rpc/Entities/Messages/RpcUserMessage.cs
+++ b/src/Discord.Net.Rpc/Entities/Messages/RpcUserMessage.cs
@@ -29,7 +29,7 @@ namespace Discord.Rpc
         public override IReadOnlyCollection<ulong> MentionedRoleIds => MessageHelper.FilterTagsByKey(TagType.RoleMention, _tags);
         public override IReadOnlyCollection<ulong> MentionedUserIds => MessageHelper.FilterTagsByKey(TagType.UserMention, _tags);
         public override IReadOnlyCollection<ITag> Tags => _tags;
-        public IReadOnlyDictionary<Emoji, int> Reactions => ImmutableDictionary.Create<Emoji, int>();
+        public IReadOnlyDictionary<Emoji, ReactionMetadata> Reactions => ImmutableDictionary.Create<Emoji, ReactionMetadata>();
 
         internal RpcUserMessage(DiscordRpcClient discord, ulong id, RestVirtualMessageChannel channel, RpcUser author)
             : base(discord, id, channel, author)
diff --git a/src/Discord.Net.WebSocket/Entities/Messages/SocketUserMessage.cs b/src/Discord.Net.WebSocket/Entities/Messages/SocketUserMessage.cs
index e1a6853e2..93085234e 100644
--- a/src/Discord.Net.WebSocket/Entities/Messages/SocketUserMessage.cs
+++ b/src/Discord.Net.WebSocket/Entities/Messages/SocketUserMessage.cs
@@ -30,7 +30,7 @@ namespace Discord.WebSocket
         public override IReadOnlyCollection<SocketGuildChannel> MentionedChannels => MessageHelper.FilterTagsByValue<SocketGuildChannel>(TagType.ChannelMention, _tags);
         public override IReadOnlyCollection<SocketRole> MentionedRoles => MessageHelper.FilterTagsByValue<SocketRole>(TagType.RoleMention, _tags);
         public override IReadOnlyCollection<SocketUser> MentionedUsers => MessageHelper.FilterTagsByValue<SocketUser>(TagType.UserMention, _tags);
-        public IReadOnlyDictionary<Emoji, int> Reactions => _reactions.GroupBy(r => r.Emoji).ToDictionary(x => x.Key, x => x.Count());
+        public IReadOnlyDictionary<Emoji, ReactionMetadata> Reactions => _reactions.GroupBy(r => r.Emoji).ToDictionary(x => x.Key, x => new ReactionMetadata { ReactionCount = x.Count(), IsMe = x.Any(y => y.UserId == Discord.CurrentUser.Id) });
 
         internal SocketUserMessage(DiscordSocketClient discord, ulong id, ISocketMessageChannel channel, SocketUser author)
             : base(discord, id, channel, author)