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

🐛 Fixes

Browse source
This commit is contained in:
Androz2091 2020-08-14 10:03:32 +02:00
parent 46c2bb9dc6
commit cdaaae5d92
1 changed files with 43 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
src/Player.js
View file

@ -200,10 +200,18 @@ class Player extends EventEmitter {
return this.queues.some((g) => g.guildID === message.guild.id) return this.queues.some((g) => g.guildID === message.guild.id)
} }
_addTrackToQueue (message, track) {
const queue = this.getQueue(message)
if (!queue) throw new Error('NotPlaying')
if (!track || !(track instanceof Track)) throw new Error('No track to add to the queue specified')
queue.tracks.push(track)
return queue
}
_addTracksToQueue (message, tracks) { _addTracksToQueue (message, tracks) {
const queue = this.getQueue(message) const queue = this.getQueue(message)
if (!queue) throw new Error('Cannot add tracks to queue because no song is currently played on the server.') if (!queue) throw new Error('Cannot add tracks to queue because no song is currently played on the server.')
queue.tracks = queue.tracks.push(...tracks) queue.tracks.push(...tracks)
return queue return queue
} }
@ -217,6 +225,7 @@ class Player extends EventEmitter {
queue.voiceConnection = connection queue.voiceConnection = connection
queue.tracks.push(track) queue.tracks.push(track)
this.emit('queueCreate', message, queue) this.emit('queueCreate', message, queue)
resolve(queue)
this._playTrack(queue, true) this._playTrack(queue, true)
}).catch((err) => { }).catch((err) => {
console.error(err) console.error(err)
@ -235,7 +244,7 @@ class Player extends EventEmitter {
playlist.requestedBy = message.author playlist.requestedBy = message.author
if (this.isPlaying(message)) { if (this.isPlaying(message)) {
const queue = this._addTracksToQueue(message, playlist.tracks) const queue = this._addTracksToQueue(message, playlist.tracks)
this.emit('addList', message, queue, playlist) this.emit('playlistAdd', message, queue, playlist)
} else { } else {
const track = new Track(playlist.tracks.shift(), message.author) const track = new Track(playlist.tracks.shift(), message.author)
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', message, e))
@ -244,29 +253,35 @@ class Player extends EventEmitter {
} }
} }
async _resolveSong (message, query) {
}
async _handleSong (message, query) {
}
async play (message, query) { async play (message, query) {
const isPlaying = this.isPlaying(message) const isPlaying = this.isPlaying(message)
if (!isPlaying) { if (this.util.isYTPlaylistLink(query)) {
if (this.util.isYTPlaylistLink(query)) { return this._handlePlaylist(message, query)
return this._handlePlaylist(message, query) }
} let trackToPlay
let trackToPlay if (query instanceof Track) {
if (query instanceof Track) { trackToPlay = query
trackToPlay = query } else if (this.util.isYTVideoLink(query)) {
} else if (this.util.isYTVideoLink(query)) { const videoData = await ytdl.getBasicInfo(query)
const videoData = await ytdl.getBasicInfo(query) trackToPlay = new Track(videoData, message.author)
trackToPlay = new Track(videoData, message.author) } else {
trackToPlay = await this._searchTracks(message, query)
}
if (trackToPlay) {
if (this.isPlaying(message)) {
const queue = this._addTrackToQueue(message, trackToPlay)
this.emit('trackAdd', message, queue, queue.tracks[queue.tracks.length - 1])
} else { } else {
trackToPlay = await this._searchTracks(message, query) const queue = await this._createQueue(message, trackToPlay)
} this.emit('trackStart', message, queue.tracks[0])
if (trackToPlay) {
if (this.isPlaying(message)) {
const queue = this._addToQueue(message, trackToPlay)
this.emit('addSong', message, queue, queue.tracks[queue.tracks.length - 1])
} else {
const queue = await this._createQueue(message, trackToPlay)
this.emit('playSong', message, queue, queue.tracks[0])
}
} }
} }
} }
@ -455,7 +470,7 @@ class Player extends EventEmitter {
if (newState.member.id === this.client.user.id && !newState.channelID) { if (newState.member.id === this.client.user.id && !newState.channelID) {
queue.stream.destroy() queue.stream.destroy()
this.queues.delete(newState.guild.id) this.queues.delete(newState.guild.id)
this.emit('botDisconnected') this.emit('botDisconnect')
} }
// process leaveOnEmpty checks // process leaveOnEmpty checks
@ -535,18 +550,18 @@ class Player extends EventEmitter {
} }
if (queue.stopped) return if (queue.stopped) return
// If there isn't any music in the queue // If there isn't next music in the queue
if (queue.tracks.length === 0) { if (queue.tracks.length === 1 && !queue.repeatMode && !firstPlay) {
// Leave the voice channel // Leave the voice channel
if (this.options.leaveOnEnd && !queue.stopped) queue.voiceConnection.channel.leave() if (this.options.leaveOnEnd && !queue.stopped) queue.voiceConnection.channel.leave()
// Remove the guild from the guilds list // Remove the guild from the guilds list
this.queues.delete(queue.guildID) this.queues.delete(queue.guildID)
// Emit stop event // Emit stop event
if (queue.stopped) { if (queue.stopped) {
return queue.emit('musicStopped') return queue.emit('musicStopp')
} }
// Emit end event // Emit end event
return queue.emit('queueEnded') return queue.emit('queueEnd')
} }
// if the track needs to be the next one // if the track needs to be the next one
if (!queue.repeatMode && !firstPlay) queue.tracks.shift() if (!queue.repeatMode && !firstPlay) queue.tracks.shift()
@ -554,7 +569,7 @@ class Player extends EventEmitter {
// Reset lastSkipped state // Reset lastSkipped state
queue.lastSkipped = false queue.lastSkipped = false
this._playYTDLStream(track, queue, false).then(() => { this._playYTDLStream(track, queue, false).then(() => {
this.emit('trackStart', queue.firstMessage, track, queue) if (!firstPlay) this.emit('trackStart', queue.firstMessage, track, queue)
}) })
} }
}; };