style: alphabetically organize imports

src/client/BaseClient.js

@@ -2,9 +2,9 @@
 
 require('setimmediate');
 const { EventEmitter } = require('events');
+const { DefaultOptions } = require('../util/Constants');
 const RESTManager = require('../rest/RESTManager');
 const Util = require('../util/Util');
-const { DefaultOptions } = require('../util/Constants');
 
 /**
  * The base class for all clients.

src/client/Client.js

@@ -1,24 +1,24 @@
 'use strict';
 
-const BaseClient = require('./BaseClient');
-const Permissions = require('../util/Permissions');
-const ClientVoiceManager = require('./voice/ClientVoiceManager');
-const WebSocketManager = require('./websocket/WebSocketManager');
 const ActionsManager = require('./actions/ActionsManager');
+const BaseClient = require('./BaseClient');
+const { browser, Events, DefaultOptions } = require('../util/Constants');
+const ChannelManager = require('../managers/ChannelManager');
 const Collection = require('../util/Collection');
+const ClientApplication = require('../structures/ClientApplication');
+const ClientVoiceManager = require('./voice/ClientVoiceManager');
+const DataResolver = require('../util/DataResolver');
+const { Error, RangeError, TypeError } = require('../errors');
+const GuildEmojiManager = require('../managers/GuildEmojiManager');
+const GuildManager = require('../managers/GuildManager');
+const Invite = require('../structures/Invite');
+const Permissions = require('../util/Permissions');
+const ShardClientUtil = require('../sharding/ShardClientUtil');
+const Structures = require('../util/Structures');
+const UserManager = require('../managers/UserManager');
 const VoiceRegion = require('../structures/VoiceRegion');
 const Webhook = require('../structures/Webhook');
-const Invite = require('../structures/Invite');
+const WebSocketManager = require('./websocket/WebSocketManager');
-const ClientApplication = require('../structures/ClientApplication');
-const ShardClientUtil = require('../sharding/ShardClientUtil');
-const UserManager = require('../managers/UserManager');
-const ChannelManager = require('../managers/ChannelManager');
-const GuildManager = require('../managers/GuildManager');
-const GuildEmojiManager = require('../managers/GuildEmojiManager');
-const { Events, browser, DefaultOptions } = require('../util/Constants');
-const DataResolver = require('../util/DataResolver');
-const Structures = require('../util/Structures');
-const { Error, TypeError, RangeError } = require('../errors');
 
 /**
  * The main hub for interacting with the Discord API, and the starting point for any bot.

src/client/WebhookClient.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const Webhook = require('../structures/Webhook');
 const BaseClient = require('./BaseClient');
+const Webhook = require('../structures/Webhook');
 
 /**
  * The webhook client.

src/client/actions/ChannelDelete.js

@@ -1,8 +1,8 @@
 'use strict';
 
 const Action = require('./Action');
-const { Events } = require('../../util/Constants');
 const DMChannel = require('../../structures/DMChannel');
+const { Events } = require('../../util/Constants');
 
 class ChannelDeleteAction extends Action {
   constructor(client) {

src/client/actions/InviteCreate.js

@@ -1,8 +1,8 @@
 'use strict';
 
 const Action = require('./Action');
-const Invite = require('../../structures/Invite');
 const { Events } = require('../../util/Constants');
+const Invite = require('../../structures/Invite');
 
 class InviteCreateAction extends Action {
   handle(data) {

src/client/actions/InviteDelete.js

@@ -1,8 +1,8 @@
 'use strict';
 
 const Action = require('./Action');
-const Invite = require('../../structures/Invite');
 const { Events } = require('../../util/Constants');
+const Invite = require('../../structures/Invite');
 
 class InviteDeleteAction extends Action {
   handle(data) {

src/client/actions/MessageReactionAdd.js

@@ -1,15 +1,7 @@
 'use strict';
 
 const Action = require('./Action');
-const { Events } = require('../../util/Constants');
+const { Events, PartialTypes } = require('../../util/Constants');
-const { PartialTypes } = require('../../util/Constants');
-
-/*
-{ user_id: 'id',
-     message_id: 'id',
-     emoji: { name: '<27>', id: null },
-     channel_id: 'id' } }
-*/
 
 class MessageReactionAdd extends Action {
   handle(data) {

src/client/actions/MessageReactionRemove.js

@@ -3,13 +3,6 @@
 const Action = require('./Action');
 const { Events } = require('../../util/Constants');
 
-/*
-{ user_id: 'id',
-     message_id: 'id',
-     emoji: { name: '<27>', id: null },
-     channel_id: 'id' } }
-*/
-
 class MessageReactionRemove extends Action {
   handle(data) {
     if (!data.emoji) return false;

src/client/voice/ClientVoiceManager.js

@@ -1,9 +1,9 @@
 'use strict';
 
 const Collection = require('../../util/Collection');
-const VoiceConnection = require('./VoiceConnection');
-const VoiceBroadcast = require('./VoiceBroadcast');
 const { Error } = require('../../errors');
+const VoiceBroadcast = require('./VoiceBroadcast');
+const VoiceConnection = require('./VoiceConnection');
 
 /**
  * Manages voice connections for the client

src/client/voice/VoiceBroadcast.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const { EventEmitter } = require('events');
 const BroadcastAudioPlayer = require('./player/BroadcastAudioPlayer');
+const { EventEmitter } = require('events');
 const { Events } = require('../../util/Constants');
 const PlayInterface = require('./util/PlayInterface');
 

src/client/voice/VoiceConnection.js

@@ -1,16 +1,22 @@
 'use strict';
 
-const VoiceWebSocket = require('./networking/VoiceWebSocket');
-const VoiceUDP = require('./networking/VoiceUDPClient');
-const Util = require('../../util/Util');
-const { OPCodes, VoiceOPCodes, VoiceStatus, Events } = require('../../util/Constants');
 const AudioPlayer = require('./player/AudioPlayer');
-const VoiceReceiver = require('./receiver/Receiver');
-const { EventEmitter } = require('events');
 const { Error } = require('../../errors');
+const { EventEmitter } = require('events');
+const { Events, OPCodes, VoiceOPCodes, VoiceStatus } = require('../../util/Constants');
 const PlayInterface = require('./util/PlayInterface');
-const Speaking = require('../../util/Speaking');
 const Silence = require('./util/Silence');
+const Speaking = require('../../util/Speaking');
+const Util = require('../../util/Util');
+const VoiceReceiver = require('./receiver/Receiver');
+const VoiceUDP = require('./networking/VoiceUDPClient');
+const VoiceWebSocket = require('./networking/VoiceWebSocket');
+
+const SUPPORTED_MODES = [
+  'xsalsa20_poly1305_lite',
+  'xsalsa20_poly1305_suffix',
+  'xsalsa20_poly1305',
+];
 
 // Workaround for Discord now requiring silence to be sent before being able to receive audio
 class SingleSilence extends Silence {
@@ -20,12 +26,6 @@ class SingleSilence extends Silence {
   }
 }
 
-const SUPPORTED_MODES = [
-  'xsalsa20_poly1305_lite',
-  'xsalsa20_poly1305_suffix',
-  'xsalsa20_poly1305',
-];
-
 /**
  * Represents a connection to a guild's voice server.
  * ```js

src/client/voice/dispatcher/StreamDispatcher.js

@@ -1,15 +1,13 @@
 'use strict';
 
-const VolumeInterface = require('../util/VolumeInterface');
-const { Writable } = require('stream');
-
 const secretbox = require('../util/Secretbox');
 const Silence = require('../util/Silence');
+const VolumeInterface = require('../util/VolumeInterface');
+const { Writable } = require('stream');
 
 const FRAME_LENGTH = 20;
 const CHANNELS = 2;
 const TIMESTAMP_INC = (48000 / 100) * CHANNELS;
-
 const MAX_NONCE_SIZE = (2 ** 32) - 1;
 const nonce = Buffer.alloc(24);
 

src/client/voice/networking/VoiceUDPClient.js

@@ -1,9 +1,9 @@
 'use strict';
 
+const { Error } = require('../../../errors');
+const { EventEmitter } = require('events');
 const udp = require('dgram');
 const { VoiceOPCodes } = require('../../../util/Constants');
-const { EventEmitter } = require('events');
-const { Error } = require('../../../errors');
 
 /**
  * Represents a UDP client for a Voice Connection.

src/client/voice/networking/VoiceWebSocket.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const { OPCodes, VoiceOPCodes } = require('../../../util/Constants');
-const { EventEmitter } = require('events');
 const { Error } = require('../../../errors');
+const { EventEmitter } = require('events');
+const { OPCodes, VoiceOPCodes } = require('../../../util/Constants');
 const WebSocket = require('../../../WebSocket');
 
 /**

src/client/voice/player/BasePlayer.js

@@ -1,8 +1,8 @@
 'use strict';
 
 const { EventEmitter } = require('events');
-const { Readable: ReadableStream } = require('stream');
 const prism = require('prism-media');
+const { Readable: ReadableStream } = require('stream');
 const StreamDispatcher = require('../dispatcher/StreamDispatcher');
 
 const FFMPEG_ARGUMENTS = [

src/client/voice/player/BroadcastAudioPlayer.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const BroadcastDispatcher = require('../dispatcher/BroadcastDispatcher');
 const BasePlayer = require('./BasePlayer');
+const BroadcastDispatcher = require('../dispatcher/BroadcastDispatcher');
 
 /**
  * An Audio Player for a Voice Connection.

src/client/voice/receiver/PacketHandler.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const secretbox = require('../util/Secretbox');
 const { EventEmitter } = require('events');
+const secretbox = require('../util/Secretbox');
 
 // The delay between packets when a user is considered to have stopped speaking
 // https://github.com/discordjs/discord.js/issues/3524#issuecomment-540373200

src/client/voice/receiver/Receiver.js

@@ -1,9 +1,9 @@
 'use strict';
 
-const { EventEmitter } = require('events');
-const prism = require('prism-media');
-const PacketHandler = require('./PacketHandler');
 const { Error } = require('../../../errors');
+const { EventEmitter } = require('events');
+const PacketHandler = require('./PacketHandler');
+const prism = require('prism-media');
 
 /**
  * Receives audio packets from a voice connection.

src/client/websocket/WebSocketManager.js

@@ -1,12 +1,12 @@
 'use strict';
 
+const Collection = require('../../util/Collection');
 const { EventEmitter } = require('events');
 const { Error: DJSError } = require('../../errors');
-const Collection = require('../../util/Collection');
-const Util = require('../../util/Util');
-const WebSocketShard = require('./WebSocketShard');
 const { Events, ShardEvents, Status, WSCodes, WSEvents } = require('../../util/Constants');
 const PacketHandlers = require('./handlers');
+const Util = require('../../util/Util');
+const WebSocketShard = require('./WebSocketShard');
 
 const BeforeReadyWhitelist = [
   WSEvents.READY,

src/client/websocket/WebSocketShard.js

@@ -1,8 +1,8 @@
 'use strict';
 
+const { browser, Events, OPCodes, ShardEvents, Status, WSEvents } = require('../../util/Constants');
 const { EventEmitter } = require('events');
 const WebSocket = require('../../WebSocket');
-const { browser, Status, Events, ShardEvents, OPCodes, WSEvents } = require('../../util/Constants');
 
 const STATUS_KEYS = Object.keys(Status);
 const CONNECTION_STATE = Object.keys(WebSocket.WebSocket);

src/client/websocket/handlers/GUILD_MEMBERS_CHUNK.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const { Events } = require('../../../util/Constants');
 const Collection = require('../../../util/Collection');
+const { Events } = require('../../../util/Constants');
 
 module.exports = (client, { d: data }) => {
   const guild = client.guilds.cache.get(data.guild_id);

src/client/websocket/handlers/GUILD_MEMBER_UPDATE.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { Status, Events } = require('../../../util/Constants');
+const { Events, Status } = require('../../../util/Constants');
 
 module.exports = (client, { d: data }, shard) => {
   const guild = client.guilds.cache.get(data.guild_id);

src/errors/DJSError.js

@@ -2,8 +2,8 @@
 
 // Heavily inspired by node's `internal/errors` module
 
-const kCode = Symbol('code');
 const messages = new Map();
+const kCode = Symbol('code');
 
 /**
  * Extend an error of some sort into a DiscordjsError.

src/index.js

@@ -17,21 +17,21 @@ module.exports = {
   Collection: require('./util/Collection'),
   Constants: require('./util/Constants'),
   DataResolver: require('./util/DataResolver'),
-  LimitedCollection: require('./util/LimitedCollection'),
-  BaseManager: require('./managers/BaseManager'),
   DiscordAPIError: require('./rest/DiscordAPIError'),
   HTTPError: require('./rest/HTTPError'),
+  LimitedCollection: require('./util/LimitedCollection'),
   MessageFlags: require('./util/MessageFlags'),
   Permissions: require('./util/Permissions'),
-  Speaking: require('./util/Speaking'),
   Snowflake: require('./util/Snowflake'),
   SnowflakeUtil: require('./util/Snowflake'),
+  Speaking: require('./util/Speaking'),
   Structures: require('./util/Structures'),
   SystemChannelFlags: require('./util/SystemChannelFlags'),
-  Util: Util,
+  Util,
   version: require('../package.json').version,
 
   // Managers
+  BaseManager: require('./managers/BaseManager'),
   ChannelManager: require('./managers/ChannelManager'),
   GuildChannelManager: require('./managers/GuildChannelManager'),
   GuildEmojiManager: require('./managers/GuildEmojiManager'),
@@ -39,9 +39,9 @@ module.exports = {
   GuildMemberManager: require('./managers/GuildMemberManager'),
   GuildMemberRoleManager: require('./managers/GuildMemberRoleManager'),
   GuildManager: require('./managers/GuildManager'),
-  ReactionUserManager: require('./managers/ReactionUserManager'),
   MessageManager: require('./managers/MessageManager'),
   PresenceManager: require('./managers/PresenceManager'),
+  ReactionUserManager: require('./managers/ReactionUserManager'),
   RoleManager: require('./managers/RoleManager'),
   UserManager: require('./managers/UserManager'),
 
@@ -54,12 +54,13 @@ module.exports = {
   splitMessage: Util.splitMessage,
 
   // Structures
-  Base: require('./structures/Base'),
   Activity: require('./structures/Presence').Activity,
   APIMessage: require('./structures/APIMessage'),
+  Base: require('./structures/Base'),
   CategoryChannel: require('./structures/CategoryChannel'),
   Channel: require('./structures/Channel'),
   ClientApplication: require('./structures/ClientApplication'),
+  ClientPresence: require('./structures/ClientPresence'),
   get ClientUser() {
     // This is a getter so that it properly extends any custom User class
     return require('./structures/ClientUser');
@@ -83,7 +84,6 @@ module.exports = {
   NewsChannel: require('./structures/NewsChannel'),
   PermissionOverwrites: require('./structures/PermissionOverwrites'),
   Presence: require('./structures/Presence').Presence,
-  ClientPresence: require('./structures/ClientPresence'),
   ReactionCollector: require('./structures/ReactionCollector'),
   ReactionEmoji: require('./structures/ReactionEmoji'),
   RichPresenceAssets: require('./structures/Presence').RichPresenceAssets,

src/managers/ChannelManager.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const Channel = require('../structures/Channel');
 const BaseManager = require('./BaseManager');
+const Channel = require('../structures/Channel');
 const { Events } = require('../util/Constants');
 
 /**

src/managers/GuildChannelManager.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const { ChannelTypes } = require('../util/Constants');
 const BaseManager = require('./BaseManager');
+const { ChannelTypes } = require('../util/Constants');
 const GuildChannel = require('../structures/GuildChannel');
 const PermissionOverwrites = require('../structures/PermissionOverwrites');
 

src/managers/GuildEmojiManager.js

@@ -1,10 +1,10 @@
 'use strict';
 
-const Collection = require('../util/Collection');
 const BaseManager = require('./BaseManager');
+const Collection = require('../util/Collection');
+const DataResolver = require('../util/DataResolver');
 const GuildEmoji = require('../structures/GuildEmoji');
 const ReactionEmoji = require('../structures/ReactionEmoji');
-const DataResolver = require('../util/DataResolver');
 const { TypeError } = require('../errors');
 
 /**

src/managers/GuildMemberManager.js

@@ -1,10 +1,10 @@
 'use strict';
 
 const BaseManager = require('./BaseManager');
-const GuildMember = require('../structures/GuildMember');
-const { Events, OPCodes } = require('../util/Constants');
 const Collection = require('../util/Collection');
+const GuildMember = require('../structures/GuildMember');
 const { Error, TypeError } = require('../errors');
+const { Events, OPCodes } = require('../util/Constants');
 
 /**
  * Manages API methods for GuildMembers and stores their cache.

src/managers/MessageManager.js

@@ -1,9 +1,9 @@
 'use strict';
 
 const BaseManager = require('./BaseManager');
-const Message = require('../structures/Message');
-const LimitedCollection = require('../util/LimitedCollection');
 const Collection = require('../util/Collection');
+const LimitedCollection = require('../util/LimitedCollection');
+const Message = require('../structures/Message');
 
 /**
 * Manages API methods for Messages and holds their cache.

src/managers/PresenceManager.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const { Presence } = require('../structures/Presence');
 const BaseManager = require('./BaseManager');
+const { Presence } = require('../structures/Presence');
 
 /**
  * Manages API methods for Presences and holds their cache.

src/managers/ReactionManager.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const MessageReaction = require('../structures/MessageReaction');
 const BaseManager = require('./BaseManager');
+const MessageReaction = require('../structures/MessageReaction');
 
 /**
  * Manages API methods for reactions and holds their cache.

src/managers/ReactionUserManager.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const Collection = require('../util/Collection');
 const BaseManager = require('./BaseManager');
+const Collection = require('../util/Collection');
 const { Error } = require('../errors');
 
 /**

src/managers/RoleManager.js

@@ -1,9 +1,9 @@
 'use strict';
 
 const BaseManager = require('./BaseManager');
-const Role = require('../structures/Role');
-const { resolveColor } = require('../util/Util');
 const Permissions = require('../util/Permissions');
+const { resolveColor } = require('../util/Util');
+const Role = require('../structures/Role');
 
 /**
  * Manages API methods for roles and stores their cache.

src/managers/UserManager.js

@@ -1,9 +1,9 @@
 'use strict';
 
 const BaseManager = require('./BaseManager');
-const User = require('../structures/User');
 const GuildMember = require('../structures/GuildMember');
 const Message = require('../structures/Message');
+const User = require('../structures/User');
 
 /**
  * Manages API methods for users and stores their cache.

src/rest/APIRequest.js

@@ -1,10 +1,10 @@
 'use strict';
 
-const FormData = require('form-data');
+const AbortController = require('abort-controller');
-const https = require('https');
 const { browser, UserAgent } = require('../util/Constants');
 const fetch = require('node-fetch');
-const AbortController = require('abort-controller');
+const FormData = require('form-data');
+const https = require('https');
 
 if (https.Agent) var agent = new https.Agent({ keepAlive: true });
 

src/rest/RESTManager.js

@@ -1,11 +1,11 @@
 'use strict';
 
-const RequestHandler = require('./RequestHandler');
 const APIRequest = require('./APIRequest');
-const routeBuilder = require('./APIRouter');
-const { Error } = require('../errors');
-const { Endpoints } = require('../util/Constants');
 const Collection = require('../util/Collection');
+const { Endpoints } = require('../util/Constants');
+const { Error } = require('../errors');
+const RequestHandler = require('./RequestHandler');
+const routeBuilder = require('./APIRouter');
 
 class RESTManager {
   constructor(client, tokenPrefix = 'Bot') {

src/rest/RequestHandler.js

@@ -1,22 +1,22 @@
 'use strict';
 
+const { browser, Events: { RATE_LIMIT } } = require('../util/Constants');
 const DiscordAPIError = require('./DiscordAPIError');
 const HTTPError = require('./HTTPError');
 const Util = require('../util/Util');
-const { Events: { RATE_LIMIT }, browser } = require('../util/Constants');
 
-function parseResponse(res) {
+function calculateReset(reset, serverDate) {
-  if (res.headers.get('content-type').startsWith('application/json')) return res.json();
+  return new Date(Number(reset) * 1000).getTime() - getAPIOffset(serverDate);
-  if (browser) return res.blob();
-  return res.buffer();
 }
 
 function getAPIOffset(serverDate) {
   return new Date(serverDate).getTime() - Date.now();
 }
 
-function calculateReset(reset, serverDate) {
+function parseResponse(res) {
-  return new Date(Number(reset) * 1000).getTime() - getAPIOffset(serverDate);
+  if (res.headers.get('content-type').startsWith('application/json')) return res.json();
+  if (browser) return res.blob();
+  return res.buffer();
 }
 
 class RequestHandler {

src/sharding/Shard.js

@@ -1,9 +1,9 @@
 'use strict';
 
+const { Error } = require('../errors');
 const { EventEmitter } = require('events');
 const path = require('path');
 const Util = require('../util/Util');
-const { Error } = require('../errors');
 let childProcess = null;
 let Worker = null;
 

src/sharding/ShardClientUtil.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const Util = require('../util/Util');
 const { Events } = require('../util/Constants');
+const Util = require('../util/Util');
 
 /**
  * Helper class for sharded clients spawned as a child process/worker, such as from a {@link ShardingManager}.

src/sharding/ShardingManager.js

@@ -1,12 +1,13 @@
 'use strict';
 
-const path = require('path');
-const fs = require('fs');
-const { EventEmitter } = require('events');
-const Shard = require('./Shard');
 const Collection = require('../util/Collection');
-const Util = require('../util/Util');
 const { Error, TypeError, RangeError } = require('../errors');
+const { EventEmitter } = require('events');
+const fs = require('fs');
+const path = require('path');
+const Shard = require('./Shard');
+const Util = require('../util/Util');
+
 
 /**
  * This is a utility class that makes multi-process sharding of a bot an easy and painless experience.

src/structures/APIMessage.js

@@ -1,12 +1,12 @@
 'use strict';
 
-const DataResolver = require('../util/DataResolver');
-const MessageEmbed = require('./MessageEmbed');
-const MessageAttachment = require('./MessageAttachment');
 const { browser } = require('../util/Constants');
-const Util = require('../util/Util');
+const DataResolver = require('../util/DataResolver');
-const { RangeError } = require('../errors');
+const MessageAttachment = require('./MessageAttachment');
+const MessageEmbed = require('./MessageEmbed');
 const MessageFlags = require('../util/MessageFlags');
+const { RangeError } = require('../errors');
+const Util = require('../util/Util');
 
 /**
  * Represents a message to be sent to the API.

src/structures/Channel.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const Snowflake = require('../util/Snowflake');
 const Base = require('./Base');
 const { ChannelTypes } = require('../util/Constants');
+const Snowflake = require('../util/Snowflake');
 
 /**
  * Represents any channel on Discord.

src/structures/ClientApplication.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const Snowflake = require('../util/Snowflake');
-const { ClientApplicationAssetTypes, Endpoints } = require('../util/Constants');
 const Base = require('./Base');
+const { ClientApplicationAssetTypes, Endpoints } = require('../util/Constants');
+const Snowflake = require('../util/Snowflake');
 const Team = require('./Team');
 
 const AssetTypes = Object.keys(ClientApplicationAssetTypes);

src/structures/ClientPresence.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const { Presence } = require('./Presence');
-const Collection = require('../util/Collection');
 const { ActivityTypes, OPCodes } = require('../util/Constants');
+const Collection = require('../util/Collection');
+const { Presence } = require('./Presence');
 const { TypeError } = require('../errors');
 
 class ClientPresence extends Presence {

src/structures/ClientUser.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const Structures = require('../util/Structures');
 const DataResolver = require('../util/DataResolver');
+const Structures = require('../util/Structures');
 
 /**
  * Represents the logged in client's Discord user.

src/structures/DMChannel.js

@@ -1,8 +1,8 @@
 'use strict';
 
 const Channel = require('./Channel');
-const TextBasedChannel = require('./interfaces/TextBasedChannel');
 const MessageManager = require('../managers/MessageManager');
+const TextBasedChannel = require('./interfaces/TextBasedChannel');
 
 /**
  * Represents a direct message channel between two users.

src/structures/Emoji.js

@@ -1,8 +1,7 @@
 'use strict';
 
-const Snowflake = require('../util/Snowflake');
 const Base = require('./Base');
-
+const Snowflake = require('../util/Snowflake');
 
 /**
  * Represents an emoji, see {@link GuildEmoji} and {@link ReactionEmoji}.

src/structures/Guild.js

@@ -1,24 +1,24 @@
 'use strict';
 
-const Invite = require('./Invite');
+const Base = require('./Base');
-const Integration = require('./Integration');
-const GuildAuditLogs = require('./GuildAuditLogs');
-const Webhook = require('./Webhook');
-const VoiceRegion = require('./VoiceRegion');
 const { ChannelTypes, DefaultMessageNotifications, PartialTypes } = require('../util/Constants');
 const Collection = require('../util/Collection');
-const Util = require('../util/Util');
 const DataResolver = require('../util/DataResolver');
+const { Error, TypeError } = require('../errors');
+const GuildAuditLogs = require('./GuildAuditLogs');
+const GuildChannelManager = require('../managers/GuildChannelManager');
+const GuildEmojiManager = require('../managers/GuildEmojiManager');
+const GuildMemberManager = require('../managers/GuildMemberManager');
+const Integration = require('./Integration');
+const Invite = require('./Invite');
+const PresenceManager = require('../managers/PresenceManager');
+const RoleManager = require('../managers/RoleManager');
 const Snowflake = require('../util/Snowflake');
 const SystemChannelFlags = require('../util/SystemChannelFlags');
-const GuildMemberManager = require('../managers/GuildMemberManager');
+const Util = require('../util/Util');
-const RoleManager = require('../managers/RoleManager');
+const VoiceRegion = require('./VoiceRegion');
-const GuildEmojiManager = require('../managers/GuildEmojiManager');
-const GuildChannelManager = require('../managers/GuildChannelManager');
-const PresenceManager = require('../managers/PresenceManager');
 const VoiceStateManager = require('../managers/VoiceStateManager');
-const Base = require('./Base');
+const Webhook = require('./Webhook');
-const { Error, TypeError } = require('../errors');
 
 /**
  * Represents a guild (or a server) on Discord.

src/structures/GuildAuditLogs.js

@@ -2,10 +2,10 @@
 
 const Collection = require('../util/Collection');
 const Integration = require('./Integration');
-const Snowflake = require('../util/Snowflake');
-const Webhook = require('./Webhook');
-const Util = require('../util/Util');
 const { PartialTypes } = require('../util/Constants');
+const Snowflake = require('../util/Snowflake');
+const Util = require('../util/Util');
+const Webhook = require('./Webhook');
 
 /**
  * The target type of an entry, e.g. `GUILD`. Here are the available types:

src/structures/GuildChannel.js

@@ -1,13 +1,13 @@
 'use strict';
 
 const Channel = require('./Channel');
-const Role = require('./Role');
-const Invite = require('./Invite');
-const PermissionOverwrites = require('./PermissionOverwrites');
-const Util = require('../util/Util');
-const Permissions = require('../util/Permissions');
 const Collection = require('../util/Collection');
 const { Error, TypeError } = require('../errors');
+const Invite = require('./Invite');
+const PermissionOverwrites = require('./PermissionOverwrites');
+const Permissions = require('../util/Permissions');
+const Role = require('./Role');
+const Util = require('../util/Util');
 
 /**
  * Represents a guild channel from any of the following:

src/structures/GuildEmoji.js

@@ -1,9 +1,9 @@
 'use strict';
 
+const Emoji = require('./Emoji');
+const { Error } = require('../errors');
 const GuildEmojiRoleManager = require('../managers/GuildEmojiRoleManager');
 const Permissions = require('../util/Permissions');
-const { Error } = require('../errors');
-const Emoji = require('./Emoji');
 
 /**
  * Represents a custom emoji.

src/structures/GuildMember.js

@@ -1,13 +1,13 @@
 'use strict';
 
-const TextBasedChannel = require('./interfaces/TextBasedChannel');
-const Role = require('./Role');
-const Permissions = require('../util/Permissions');
-const GuildMemberRoleManager = require('../managers/GuildMemberRoleManager');
 const Base = require('./Base');
-const VoiceState = require('./VoiceState');
-const { Presence } = require('./Presence');
 const { Error } = require('../errors');
+const GuildMemberRoleManager = require('../managers/GuildMemberRoleManager');
+const Permissions = require('../util/Permissions');
+const { Presence } = require('./Presence');
+const Role = require('./Role');
+const TextBasedChannel = require('./interfaces/TextBasedChannel');
+const VoiceState = require('./VoiceState');
 
 /**
  * Represents a member of a guild on Discord.

src/structures/Invite.js

@@ -1,8 +1,8 @@
 'use strict';
 
+const Base = require('./Base');
 const { Endpoints } = require('../util/Constants');
 const Permissions = require('../util/Permissions');
-const Base = require('./Base');
 
 /**
  * Represents an invitation to a guild channel.

src/structures/Message.js

@@ -1,19 +1,19 @@
 'use strict';
 
+const APIMessage = require('./APIMessage');
+const Base = require('./Base');
+const ClientApplication = require('./ClientApplication');
+const Collection = require('../util/Collection');
+const { Error, TypeError } = require('../errors');
 const Mentions = require('./MessageMentions');
 const MessageAttachment = require('./MessageAttachment');
-const Embed = require('./MessageEmbed');
+const MessageEmbed = require('./MessageEmbed');
-const ReactionCollector = require('./ReactionCollector');
+const MessageFlags = require('../util/MessageFlags');
-const ClientApplication = require('./ClientApplication');
-const Util = require('../util/Util');
-const Collection = require('../util/Collection');
-const ReactionManager = require('../managers/ReactionManager');
 const { MessageTypes } = require('../util/Constants');
 const Permissions = require('../util/Permissions');
-const Base = require('./Base');
+const ReactionCollector = require('./ReactionCollector');
-const { Error, TypeError } = require('../errors');
+const ReactionManager = require('../managers/ReactionManager');
-const APIMessage = require('./APIMessage');
+const Util = require('../util/Util');
-const MessageFlags = require('../util/MessageFlags');
 
 /**
  * Represents a message on Discord.
@@ -98,7 +98,7 @@ class Message extends Base {
      * A list of embeds in the message - e.g. YouTube Player
      * @type {MessageEmbed[]}
      */
-    this.embeds = (data.embeds || []).map(e => new Embed(e));
+    this.embeds = (data.embeds || []).map(e => new MessageEmbed(e));
 
     /**
      * A collection of attachments in the message - e.g. Pictures - mapped by their ID
@@ -223,7 +223,7 @@ class Message extends Base {
     if ('content' in data) this.content = data.content;
     if ('pinned' in data) this.pinned = data.pinned;
     if ('tts' in data) this.tts = data.tts;
-    if ('embeds' in data) this.embeds = data.embeds.map(e => new Embed(e));
+    if ('embeds' in data) this.embeds = data.embeds.map(e => new MessageEmbed(e));
     else this.embeds = this.embeds.slice();
 
     if ('attachments' in data) {

src/structures/MessageMentions.js

@@ -1,9 +1,9 @@
 'use strict';
 
-const Collection = require('../util/Collection');
-const Util = require('../util/Util');
-const GuildMember = require('./GuildMember');
 const { ChannelTypes } = require('../util/Constants');
+const Collection = require('../util/Collection');
+const GuildMember = require('./GuildMember');
+const Util = require('../util/Util');
 
 /**
  * Keeps track of mentions in a {@link Message}.

src/structures/MessageReaction.js

@@ -1,9 +1,9 @@
 'use strict';
 
 const GuildEmoji = require('./GuildEmoji');
-const Util = require('../util/Util');
 const ReactionEmoji = require('./ReactionEmoji');
 const ReactionUserManager = require('../managers/ReactionUserManager');
+const Util = require('../util/Util');
 
 /**
  * Represents a reaction to a message.

src/structures/PermissionOverwrites.js

@@ -1,9 +1,9 @@
 'use strict';
 
-const Role = require('./Role');
 const Permissions = require('../util/Permissions');
-const Util = require('../util/Util');
+const Role = require('./Role');
 const { TypeError } = require('../errors');
+const Util = require('../util/Util');
 
 /**
  * Represents a permission overwrite for a role or member in a guild channel.

src/structures/Presence.js

@@ -1,9 +1,9 @@
 'use strict';
 
-const Util = require('../util/Util');
 const ActivityFlags = require('../util/ActivityFlags');
 const { ActivityTypes } = require('../util/Constants');
 const Emoji = require('./Emoji');
+const Util = require('../util/Util');
 
 /**
  * Activity sent in a message.

src/structures/ReactionEmoji.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const Util = require('../util/Util');
 const Emoji = require('./Emoji');
+const Util = require('../util/Util');
 
 /**
  * Represents a limited emoji set used for both custom and unicode emojis. Custom emojis

src/structures/Role.js

@@ -1,10 +1,10 @@
 'use strict';
 
-const Snowflake = require('../util/Snowflake');
-const Permissions = require('../util/Permissions');
-const Util = require('../util/Util');
 const Base = require('./Base');
 const { Error, TypeError } = require('../errors');
+const Permissions = require('../util/Permissions');
+const Snowflake = require('../util/Snowflake');
+const Util = require('../util/Util');
 
 /**
  * Represents a role on Discord.

src/structures/Team.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const Snowflake = require('../util/Snowflake');
-const Collection = require('../util/Collection');
 const Base = require('./Base');
+const Collection = require('../util/Collection');
+const Snowflake = require('../util/Snowflake');
 const TeamMember = require('./TeamMember');
 
 /**

src/structures/TextChannel.js

@@ -1,11 +1,11 @@
 'use strict';
 
-const GuildChannel = require('./GuildChannel');
-const Webhook = require('./Webhook');
-const TextBasedChannel = require('./interfaces/TextBasedChannel');
 const Collection = require('../util/Collection');
 const DataResolver = require('../util/DataResolver');
+const GuildChannel = require('./GuildChannel');
 const MessageManager = require('../managers/MessageManager');
+const TextBasedChannel = require('./interfaces/TextBasedChannel');
+const Webhook = require('./Webhook');
 
 /**
  * Represents a guild text channel on Discord.

src/structures/User.js

@@ -1,10 +1,10 @@
 'use strict';
 
-const TextBasedChannel = require('./interfaces/TextBasedChannel');
-const { Presence } = require('./Presence');
-const Snowflake = require('../util/Snowflake');
 const Base = require('./Base');
 const { Error } = require('../errors');
+const { Presence } = require('./Presence');
+const Snowflake = require('../util/Snowflake');
+const TextBasedChannel = require('./interfaces/TextBasedChannel');
 
 /**
  * Represents a user on Discord.

src/structures/VoiceChannel.js

@@ -1,10 +1,10 @@
 'use strict';
 
-const GuildChannel = require('./GuildChannel');
 const { browser } = require('../util/Constants');
-const Permissions = require('../util/Permissions');
 const Collection = require('../util/Collection');
 const { Error } = require('../errors');
+const GuildChannel = require('./GuildChannel');
+const Permissions = require('../util/Permissions');
 
 /**
  * Represents a guild voice channel on Discord.

src/structures/Webhook.js

@@ -1,10 +1,10 @@
 'use strict';
 
-const { WebhookTypes } = require('../util/Constants');
+const APIMessage = require('./APIMessage');
+const Channel = require('./Channel');
 const DataResolver = require('../util/DataResolver');
 const Snowflake = require('../util/Snowflake');
-const Channel = require('./Channel');
+const { WebhookTypes } = require('../util/Constants');
-const APIMessage = require('./APIMessage');
 
 /**
  * Represents a webhook.

src/structures/interfaces/Collector.js

@@ -1,8 +1,8 @@
 'use strict';
 
 const Collection = require('../../util/Collection');
-const Util = require('../../util/Util');
 const { EventEmitter } = require('events');
+const Util = require('../../util/Util');
 
 /**
  * Filter to be applied to the collector.

src/structures/interfaces/TextBasedChannel.js

@@ -1,10 +1,10 @@
 'use strict';
 
-const MessageCollector = require('../MessageCollector');
-const Snowflake = require('../../util/Snowflake');
-const Collection = require('../../util/Collection');
-const { RangeError, TypeError } = require('../../errors');
 const APIMessage = require('../APIMessage');
+const Collection = require('../../util/Collection');
+const MessageCollector = require('../MessageCollector');
+const { RangeError, TypeError } = require('../../errors');
+const Snowflake = require('../../util/Snowflake');
 
 /**
  * Interface for classes that have text-channel-like features.

src/util/Constants.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const Package = exports.Package = require('../../package.json');
-const { Error, RangeError } = require('../errors');
 const browser = exports.browser = typeof window !== 'undefined';
+const { Error, RangeError } = require('../errors');
+const Package = exports.Package = require('../../package.json');
 
 /**
  * Options for a client.
@@ -659,7 +659,7 @@ exports.WebhookTypes = [
 ];
 
 function keyMirror(arr) {
-  let tmp = Object.create(null);
+  const tmp = Object.create(null);
   for (const value of arr) tmp[value] = value;
   return tmp;
 }

src/util/DataResolver.js

@@ -1,11 +1,11 @@
 'use strict';
 
-const path = require('path');
-const fs = require('fs');
-const fetch = require('node-fetch');
-const Util = require('../util/Util');
-const { Error: DiscordError, TypeError } = require('../errors');
 const { browser } = require('../util/Constants');
+const { Error: DiscordError, TypeError } = require('../errors');
+const fetch = require('node-fetch');
+const fs = require('fs');
+const path = require('path');
+const Util = require('../util/Util');
 
 /**
  * The DataResolver identifies different objects and tries to resolve a specific piece of information from them.

src/util/Util.js

@@ -1,11 +1,13 @@
 'use strict';
 
 const { Colors, DefaultOptions, Endpoints } = require('./Constants');
-const fetch = require('node-fetch');
 const { Error: DiscordError, RangeError, TypeError } = require('../errors');
+const fetch = require('node-fetch');
+const { parse } = require('path');
+
+
 const has = (o, k) => Object.prototype.hasOwnProperty.call(o, k);
 const isObject = d => typeof d === 'object' && d !== null;
-const { parse } = require('path');
 
 /**
  * Contains various general-purpose utility methods. These functions are also available on the base `Discord` object.