mirror of
https://github.com/danbulant/discord.js
synced 2026-05-24 20:42:27 +00:00
Merge branch 'master' into indev-prism
This commit is contained in:
commit
ac62a58f47
4 changed files with 5 additions and 2 deletions
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -53,6 +53,7 @@ class DMChannel extends Channel {
|
|||
awaitMessages() { return; }
|
||||
bulkDelete() { return; }
|
||||
_cacheMessage() { return; }
|
||||
search() { return; }
|
||||
}
|
||||
|
||||
TextBasedChannel.applyToClass(DMChannel, true);
|
||||
|
|
|
|||
|
|
@ -137,6 +137,7 @@ class GroupDMChannel extends Channel {
|
|||
awaitMessages() { return; }
|
||||
bulkDelete() { return; }
|
||||
_cacheMessage() { return; }
|
||||
search() { return; }
|
||||
}
|
||||
|
||||
TextBasedChannel.applyToClass(GroupDMChannel, true);
|
||||
|
|
|
|||
|
|
@ -89,6 +89,7 @@ class TextChannel extends GuildChannel {
|
|||
awaitMessages() { return; }
|
||||
bulkDelete() { return; }
|
||||
_cacheMessage() { return; }
|
||||
search() { return; }
|
||||
}
|
||||
|
||||
TextBasedChannel.applyToClass(TextChannel, true);
|
||||
|
|
|
|||
Loading…
Reference in a new issue