diff --git a/src/client/voice/receiver/PacketHandler.js b/src/client/voice/receiver/PacketHandler.js index 2227d55cf..9ebe69d85 100644 --- a/src/client/voice/receiver/PacketHandler.js +++ b/src/client/voice/receiver/PacketHandler.js @@ -23,7 +23,7 @@ class PacketHandler extends EventEmitter { buffer.copy(nonce, 0, 0, 12); let packet = secretbox.methods.open(buffer.slice(12), nonce, this.receiver.connection.authentication.secretKey); - if (!packet) return Error('Failed to decrypt voice packet'); + if (!packet) return new Error('Failed to decrypt voice packet'); packet = Buffer.from(packet); // Strip RTP Header Extensions (one-byte only) diff --git a/src/client/voice/receiver/Receiver.js b/src/client/voice/receiver/Receiver.js index 51beb682c..9636377d7 100644 --- a/src/client/voice/receiver/Receiver.js +++ b/src/client/voice/receiver/Receiver.js @@ -1,6 +1,7 @@ const EventEmitter = require('events'); const prism = require('prism-media'); const PacketHandler = require('./PacketHandler'); +const { Error } = require('../../../errors'); /** * Receives audio packets from a voice connection. diff --git a/src/client/voice/util/PlayInterface.js b/src/client/voice/util/PlayInterface.js index 4f5915650..ebcb1378e 100644 --- a/src/client/voice/util/PlayInterface.js +++ b/src/client/voice/util/PlayInterface.js @@ -1,5 +1,6 @@ const { Readable } = require('stream'); const prism = require('prism-media'); +const { Error } = require('../../../errors'); /** * Options that can be passed to stream-playing methods: diff --git a/src/stores/GuildEmojiStore.js b/src/stores/GuildEmojiStore.js index bc5c57280..75bf16e08 100644 --- a/src/stores/GuildEmojiStore.js +++ b/src/stores/GuildEmojiStore.js @@ -3,6 +3,7 @@ const DataStore = require('./DataStore'); const GuildEmoji = require('../structures/GuildEmoji'); const ReactionEmoji = require('../structures/ReactionEmoji'); const DataResolver = require('../util/DataResolver'); +const { TypeError } = require('../errors'); /** * Stores guild emojis. diff --git a/src/stores/GuildMemberStore.js b/src/stores/GuildMemberStore.js index 8cdd7611e..6c4b5947f 100644 --- a/src/stores/GuildMemberStore.js +++ b/src/stores/GuildMemberStore.js @@ -2,7 +2,7 @@ const DataStore = require('./DataStore'); const GuildMember = require('../structures/GuildMember'); const { Events, OPCodes } = require('../util/Constants'); const Collection = require('../util/Collection'); -const { Error } = require('../errors'); +const { Error, TypeError } = require('../errors'); /** * Stores guild members. diff --git a/src/stores/ReactionUserStore.js b/src/stores/ReactionUserStore.js index d246d10b9..a07a9a093 100644 --- a/src/stores/ReactionUserStore.js +++ b/src/stores/ReactionUserStore.js @@ -1,4 +1,6 @@ const DataStore = require('./DataStore'); +const { Error } = require('../errors'); + /** * A data store to store User models who reacted to a MessageReaction. * @extends {DataStore} diff --git a/src/structures/Role.js b/src/structures/Role.js index 1d82f63ba..a0209b20f 100644 --- a/src/structures/Role.js +++ b/src/structures/Role.js @@ -2,7 +2,7 @@ const Snowflake = require('../util/Snowflake'); const Permissions = require('../util/Permissions'); const Util = require('../util/Util'); const Base = require('./Base'); -const { TypeError } = require('../errors'); +const { Error, TypeError } = require('../errors'); /** * Represents a role on Discord. diff --git a/src/structures/shared/CreateMessage.js b/src/structures/shared/CreateMessage.js index d0fa35726..55d779cf5 100644 --- a/src/structures/shared/CreateMessage.js +++ b/src/structures/shared/CreateMessage.js @@ -4,6 +4,7 @@ const MessageEmbed = require('../MessageEmbed'); const MessageAttachment = require('../MessageAttachment'); const { browser } = require('../../util/Constants'); const Util = require('../../util/Util'); +const { RangeError } = require('../../errors'); // eslint-disable-next-line complexity module.exports = async function createMessage(channel, options) { diff --git a/src/util/DataResolver.js b/src/util/DataResolver.js index ff2dc75b7..91a698893 100644 --- a/src/util/DataResolver.js +++ b/src/util/DataResolver.js @@ -2,7 +2,7 @@ const path = require('path'); const fs = require('fs'); const snekfetch = require('snekfetch'); const Util = require('../util/Util'); -const { Error, TypeError } = require('../errors'); +const { Error: DiscordError, TypeError } = require('../errors'); const { browser } = require('../util/Constants'); /** @@ -99,7 +99,7 @@ class DataResolver { const file = browser ? resource : path.resolve(resource); fs.stat(file, (err, stats) => { if (err) return reject(err); - if (!stats || !stats.isFile()) return reject(new Error('FILE_NOT_FOUND', file)); + if (!stats || !stats.isFile()) return reject(new DiscordError('FILE_NOT_FOUND', file)); fs.readFile(file, (err2, data) => { if (err2) reject(err2); else resolve(data); });