Merge branch 'master' into indev-prism

src/client/rest/RESTMethods.js

@@ -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,

src/structures/DMChannel.js

@@ -53,6 +53,7 @@ class DMChannel extends Channel {
   awaitMessages() { return; }
   bulkDelete() { return; }
   _cacheMessage() { return; }
+  search() { return; }
 }
 
 TextBasedChannel.applyToClass(DMChannel, true);

src/structures/GroupDMChannel.js

@@ -137,6 +137,7 @@ class GroupDMChannel extends Channel {
   awaitMessages() { return; }
   bulkDelete() { return; }
   _cacheMessage() { return; }
+  search() { return; }
 }
 
 TextBasedChannel.applyToClass(GroupDMChannel, true);

src/structures/TextChannel.js

@@ -89,6 +89,7 @@ class TextChannel extends GuildChannel {
   awaitMessages() { return; }
   bulkDelete() { return; }
   _cacheMessage() { return; }
+  search() { return; }
 }
 
 TextBasedChannel.applyToClass(TextChannel, true);