jonny_bro/discord-player-play-dl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

♻️ Throw Error instead of Message (#101)

Browse source 
Co-authored-by: Androz <androz2091@gmail.com>
This commit is contained in:
Skick 2020-11-01 20:37:16 +07:00 committed by GitHub
parent aac87811f4
commit e715e4fbe1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -136,7 +136,7 @@ client.player
.on('botDisconnect', (message, queue) => message.channel.send('Music stopped as I have been disconnected from the channel!')) .on('botDisconnect', (message, queue) => message.channel.send('Music stopped as I have been disconnected from the channel!'))
// Error handling // Error handling
.on('error', (message, error) => { .on('error', (error, message) => {
switch(error){ switch(error){
case 'NotPlaying': case 'NotPlaying':
message.channel.send('There is no music being played on this server!') message.channel.send('There is no music being played on this server!')

20
src/Player.js
View file

@ -310,7 +310,7 @@ class Player extends EventEmitter {
this.emit('playlistAdd', message, queue, playlist) this.emit('playlistAdd', message, queue, playlist)
} else { } else {
const track = playlist.tracks.shift() const track = playlist.tracks.shift()
const queue = await this._createQueue(message, track).catch((e) => this.emit('error', message, e)) const queue = await this._createQueue(message, track).catch((e) => this.emit('error', e, message))
this.emit('trackStart', message, queue.tracks[0]) this.emit('trackStart', message, queue.tracks[0])
this._addTracksToQueue(message, playlist.tracks) this._addTracksToQueue(message, playlist.tracks)
} }
@ -379,7 +379,7 @@ class Player extends EventEmitter {
resume (message) { resume (message) {
// Get guild queue // Get guild queue
const queue = this.queues.find((g) => g.guildID === message.guild.id) const queue = this.queues.find((g) => g.guildID === message.guild.id)
if (!queue) return this.emit('error', message, 'NotPlaying') if (!queue) return this.emit('error', 'NotPlaying', message)
// Pause the dispatcher // Pause the dispatcher
queue.voiceConnection.dispatcher.resume() queue.voiceConnection.dispatcher.resume()
queue.paused = false queue.paused = false
@ -396,7 +396,7 @@ class Player extends EventEmitter {
stop (message) { stop (message) {
// Get guild queue // Get guild queue
const queue = this.queues.find((g) => g.guildID === message.guild.id) const queue = this.queues.find((g) => g.guildID === message.guild.id)
if (!queue) return this.emit('error', message, 'NotPlaying') if (!queue) return this.emit('error', 'NotPlaying', message)
// Stop the dispatcher // Stop the dispatcher
queue.stopped = true queue.stopped = true
queue.tracks = [] queue.tracks = []
@ -417,7 +417,7 @@ class Player extends EventEmitter {
setVolume (message, percent) { setVolume (message, percent) {
// Get guild queue // Get guild queue
const queue = this.queues.get(message.guild.id) const queue = this.queues.get(message.guild.id)
if (!queue) return this.emit('error', message, 'NotPlaying') if (!queue) return this.emit('error', 'NotPlaying', message)
// Update volume // Update volume
queue.volume = percent queue.volume = percent
queue.voiceConnection.dispatcher.setVolumeLogarithmic(queue.calculatedVolume / 200) queue.voiceConnection.dispatcher.setVolumeLogarithmic(queue.calculatedVolume / 200)
@ -444,7 +444,7 @@ class Player extends EventEmitter {
clearQueue (message) { clearQueue (message) {
// Get guild queue // Get guild queue
const queue = this.queues.get(message.guild.id) const queue = this.queues.get(message.guild.id)
if (!queue) return this.emit('error', message, 'NotPlaying') if (!queue) return this.emit('error', 'NotPlaying', message)
// Clear queue // Clear queue
queue.tracks = [] queue.tracks = []
// Return the queue // Return the queue
@ -459,7 +459,7 @@ class Player extends EventEmitter {
skip (message) { skip (message) {
// Get guild queue // Get guild queue
const queue = this.queues.get(message.guild.id) const queue = this.queues.get(message.guild.id)
if (!queue) return this.emit('error', message, 'NotPlaying') if (!queue) return this.emit('error', 'NotPlaying', message)
const currentTrack = queue.playing const currentTrack = queue.playing
// End the dispatcher // End the dispatcher
queue.voiceConnection.dispatcher.end() queue.voiceConnection.dispatcher.end()
@ -476,7 +476,7 @@ class Player extends EventEmitter {
nowPlaying (message) { nowPlaying (message) {
// Get guild queue // Get guild queue
const queue = this.queues.get(message.guild.id) const queue = this.queues.get(message.guild.id)
if (!queue) return this.emit('error', message, 'NotPlaying') if (!queue) return this.emit('error', 'NotPlaying', message)
const currentTrack = queue.tracks[0] const currentTrack = queue.tracks[0]
// Return the current track // Return the current track
return currentTrack return currentTrack
@ -491,7 +491,7 @@ class Player extends EventEmitter {
setRepeatMode (message, enabled) { setRepeatMode (message, enabled) {
// Get guild queue // Get guild queue
const queue = this.queues.get(message.guild.id) const queue = this.queues.get(message.guild.id)
if (!queue) return this.emit('error', message, 'NotPlaying') if (!queue) return this.emit('error', 'NotPlaying', message)
// Enable/Disable repeat mode // Enable/Disable repeat mode
queue.repeatMode = enabled queue.repeatMode = enabled
// Return the repeat mode // Return the repeat mode
@ -506,7 +506,7 @@ class Player extends EventEmitter {
shuffle (message) { shuffle (message) {
// Get guild queue // Get guild queue
const queue = this.queues.get(message.guild.id) const queue = this.queues.get(message.guild.id)
if (!queue) return this.emit('error', message, 'NotPlaying') if (!queue) return this.emit('error', 'NotPlaying', message)
// Shuffle the queue (except the first track) // Shuffle the queue (except the first track)
const currentTrack = queue.tracks.shift() const currentTrack = queue.tracks.shift()
queue.tracks = queue.tracks.sort(() => Math.random() - 0.5) queue.tracks = queue.tracks.sort(() => Math.random() - 0.5)
@ -524,7 +524,7 @@ class Player extends EventEmitter {
remove (message, track) { remove (message, track) {
// Get guild queue // Get guild queue
const queue = this.queues.get(message.guild.id) const queue = this.queues.get(message.guild.id)
if (!queue) return this.emit('error', message, 'NotPlaying') if (!queue) return this.emit('error', 'NotPlaying', message)
// Remove the track from the queue // Remove the track from the queue
let trackFound = null let trackFound = null
if (typeof track === 'number') { if (typeof track === 'number') {