Upstream Update (premiumSince)

lib/Client.js

@@ -469,6 +469,7 @@ class Client extends EventEmitter {
     * @arg {Boolean} [options.nsfw] The nsfw status of the channel
     * @arg {String?} [options.parentID] The ID of the parent category channel for this channel
     * @arg {Array} [options.permissionOverwrites] An array containing permission overwrite objects
+    * @arg {Number} [options.position] The sorting position of the channel
     * @arg {Number} [options.rateLimitPerUser] The time in seconds a user has to wait before sending another message (does not affect bots or users with manageMessages/manageChannel permissions) (text channels only)
     * @arg {String} [options.reason] The reason to be displayed in audit logs
     * @arg {String} [options.topic] The topic of the channel (text channels only)
@@ -497,6 +498,7 @@ class Client extends EventEmitter {
             nsfw: options.nsfw,
             parent_id: options.parentID,
             permission_overwrites: options.permissionOverwrites,
+            position: options.position,
             rate_limit_per_user: options.rateLimitPerUser,
             reason: options.reason,
             topic: options.topic,
@@ -564,6 +566,7 @@ class Client extends EventEmitter {
                 }
             }
         }
+        command.default_permission = command.defaultPermission;
         return this.requestHandler.request("POST", Endpoints.COMMANDS(this.application.id), true, command);
     }
 
@@ -633,6 +636,7 @@ class Client extends EventEmitter {
                 }
             }
         }
+        command.default_permission = command.defaultPermission;
         return this.requestHandler.request("POST", Endpoints.GUILD_COMMANDS(this.application.id, guildID), true, command);
     }
 
@@ -1089,7 +1093,7 @@ class Client extends EventEmitter {
             return Promise.resolve();
         }
         if(messageIDs.length === 1) {
-            return this.deleteMessage(channelID, messageIDs[0]);
+            return this.deleteMessage(channelID, messageIDs[0], reason);
         }
 
         const oldestAllowedSnowflake = (Date.now() - 1421280000000) * 4194304;
@@ -1102,7 +1106,7 @@ class Client extends EventEmitter {
             return this.requestHandler.request("POST", Endpoints.CHANNEL_BULK_DELETE(channelID), true, {
                 messages: messageIDs.splice(0, 100),
                 reason: reason
-            }).then(() => this.deleteMessages(channelID, messageIDs));
+            }).then(() => this.deleteMessages(channelID, messageIDs, reason));
         }
         return this.requestHandler.request("POST", Endpoints.CHANNEL_BULK_DELETE(channelID), true, {
             messages: messageIDs,
@@ -1237,6 +1241,7 @@ class Client extends EventEmitter {
     * @arg {Boolean} [options.nsfw] The nsfw status of the channel (guild channels only)
     * @arg {String} [options.ownerID] The ID of the channel owner (group channels only)
     * @arg {String?} [options.parentID] The ID of the parent channel category for this channel (guild text/voice channels only)
+    * @arg {Number} [options.position] The sorting position of the channel (guild channels only)
     * @arg {Number} [options.rateLimitPerUser] The time in seconds a user has to wait before sending another message (does not affect bots or users with manageMessages/manageChannel permissions) (guild text and thread channels only)
     * @arg {String?} [options.rtcRegion] The RTC region ID of the channel (automatic if `null`) (guild voice channels only)
     * @arg {String} [options.topic] The topic of the channel (guild text channels only)
@@ -1258,6 +1263,7 @@ class Client extends EventEmitter {
             nsfw: options.nsfw,
             owner_id: options.ownerID,
             parent_id: options.parentID,
+            position: options.position,
             rate_limit_per_user: options.rateLimitPerUser,
             rtc_region: options.rtcRegion,
             topic: options.topic,
@@ -1350,6 +1356,7 @@ class Client extends EventEmitter {
                 }
             }
         }
+        command.default_permission = command.defaultPermission;
         return this.requestHandler.request("PATCH", Endpoints.COMMAND(this.application.id, commandID), true, command);
     }
 
@@ -1442,6 +1449,7 @@ class Client extends EventEmitter {
                 }
             }
         }
+        command.default_permission = command.defaultPermission;
         return this.requestHandler.request("PATCH", Endpoints.GUILD_COMMAND(this.application.id, guildID, commandID), true, command);
     }
 
@@ -1503,6 +1511,7 @@ class Client extends EventEmitter {
     * @arg {String} memberID The ID of the member (you can use "@me" if you are only editing the bot user's nickname)
     * @arg {Object} options The properties to edit
     * @arg {String?} [options.channelID] The ID of the voice channel to move the member to (must be in voice). Set to `null` to disconnect the member
+    * @arg {Date?} [options.communicationDisabledUntil] When the user's timeout should expire. Set to `null` to instantly remove timeout
     * @arg {Boolean} [options.deaf] Server deafen the member
     * @arg {Boolean} [options.mute] Server mute the member
     * @arg {String} [options.nick] Set the member's server nickname, "" to remove
@@ -1517,6 +1526,7 @@ class Client extends EventEmitter {
             mute: options.mute,
             deaf: options.deaf,
             channel_id: options.channelID,
+            communication_disabled_until: options.communicationDisabledUntil,
             reason: reason
         }).then((member) => new Member(member, this.guilds.get(guildID), this));
     }
@@ -1561,7 +1571,7 @@ class Client extends EventEmitter {
         });
     }
     /**
-    * Update a user's voice state - See [caveats](https://discord.com/developers/docs/resources/guild#update-others-voice-state-caveats)
+    * Update a user's voice state - See [caveats](https://discord.com/developers/docs/resources/guild#modify-user-voice-state-caveats)
     * @arg {String} guildID The ID of the guild
     * @arg {Object} options The properties to edit
     * @arg {String} options.channelID The ID of the channel the user is currently in
@@ -1846,8 +1856,7 @@ class Client extends EventEmitter {
     * @arg {Array | Object} [activities] Sets the bot's activities. A single activity object is also accepted for backwards compatibility
     * @arg {String} activities[].name The name of the activity
     * @arg {Number} activities[].type The type of the activity. 0 is playing, 1 is streaming (Twitch only), 2 is listening, 3 is watching, 5 is competing in
-    * @arg {Number} [activities[].url] The URL of the activity
-    * @arg {String} [game.url] Sets the url of the shard's active game
+    * @arg {String} [activities[].url] The URL of the activity
     */
     editStatus(status, activities) {
         if(activities === undefined && typeof status === "object") {

lib/Constants.js

@@ -381,7 +381,8 @@ const Permissions = {
     createPrivateThreads:    1n << 36n,
     useExternalStickers:     1n << 37n,
     sendMessagesInThreads:   1n << 38n,
-    startEmbeddedActivities: 1n << 39n
+    startEmbeddedActivities: 1n << 39n,
+    moderateMembers:         1n << 40n
 };
 Permissions.allGuild = Permissions.kickMembers
     | Permissions.banMembers
@@ -394,7 +395,9 @@ Permissions.allGuild = Permissions.kickMembers
     | Permissions.manageNicknames
     | Permissions.manageRoles
     | Permissions.manageWebhooks
-    | Permissions.manageEmojisAndStickers;
+    | Permissions.manageEmojisAndStickers
+    | Permissions.manageEvents
+    | Permissions.moderateMembers;
 Permissions.allText = Permissions.createInstantInvite
     | Permissions.manageChannels
     | Permissions.addReactions
@@ -410,6 +413,7 @@ Permissions.allText = Permissions.createInstantInvite
     | Permissions.manageRoles
     | Permissions.manageWebhooks
     | Permissions.useApplicationCommands
+    | Permissions.manageThreads
     | Permissions.createPublicThreads
     | Permissions.createPrivateThreads
     | Permissions.useExternalStickers

lib/gateway/Shard.js

@@ -140,6 +140,7 @@ class Shard extends EventEmitter {
         }
 
         if(this.ws.readyState !== WebSocket.CLOSED) {
+            this.ws.removeListener("message", this._onWSMessage);
             this.ws.removeListener("close", this._onWSClose);
             try {
                 if(options.reconnect && this.sessionID) {
@@ -213,7 +214,7 @@ class Shard extends EventEmitter {
     * @arg {Array | Object} [activities] Sets the bot's activities. A single activity object is also accepted for backwards compatibility
     * @arg {String} activities[].name The name of the activity
     * @arg {Number} activities[].type The type of the activity. 0 is playing, 1 is streaming (Twitch only), 2 is listening, 3 is watching, 5 is competing in
-    * @arg {Number} [activities[].url] The URL of the activity
+    * @arg {String} [activities[].url] The URL of the activity
     */
     editStatus(status, activities) {
         if(activities === undefined && typeof status === "object") {
@@ -278,7 +279,7 @@ class Shard extends EventEmitter {
         this.heartbeatInterval = null;
         this.guildCreateTimeout = null;
         this.globalBucket = new Bucket(120, 60000, {reservedTokens: 5});
-        this.presenceUpdateBucket = new Bucket(5, 60000);
+        this.presenceUpdateBucket = new Bucket(5, 20000);
         this.presence = JSON.parse(JSON.stringify(this.client.presence)); // Fast copy
         Object.defineProperty(this, "_token", {
             configurable: true,
@@ -620,7 +621,7 @@ class Shard extends EventEmitter {
                         * Fired when a user's avatar, discriminator or username changes
                         * @event Client#userUpdate
                         * @prop {User} user The updated user
-                        * @prop {Object?} oldUser The old user data
+                        * @prop {Object?} oldUser The old user data. If the user was uncached, this will be null
                         * @prop {String} oldUser.username The username of the user
                         * @prop {String} oldUser.discriminator The discriminator of the user
                         * @prop {String?} oldUser.avatar The hash of the user's avatar, or null if no avatar
@@ -1144,6 +1145,7 @@ class Shard extends EventEmitter {
                 if(member) {
                     oldMember = {
                         avatar: member.avatar,
+                        communicationDisabledUntil: member.communicationDisabledUntil,
                         roles: member.roles,
                         nick: member.nick,
                         premiumSince: member.premiumSince,
@@ -1158,6 +1160,7 @@ class Shard extends EventEmitter {
                 * @prop {Member} member The updated member
                 * @prop {Object?} oldMember The old member data, or null if the member wasn't cached
                 * @prop {String?} oldMember.avatar The hash of the member's guild avatar, or null if no guild avatar
+                * @prop {Number?} communicationDisabledUntil Timestamp of previous timeout expiry. If `null`, the member was not timed out
                 * @prop {Array<String>} oldMember.roles An array of role IDs this member is a part of
                 * @prop {String?} oldMember.nick The server nickname of the member
                 * @prop {Number} oldMember.premiumSince Timestamp of when the member boosted the guild
@@ -1956,13 +1959,17 @@ class Shard extends EventEmitter {
                 break;
             }
             case "USER_UPDATE": {
-                const user = this.client.users.get(packet.d.id);
-                const oldUser = {
-                    username: user.username,
-                    discriminator: user.discriminator,
-                    avatar: user.avatar
-                };
-                this.emit("userUpdate", user.update(packet.d), oldUser);
+                let user = this.client.users.get(packet.d.id);
+                let oldUser = null;
+                if(user) {
+                    oldUser = {
+                        username: user.username,
+                        discriminator: user.discriminator,
+                        avatar: user.avatar
+                    };
+                }
+                user = this.client.users.update(packet.d, this.client);
+                this.emit("userUpdate", user, oldUser);
                 break;
             }
             case "RELATIONSHIP_ADD": {
@@ -2243,8 +2250,10 @@ class Shard extends EventEmitter {
                         m.member.id = m.member.user.id;
                         const guild = this.client.guilds.get(packet.d.guild_id);
                         if(guild) {
-                            guild.members.update(m.presence, guild);
-                            guild.members.update(m.member);
+                            if(m.presence) {
+                                guild.members.update(m.presence, guild);
+                            }
+                            guild.members.update(m.member, guild);
                         }
                         return channel.members.update(m, this.client);
                     });

lib/structures/CommandInteraction.js

@@ -217,7 +217,7 @@ class CommandInteraction extends Interaction {
     */
     async createMessage(content, file) {
         if(this.acknowledged === true) {
-            return this.createFollowup(content);
+            return this.createFollowup(content, file);
         }
         if(content !== undefined) {
             if(typeof content !== "object" || content === null) {

lib/structures/ComponentInteraction.js

@@ -150,7 +150,7 @@ class ComponentInteraction extends Interaction {
     */
     async createMessage(content, file) {
         if(this.acknowledged === true) {
-            return this.createFollowup(content);
+            return this.createFollowup(content, file);
         }
         if(content !== undefined) {
             if(typeof content !== "object" || content === null) {

lib/structures/Guild.js

@@ -81,7 +81,7 @@ class Guild extends Base {
     constructor(data, client) {
         super(data.id);
         this._client = client;
-        this.shard = client.shards.get(client.guildShardMap[this.id] || (Base.getDiscordEpoch(data.id) % client.options.lastShardID) || 0);
+        this.shard = client.shards.get(client.guildShardMap[this.id] || (Base.getDiscordEpoch(data.id) % client.options.maxShards) || 0);
         this.unavailable = !!data.unavailable;
         this.joinedAt = Date.parse(data.joined_at);
         this.voiceStates = new Collection(VoiceState);
@@ -393,6 +393,7 @@ class Guild extends Base {
     * @arg {Boolean} [options.nsfw] The nsfw status of the channel
     * @arg {String?} [options.parentID] The ID of the parent category channel for this channel
     * @arg {Array} [options.permissionOverwrites] An array containing permission overwrite objects
+    * @arg {Number} [options.position] The sorting position of the channel
     * @arg {Number} [options.rateLimitPerUser] The time in seconds a user has to wait before sending another message (does not affect bots or users with manageMessages/manageChannel permissions) (text channels only)
     * @arg {String} [options.reason] The reason to be displayed in audit logs
     * @arg {String} [options.topic] The topic of the channel (text channels only)
@@ -685,6 +686,7 @@ class Guild extends Base {
     * @arg {String} memberID The ID of the member (use "@me" to edit the current bot user)
     * @arg {Object} options The properties to edit
     * @arg {String?} [options.channelID] The ID of the voice channel to move the member to (must be in voice). Set to `null` to disconnect the member
+    * @arg {Date?} [options.communicationDisabledUntil] When the user's timeout should expire. Set to `null` to instantly remove timeout
     * @arg {Boolean} [options.deaf] Server deafen the member
     * @arg {Boolean} [options.mute] Server mute the member
     * @arg {String} [options.nick] Set the member's guild nickname, "" to remove
@@ -759,7 +761,7 @@ class Guild extends Base {
     }
 
     /**
-    * Update a user's voice state - See [caveats](https://discord.com/developers/docs/resources/guild#update-others-voice-state-caveats)
+    * Update a user's voice state - See [caveats](https://discord.com/developers/docs/resources/guild#modify-user-voice-state-caveats)
     * @arg {Object} options The properties to edit
     * @arg {String} options.channelID The ID of the channel the user is currently in
     * @arg {Date?} [options.requestToSpeakTimestamp] Sets the user's request to speak - this can only be used when the `userID` param is "@me"

lib/structures/GuildChannel.js

@@ -73,18 +73,19 @@ class GuildChannel extends Channel {
     * @arg {Object} options The properties to edit
     * @arg {Boolean} [options.archived] The archive status of the channel (thread channels only)
     * @arg {Number} [options.autoArchiveDuration] The duration in minutes to automatically archive the thread after recent activity, either 60, 1440, 4320 or 10080 (thread channels only)
+    * @arg {Number} [options.bitrate] The bitrate of the channel (guild voice channels only)
     * @arg {Number?} [options.defaultAutoArchiveDuration] The default duration of newly created threads in minutes to automatically archive the thread after inactivity (60, 1440, 4320, 10080) (guild text/news channels only)
     * @arg {Boolean} [options.invitable] Whether non-moderators can add other non-moderators to the channel (private thread channels only)
     * @arg {Boolean} [options.locked] The lock status of the channel (thread channels only)
     * @arg {String} [options.name] The name of the channel
+    * @arg {Boolean} [options.nsfw] The nsfw status of the channel
+    * @arg {Number?} [options.parentID] The ID of the parent channel category for this channel (guild text/voice channels only) or the channel ID where the thread originated from (thread channels only)
+    * @arg {Number} [options.position] The sorting position of the channel
+    * @arg {Number} [options.rateLimitPerUser] The time in seconds a user has to wait before sending another message (does not affect bots or users with manageMessages/manageChannel permissions) (guild text and thread channels only)
+    * @arg {String?} [options.rtcRegion] The RTC region ID of the channel (automatic if `null`) (guild voice channels only)
     * @arg {String} [options.topic] The topic of the channel (guild text channels only)
-    * @arg {Number} [options.bitrate] The bitrate of the channel (guild voice channels only)
     * @arg {Number} [options.userLimit] The channel user limit (guild voice channels only)
     * @arg {Number} [options.videoQualityMode] The camera video quality mode of the channel (guild voice channels only). `1` is auto, `2` is 720p
-    * @arg {Number} [options.rateLimitPerUser] The time in seconds a user has to wait before sending another message (does not affect bots or users with manageMessages/manageChannel permissions) (guild text and thread channels only)
-    * @arg {String?} [options.rtcRegion] The RTC region ID of the channel (automatic if `null`) (guild voice channels only)
-    * @arg {Boolean} [options.nsfw] The nsfw status of the channel
-    * @arg {Number?} [options.parentID] The ID of the parent channel category for this channel (guild text/voice channels only) or the channel ID where the thread originated from (thread channels only)
     * @arg {String} [reason] The reason to be displayed in audit logs
     * @returns {Promise<CategoryChannel | GroupChannel | TextChannel | VoiceChannel | NewsChannel | NewsThreadChannel | PrivateThreadChannel | PublicThreadChannel>}
     */

lib/structures/Interaction.js

@@ -43,7 +43,7 @@ class Interaction extends Base {
             }
         }
 
-        this._client.emit("warn", new Error(`Unknown interaction type: ${data.type}\n${JSON.stringify(data)}`));
+        client.emit("warn", new Error(`Unknown interaction type: ${data.type}\n${JSON.stringify(data)}`));
         return new UnknownInteraction(data, client);
     }
 }