Merge branch 'master' into indev-prism

This commit is contained in:
Amish Shah
2016-12-30 19:00:53 +00:00
4 changed files with 5 additions and 2 deletions

View File

@@ -642,12 +642,12 @@ class RESTMethods {
removeMessageReaction(message, emoji, user) {
let endpoint = Constants.Endpoints.selfMessageReaction(message.channel.id, message.id, emoji);
if (user.id !== this.client.user.id) {
if (user !== this.client.user.id) {
endpoint = Constants.Endpoints.userMessageReaction(message.channel.id, message.id, emoji, null, user.id);
}
return this.rest.makeRequest('delete', endpoint, true).then(() =>
this.client.actions.MessageReactionRemove.handle({
user_id: user.id,
user_id: user,
message_id: message.id,
emoji: parseEmoji(emoji),
channel_id: message.channel.id,