Merge remote-tracking branch 'origin/11.3.1-dev' into 11.3-dev

package.json

@@ -49,7 +49,7 @@
   },
   "devDependencies": {
     "@types/node": "^8.5.7",
-    "discord.js-docgen": "hydrabolt/discord.js-docgen",
+    "discord.js-docgen": "discordjs/discord.js-docgen",
     "eslint": "^4.15.0",
     "parallel-webpack": "^2.2.0",
     "uglifyjs-webpack-plugin": "^1.1.6",

src/client/rest/RESTMethods.js

@@ -260,7 +260,7 @@ class RESTMethods {
         if (allow instanceof Array) allow = Permissions.resolve(allow);
         if (deny instanceof Array) deny = Permissions.resolve(deny);
 
-        const role = this.client.resolver.resolveRole(this, overwrite.id);
+        const role = this.client.resolver.resolveRole(guild, overwrite.id);
         if (role) {
           overwrite.id = role.id;
           overwrite.type = 'role';

src/structures/ClientUser.js

@@ -271,7 +271,7 @@ class ClientUser extends User {
    * @returns {Promise<Presence>}
    */
   setActivity(name, { url, type } = {}) {
-    if (!name) return this.setPresence({ activity: null });
+    if (!name) return this.setPresence({ game: null });
     return this.setPresence({
       game: { name, type, url },
     });