Code linting

Turns out object initializer spread is, in fact, part of ES2018. Turns out Node 8 does not, in fact, support ES2018.
abalabahaha · Jun 10, 2019 · 836a041 · 836a041
1 parent 3a500d8
commit 836a041
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/lib/Client.js b/lib/Client.js
@@ -92,7 +92,7 @@ class Client extends EventEmitter {
     constructor(token, options) {
         super();
 
-        this.options = {
+        this.options = Object.assign({
             autoreconnect: true,
             compress: false,
             connectionTimeout: 30000,
@@ -113,9 +113,8 @@ class Client extends EventEmitter {
             restMode: false,
             seedVoiceConnections: false,
             ws: {},
-            agent: null,
-            ...options
-        };
+            agent: null
+        }, options);
         if(this.options.lastShardID === undefined && this.options.maxShards !== "auto") {
             this.options.lastShardID = this.options.maxShards - 1;
         }

diff --git a/lib/command/CommandClient.js b/lib/command/CommandClient.js
@@ -28,7 +28,7 @@ class CommandClient extends Client {
     */
     constructor(token, options, commandOptions) {
         super(token, options);
-        this.commandOptions = {
+        this.commandOptions = Object.assign({
             defaultHelpCommand: true,
             description: "An Eris-based Discord bot",
             ignoreBots: true,
@@ -37,8 +37,7 @@ class CommandClient extends Client {
             owner: "an unknown user",
             prefix: "@mention ",
             defaultCommandOptions: {},
-            ...commandOptions
-        };
+        }, commandOptions);
         this.guildPrefixes = {};
         this.commands = {};
         this.commandAliases = {};

diff --git a/lib/gateway/Shard.js b/lib/gateway/Shard.js
@@ -908,7 +908,7 @@ class Shard extends EventEmitter {
                 break;
             }
             case "CHANNEL_UPDATE": {
-                const channel = this.client.getChannel(packet.d.id);
+                let channel = this.client.getChannel(packet.d.id);
                 if(!channel) {
                     break;
                 }
@@ -939,7 +939,7 @@ class Shard extends EventEmitter {
                         rateLimitPerUser: channel.rateLimitPerUser
                     };
                 }
-                let oldType = channel.type;
+                const oldType = channel.type;
                 channel.update(packet.d);
                 if(oldType !== packet.d.type) {
                     this.emit("warn", `Channel ${packet.d.id} changed from type ${oldType} to ${packet.d.type}`);