Lint, add recent props to toJSON()

abalabahaha · Apr 4, 2021 · ff8d901 · ff8d901
1 parent 39dd05f
commit ff8d901
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 22 deletions.
diff --git a/lib/Client.js b/lib/Client.js
@@ -2522,31 +2522,31 @@ class Client extends EventEmitter {
 
     toJSON(props = []) {
         return Base.prototype.toJSON.call(this, [
-            "options",
-            "requestHandler",
-            "ready",
+            "application",
             "bot",
-            "startTime",
-            "lastConnect",
             "channelGuildMap",
-            "shards",
             "gatewayURL",
             "groupChannels",
             "guilds",
+            "guildShardMap",
+            "lastConnect",
+            "lastReconnectDelay",
+            "notes",
+            "options",
+            "presence",
             "privateChannelMap",
             "privateChannels",
-            "guildShardMap",
-            "unavailableGuilds",
+            "ready",
+            "reconnectAttempts",
             "relationships",
-            "users",
-            "presence",
+            "requestHandler",
+            "shards",
+            "startTime",
+            "unavailableGuilds",
             "userGuildSettings",
+            "users",
             "userSettings",
-            "notes",
             "voiceConnections",
-            "lastReconnectDelay",
-            "reconnectAttempts",
-            "application",
             ...props
         ]);
     }

diff --git a/lib/gateway/Shard.js b/lib/gateway/Shard.js
@@ -15,7 +15,7 @@ const User = require("../structures/User");
 const Invite = require("../structures/Invite");
 const Constants = require("../Constants");
 
-let WebSocket = typeof window !== "undefined" ? require("../util/BrowserWebSocket") : require("ws");
+const WebSocket = typeof window !== "undefined" ? require("../util/BrowserWebSocket") : require("ws");
 
 let EventEmitter;
 try {
@@ -141,7 +141,7 @@ class Shard extends EventEmitter {
             try {
                 if(options.reconnect && this.sessionID) {
                     if(this.ws.readyState === WebSocket.OPEN) {
-                        this.ws.close(4901, "Eris: reconnect")
+                        this.ws.close(4901, "Eris: reconnect");
                     } else {
                         this.emit("debug", `Terminating websocket (state: ${this.ws.readyState})`, this.id);
                         this.ws.terminate();

diff --git a/lib/structures/Guild.js b/lib/structures/Guild.js
@@ -968,6 +968,7 @@ class Guild extends Base {
             "vanityURL",
             "verificationLevel",
             "voiceStates",
+            "welcomeScreen",
             "widgetChannelID",
             "widgetEnabled",
             ...props

diff --git a/lib/structures/GuildAuditLogEntry.js b/lib/structures/GuildAuditLogEntry.js
@@ -68,7 +68,7 @@ class GuildAuditLogEntry extends Base {
             if(data.options.channel_id) {
                 this.channel = guild.channels.get(data.options.channel_id);
                 if(data.options.message_id) {
-                    this.message = this.channel.messages.get(data.options.message_id) || {id: data.options.message_id};
+                    this.message = this.channel && this.channel.messages.get(data.options.message_id) || {id: data.options.message_id};
                 }
             }
             if(data.options.delete_member_days) {

diff --git a/lib/structures/GuildIntegration.js b/lib/structures/GuildIntegration.js
@@ -82,11 +82,13 @@ class GuildIntegration extends Base {
     toJSON(props = []) {
         return super.toJSON([
             "account",
+            "application",
             "enabled",
             "enableEmoticons",
             "expireBehavior",
             "expireGracePeriod",
             "name",
+            "revoked",
             "roleID",
             "subscriberCount",
             "syncedAt",

diff --git a/lib/structures/Member.js b/lib/structures/Member.js
@@ -27,7 +27,7 @@ const VoiceState = require("./VoiceState");
 * @prop {Number} joinedAt Timestamp of when the member joined the guild
 * @prop {String} mention A string that mentions the member
 * @prop {String?} nick The server nickname of the member
-* @prop {Boolean} [pending] Whether the member has passed the guild's Membership Screening requirements
+* @prop {Boolean?} pending Whether the member has passed the guild's Membership Screening requirements
 * @prop {Permission} permission [DEPRECATED] The guild-wide permissions of the member. Use Member#permissions instead
 * @prop {Permission} permissions The guild-wide permissions of the member
 * @prop {Number} premiumSince Timestamp of when the member boosted the guild
@@ -231,6 +231,7 @@ class Member extends Base {
             "game",
             "joinedAt",
             "nick",
+            "pending",
             "premiumSince",
             "roles",
             "status",

diff --git a/lib/structures/Message.js b/lib/structures/Message.js
@@ -80,9 +80,7 @@ class Message extends Base {
             this._client.emit("error", new Error("MESSAGE_CREATE but no message author:\n" + JSON.stringify(data, null, 2)));
         }
         if(data.referenced_message) {
-            const channel = data.referenced_message.guild_id
-                ? this._client.guilds.get(data.referenced_message.guild_id).channels.get(data.referenced_message.channel_id)
-                : this._client.privateChannels.get(data.referenced_message.channel_id);
+            const channel = this._client.getChannel(data.referenced_message.channel_id);
             if(channel) {
                 this.referencedMessage = channel.messages.update(data.referenced_message, this._client);
             } else {
@@ -472,6 +470,7 @@ class Message extends Base {
             "reactions",
             "referencedMesssage",
             "roleMentions",
+            "stickers",
             "timestamp",
             "tts",
             "type",

diff --git a/lib/structures/StageChannel.js b/lib/structures/StageChannel.js
@@ -14,6 +14,13 @@ class StageChannel extends VoiceChannel {
             this.topic = data.topic;
         }
     }
+
+    toJSON(props = []) {
+        return super.toJSON([
+            "topic",
+            ...props
+        ]);
+    }
 }
 
 module.exports = StageChannel;
diff --git a/lib/structures/VoiceChannel.js b/lib/structures/VoiceChannel.js
@@ -81,7 +81,9 @@ class VoiceChannel extends GuildChannel {
     toJSON(props = []) {
         return super.toJSON([
             "bitrate",
+            "rtcRegion",
             "userLimit",
+            "videoQualityMode",
             "voiceMembers",
             ...props
         ]);

diff --git a/lib/structures/VoiceState.js b/lib/structures/VoiceState.js
@@ -68,6 +68,7 @@ class VoiceState extends Base {
             "channelID",
             "deaf",
             "mute",
+            "requestToSpeakTimestamp",
             "selfDeaf",
             "selfMute",
             "selfStream",

diff --git a/lib/voice/VoiceConnection.js b/lib/voice/VoiceConnection.js
@@ -9,7 +9,7 @@ const Piper = require("./Piper");
 const VoiceDataStream = require("./VoiceDataStream");
 const {createOpus} = require("../util/Opus");
 
-let WebSocket = typeof window !== "undefined" ? require("../util/BrowserWebSocket") : require("ws");
+const WebSocket = typeof window !== "undefined" ? require("../util/BrowserWebSocket") : require("ws");
 
 let EventEmitter;
 try {