From 7b442623462f7718f65fc9f30cd2a3fb3463caa3 Mon Sep 17 00:00:00 2001 From: Gavin Wainwright Date: Wed, 28 Jun 2017 19:43:26 -0400 Subject: [PATCH] Destructure certain imports (#1634) --- src/client/Client.js | 4 ++-- src/client/voice/VoiceConnection.js | 2 +- src/client/voice/VoiceUDPClient.js | 2 +- src/client/voice/VoiceWebSocket.js | 2 +- src/client/voice/receiver/VoiceReadable.js | 2 +- src/client/voice/receiver/VoiceReceiver.js | 2 +- src/client/websocket/WebSocketManager.js | 2 +- src/sharding/ShardingManager.js | 2 +- src/structures/Guild.js | 2 +- src/structures/GuildMember.js | 2 +- src/structures/User.js | 2 +- src/structures/interfaces/Collector.js | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/client/Client.js b/src/client/Client.js index 88d770252..dac538593 100644 --- a/src/client/Client.js +++ b/src/client/Client.js @@ -1,5 +1,5 @@ const os = require('os'); -const EventEmitter = require('events').EventEmitter; +const EventEmitter = require('events'); const Constants = require('../util/Constants'); const Permissions = require('../util/Permissions'); const Util = require('../util/Util'); @@ -11,7 +11,7 @@ const ClientVoiceManager = require('./voice/ClientVoiceManager'); const WebSocketManager = require('./websocket/WebSocketManager'); const ActionsManager = require('./actions/ActionsManager'); const Collection = require('../util/Collection'); -const Presence = require('../structures/Presence').Presence; +const { Presence } = require('../structures/Presence'); const VoiceRegion = require('../structures/VoiceRegion'); const Webhook = require('../structures/Webhook'); const User = require('../structures/User'); diff --git a/src/client/voice/VoiceConnection.js b/src/client/voice/VoiceConnection.js index 0c4af468c..562d4211d 100644 --- a/src/client/voice/VoiceConnection.js +++ b/src/client/voice/VoiceConnection.js @@ -4,7 +4,7 @@ const Util = require('../../util/Util'); const Constants = require('../../util/Constants'); const AudioPlayer = require('./player/AudioPlayer'); const VoiceReceiver = require('./receiver/VoiceReceiver'); -const EventEmitter = require('events').EventEmitter; +const EventEmitter = require('events'); const Prism = require('prism-media'); const { Error } = require('../../errors'); diff --git a/src/client/voice/VoiceUDPClient.js b/src/client/voice/VoiceUDPClient.js index 6e12d5e7b..04245f60b 100644 --- a/src/client/voice/VoiceUDPClient.js +++ b/src/client/voice/VoiceUDPClient.js @@ -1,7 +1,7 @@ const udp = require('dgram'); const dns = require('dns'); const Constants = require('../../util/Constants'); -const EventEmitter = require('events').EventEmitter; +const EventEmitter = require('events'); const { Error } = require('../../errors'); /** diff --git a/src/client/voice/VoiceWebSocket.js b/src/client/voice/VoiceWebSocket.js index 025c23ecc..4184a22ad 100644 --- a/src/client/voice/VoiceWebSocket.js +++ b/src/client/voice/VoiceWebSocket.js @@ -1,6 +1,6 @@ const Constants = require('../../util/Constants'); const SecretKey = require('./util/SecretKey'); -const EventEmitter = require('events').EventEmitter; +const EventEmitter = require('events'); const { Error } = require('../../errors'); let WebSocket; diff --git a/src/client/voice/receiver/VoiceReadable.js b/src/client/voice/receiver/VoiceReadable.js index d34942802..b29d37aad 100644 --- a/src/client/voice/receiver/VoiceReadable.js +++ b/src/client/voice/receiver/VoiceReadable.js @@ -1,4 +1,4 @@ -const Readable = require('stream').Readable; +const { Readable } = require('stream'); class VoiceReadable extends Readable { constructor() { diff --git a/src/client/voice/receiver/VoiceReceiver.js b/src/client/voice/receiver/VoiceReceiver.js index e57a39d9c..6f2f5722b 100644 --- a/src/client/voice/receiver/VoiceReceiver.js +++ b/src/client/voice/receiver/VoiceReceiver.js @@ -1,4 +1,4 @@ -const EventEmitter = require('events').EventEmitter; +const EventEmitter = require('events'); const secretbox = require('../util/Secretbox'); const Readable = require('./VoiceReadable'); const OpusEncoders = require('../opus/OpusEngineList'); diff --git a/src/client/websocket/WebSocketManager.js b/src/client/websocket/WebSocketManager.js index aabea1d9b..8f120b975 100644 --- a/src/client/websocket/WebSocketManager.js +++ b/src/client/websocket/WebSocketManager.js @@ -1,4 +1,4 @@ -const EventEmitter = require('events').EventEmitter; +const EventEmitter = require('events'); const Constants = require('../../util/Constants'); const WebSocketConnection = require('./WebSocketConnection'); diff --git a/src/sharding/ShardingManager.js b/src/sharding/ShardingManager.js index bfae42f22..8c16096e7 100644 --- a/src/sharding/ShardingManager.js +++ b/src/sharding/ShardingManager.js @@ -1,6 +1,6 @@ const path = require('path'); const fs = require('fs'); -const EventEmitter = require('events').EventEmitter; +const EventEmitter = require('events'); const Shard = require('./Shard'); const Collection = require('../util/Collection'); const Util = require('../util/Util'); diff --git a/src/structures/Guild.js b/src/structures/Guild.js index 0cc5cab07..491d3d5ea 100644 --- a/src/structures/Guild.js +++ b/src/structures/Guild.js @@ -5,7 +5,7 @@ const Emoji = require('./Emoji'); const Invite = require('./Invite'); const GuildAuditLogs = require('./GuildAuditLogs'); const Webhook = require('./Webhook'); -const Presence = require('./Presence').Presence; +const { Presence } = require('./Presence'); const GuildMember = require('./GuildMember'); const VoiceRegion = require('./VoiceRegion'); const Constants = require('../util/Constants'); diff --git a/src/structures/GuildMember.js b/src/structures/GuildMember.js index 92969e493..4474e0a0c 100644 --- a/src/structures/GuildMember.js +++ b/src/structures/GuildMember.js @@ -2,7 +2,7 @@ const TextBasedChannel = require('./interfaces/TextBasedChannel'); const Role = require('./Role'); const Permissions = require('../util/Permissions'); const Collection = require('../util/Collection'); -const Presence = require('./Presence').Presence; +const { Presence } = require('./Presence'); const { Error } = require('../errors'); /** diff --git a/src/structures/User.js b/src/structures/User.js index 0b85875a2..d01ebd138 100644 --- a/src/structures/User.js +++ b/src/structures/User.js @@ -1,6 +1,6 @@ const TextBasedChannel = require('./interfaces/TextBasedChannel'); const Constants = require('../util/Constants'); -const Presence = require('./Presence').Presence; +const { Presence } = require('./Presence'); const UserProfile = require('./UserProfile'); const Snowflake = require('../util/Snowflake'); diff --git a/src/structures/interfaces/Collector.js b/src/structures/interfaces/Collector.js index 287256ebe..77fe507c0 100644 --- a/src/structures/interfaces/Collector.js +++ b/src/structures/interfaces/Collector.js @@ -1,5 +1,5 @@ const Collection = require('../../util/Collection'); -const EventEmitter = require('events').EventEmitter; +const EventEmitter = require('events'); /** * Filter to be applied to the collector.