mirror of
https://github.com/discordjs/discord.js.git
synced 2026-03-19 13:03:31 +01:00
fix: require discordjserror to throw meaningful errors where necessary
This commit is contained in:
@@ -23,7 +23,7 @@ class PacketHandler extends EventEmitter {
|
|||||||
buffer.copy(nonce, 0, 0, 12);
|
buffer.copy(nonce, 0, 0, 12);
|
||||||
|
|
||||||
let packet = secretbox.methods.open(buffer.slice(12), nonce, this.receiver.connection.authentication.secretKey);
|
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);
|
packet = Buffer.from(packet);
|
||||||
|
|
||||||
// Strip RTP Header Extensions (one-byte only)
|
// Strip RTP Header Extensions (one-byte only)
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
const EventEmitter = require('events');
|
const EventEmitter = require('events');
|
||||||
const prism = require('prism-media');
|
const prism = require('prism-media');
|
||||||
const PacketHandler = require('./PacketHandler');
|
const PacketHandler = require('./PacketHandler');
|
||||||
|
const { Error } = require('../../../errors');
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Receives audio packets from a voice connection.
|
* Receives audio packets from a voice connection.
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
const { Readable } = require('stream');
|
const { Readable } = require('stream');
|
||||||
const prism = require('prism-media');
|
const prism = require('prism-media');
|
||||||
|
const { Error } = require('../../../errors');
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Options that can be passed to stream-playing methods:
|
* Options that can be passed to stream-playing methods:
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ const DataStore = require('./DataStore');
|
|||||||
const GuildEmoji = require('../structures/GuildEmoji');
|
const GuildEmoji = require('../structures/GuildEmoji');
|
||||||
const ReactionEmoji = require('../structures/ReactionEmoji');
|
const ReactionEmoji = require('../structures/ReactionEmoji');
|
||||||
const DataResolver = require('../util/DataResolver');
|
const DataResolver = require('../util/DataResolver');
|
||||||
|
const { TypeError } = require('../errors');
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Stores guild emojis.
|
* Stores guild emojis.
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ const DataStore = require('./DataStore');
|
|||||||
const GuildMember = require('../structures/GuildMember');
|
const GuildMember = require('../structures/GuildMember');
|
||||||
const { Events, OPCodes } = require('../util/Constants');
|
const { Events, OPCodes } = require('../util/Constants');
|
||||||
const Collection = require('../util/Collection');
|
const Collection = require('../util/Collection');
|
||||||
const { Error } = require('../errors');
|
const { Error, TypeError } = require('../errors');
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Stores guild members.
|
* Stores guild members.
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
const DataStore = require('./DataStore');
|
const DataStore = require('./DataStore');
|
||||||
|
const { Error } = require('../errors');
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A data store to store User models who reacted to a MessageReaction.
|
* A data store to store User models who reacted to a MessageReaction.
|
||||||
* @extends {DataStore}
|
* @extends {DataStore}
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ const Snowflake = require('../util/Snowflake');
|
|||||||
const Permissions = require('../util/Permissions');
|
const Permissions = require('../util/Permissions');
|
||||||
const Util = require('../util/Util');
|
const Util = require('../util/Util');
|
||||||
const Base = require('./Base');
|
const Base = require('./Base');
|
||||||
const { TypeError } = require('../errors');
|
const { Error, TypeError } = require('../errors');
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Represents a role on Discord.
|
* Represents a role on Discord.
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ const MessageEmbed = require('../MessageEmbed');
|
|||||||
const MessageAttachment = require('../MessageAttachment');
|
const MessageAttachment = require('../MessageAttachment');
|
||||||
const { browser } = require('../../util/Constants');
|
const { browser } = require('../../util/Constants');
|
||||||
const Util = require('../../util/Util');
|
const Util = require('../../util/Util');
|
||||||
|
const { RangeError } = require('../../errors');
|
||||||
|
|
||||||
// eslint-disable-next-line complexity
|
// eslint-disable-next-line complexity
|
||||||
module.exports = async function createMessage(channel, options) {
|
module.exports = async function createMessage(channel, options) {
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ const path = require('path');
|
|||||||
const fs = require('fs');
|
const fs = require('fs');
|
||||||
const snekfetch = require('snekfetch');
|
const snekfetch = require('snekfetch');
|
||||||
const Util = require('../util/Util');
|
const Util = require('../util/Util');
|
||||||
const { Error, TypeError } = require('../errors');
|
const { Error: DiscordError, TypeError } = require('../errors');
|
||||||
const { browser } = require('../util/Constants');
|
const { browser } = require('../util/Constants');
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -99,7 +99,7 @@ class DataResolver {
|
|||||||
const file = browser ? resource : path.resolve(resource);
|
const file = browser ? resource : path.resolve(resource);
|
||||||
fs.stat(file, (err, stats) => {
|
fs.stat(file, (err, stats) => {
|
||||||
if (err) return reject(err);
|
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) => {
|
fs.readFile(file, (err2, data) => {
|
||||||
if (err2) reject(err2); else resolve(data);
|
if (err2) reject(err2); else resolve(data);
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user