Skip to content

Commit

Permalink
Spotify support & bug fixes (#40)
Browse files Browse the repository at this point in the history
Co-authored-by: Androz2091 <[email protected]>
  • Loading branch information
twlite and Androz2091 authored Jul 4, 2020
1 parent 5b6d1c4 commit a0cdcbc
Show file tree
Hide file tree
Showing 4 changed files with 152 additions and 139 deletions.
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@
},
"homepage": "https://github.com/Androz2091/discord-player#readme",
"dependencies": {
"@discordjs/opus": "^0.3.2",
"discord-ytdl-core": "^4.0.2",
"merge-options": "^2.0.0",
"node-fetch": "^2.6.0",
"simple-youtube-api": "^5.2.1",
"ytpl": "^0.1.21",
"spotify-url-info": "^1.3.1",
"ytpl": "^0.1.22",
"ytsr": "^0.1.15"
},
"devDependencies": {
"discord.js": "discordjs/discord.js",
"@discordjs/opus": "^0.3.2",
"discord.js": "^12.2.0",
"eslint": "^7.1.0",
"eslint-config-standard": "^14.1.1",
"eslint-plugin-import": "^2.20.2",
Expand Down
20 changes: 14 additions & 6 deletions src/Player.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const ytdl = require('discord-ytdl-core')
const Discord = require('discord.js')
const ytsr = require('ytsr')
const ytpl = require('ytpl')

const spotify = require('spotify-url-info')
const Queue = require('./Queue')
const Track = require('./Track')

Expand Down Expand Up @@ -176,10 +176,15 @@ class Player {
}
}
}
const matchSpotifyURL = query.match(/https?:\/\/(?:embed\.|open\.)(?:spotify\.com\/)(?:track\/|\?uri=spotify:track:)((\w|-){22})/)
if (matchSpotifyURL) {
const spotifyData = await spotify.getPreview(query).catch(e => resolve([]))
query = `${spotifyData.artist} - ${spotifyData.track}`
}
// eslint-disable-next-line no-useless-escape
const matchURL = query.match(/(?:youtube\.com\/(?:[^\/]+\/.+\/|(?:v|e(?:mbed)?)\/|.*[?&]v=)|youtu\.be\/)([^"&?\/\s]{11})/)
if (matchURL) {
query = matchURL[1]
const matchYoutubeURL = query.match(/(?:youtube\.com\/(?:[^\/]+\/.+\/|(?:v|e(?:mbed)?)\/|.*[?&]v=)|youtu\.be\/)([^"&?\/\s]{11})/)
if (matchYoutubeURL) {
query = matchYoutubeURL[1]
}
ytsr(query, (err, results) => {
if (results.items.length < 1) return resolve([])
Expand Down Expand Up @@ -814,10 +819,11 @@ class Player {
if (queue.stream) queue.stream.destroy()
queue.stream = newStream
queue.voiceConnection.play(newStream, {
type: 'opus'
type: 'opus',
bitrate: 'auto'
})
if (currentStreamTime) {
queue.voiceConnection.dispatcher.streamTime += currentStreamTime
queue.playing.streamTime += currentStreamTime
}
queue.voiceConnection.dispatcher.setVolumeLogarithmic(queue.calculatedVolume / 200)
// When the track starts
Expand All @@ -826,6 +832,8 @@ class Player {
})
// When the track ends
queue.voiceConnection.dispatcher.on('finish', () => {
// reset streamTime
if (queue.repeatMode) queue.playing.streamTime = 0
// Play the next track
return this._playTrack(queue.guildID, false)
})
Expand Down
258 changes: 129 additions & 129 deletions src/Queue.js
Original file line number Diff line number Diff line change
@@ -1,129 +1,129 @@
const Discord = require('discord.js')
const { EventEmitter } = require('events')
const Track = require('./Track')

/**
* Represents a guild queue.
*/
class Queue extends EventEmitter {
/**
* @param {Discord.Snowflake} guildID ID of the guild this queue is for.
*/
constructor (guildID) {
super()
/**
* ID of the guild this queue is for.
* @type {Discord.Snowflake}
*/
this.guildID = guildID
/**
* The voice connection of this queue.
* @type {Discord.VoiceConnection}
*/
this.voiceConnection = null
/**
* The song currently played.
* @type {Track}
*/
this.playing = null
/**
* The tracks of this queue. The first one is currenlty playing and the others are going to be played.
* @type {Track[]}
*/
this.tracks = []
/**
* Whether the stream is currently stopped.
* @type {boolean}
*/
this.stopped = false
/**
* Whether the last track was skipped.
* @type {boolean}
*/
this.lastSkipped = false
/**
* The stream volume of this queue. (0-100)
* @type {number}
*/
this.volume = 100
/**
* Whether the stream is currently paused.
* @type {boolean}
*/
this.paused = true
/**
* Whether the repeat mode is enabled.
* @type {boolean}
*/
this.repeatMode = false
/**
* Filters status
* @type {Object}
*/
this.filters = {}
}

get calculatedVolume () {
return this.filters.bassboost ? this.volume + 40 : this.volume
}
}

module.exports = Queue

/**
* Emitted when the queue is empty.
* @event Queue#end
*
* @example
* client.on('message', (message) => {
*
* const args = message.content.slice(settings.prefix.length).trim().split(/ +/g);
* const command = args.shift().toLowerCase();
*
* if(command === 'play'){
*
* let track = await client.player.play(message.member.voice.channel, args[0]);
*
* track.queue.on('end', () => {
* message.channel.send('The queue is empty, please add new tracks!');
* });
*
* }
*
* });
*/

/**
* Emitted when the voice channel is empty.
* @event Queue#channelEmpty
*/

/**
* Emitted when the track changes.
* @event Queue#trackChanged
* @param {Track} oldTrack The old track (playing before)
* @param {Track} newTrack The new track (currently playing)
* @param {Boolean} skipped Whether the change is due to the skip() function
*
* @example
* client.on('message', (message) => {
*
* const args = message.content.slice(settings.prefix.length).trim().split(/ +/g);
* const command = args.shift().toLowerCase();
*
* if(command === 'play'){
*
* let track = await client.player.play(message.member.voice.channel, args[0]);
*
* track.queue.on('trackChanged', (oldTrack, newTrack, skipped, repeatMode) => {
* if(repeatMode){
* message.channel.send(`Playing ${newTrack} again...`);
* } else {
* message.channel.send(`Now playing ${newTrack}...`);
* }
* });
*
* }
*
* });
*/
const Discord = require('discord.js')
const { EventEmitter } = require('events')
const Track = require('./Track')

/**
* Represents a guild queue.
*/
class Queue extends EventEmitter {
/**
* @param {Discord.Snowflake} guildID ID of the guild this queue is for.
*/
constructor (guildID) {
super()
/**
* ID of the guild this queue is for.
* @type {Discord.Snowflake}
*/
this.guildID = guildID
/**
* The voice connection of this queue.
* @type {Discord.VoiceConnection}
*/
this.voiceConnection = null
/**
* The song currently played.
* @type {Track}
*/
this.playing = null
/**
* The tracks of this queue. The first one is currenlty playing and the others are going to be played.
* @type {Track[]}
*/
this.tracks = []
/**
* Whether the stream is currently stopped.
* @type {boolean}
*/
this.stopped = false
/**
* Whether the last track was skipped.
* @type {boolean}
*/
this.lastSkipped = false
/**
* The stream volume of this queue. (0-100)
* @type {number}
*/
this.volume = 100
/**
* Whether the stream is currently paused.
* @type {boolean}
*/
this.paused = true
/**
* Whether the repeat mode is enabled.
* @type {boolean}
*/
this.repeatMode = false
/**
* Filters status
* @type {Object}
*/
this.filters = {}
}

get calculatedVolume () {
return this.filters.bassboost ? this.volume + 50 : this.volume
}
}

module.exports = Queue

/**
* Emitted when the queue is empty.
* @event Queue#end
*
* @example
* client.on('message', (message) => {
*
* const args = message.content.slice(settings.prefix.length).trim().split(/ +/g);
* const command = args.shift().toLowerCase();
*
* if(command === 'play'){
*
* let track = await client.player.play(message.member.voice.channel, args[0]);
*
* track.queue.on('end', () => {
* message.channel.send('The queue is empty, please add new tracks!');
* });
*
* }
*
* });
*/

/**
* Emitted when the voice channel is empty.
* @event Queue#channelEmpty
*/

/**
* Emitted when the track changes.
* @event Queue#trackChanged
* @param {Track} oldTrack The old track (playing before)
* @param {Track} newTrack The new track (currently playing)
* @param {Boolean} skipped Whether the change is due to the skip() function
*
* @example
* client.on('message', (message) => {
*
* const args = message.content.slice(settings.prefix.length).trim().split(/ +/g);
* const command = args.shift().toLowerCase();
*
* if(command === 'play'){
*
* let track = await client.player.play(message.member.voice.channel, args[0]);
*
* track.queue.on('trackChanged', (oldTrack, newTrack, skipped, repeatMode) => {
* if(repeatMode){
* message.channel.send(`Playing ${newTrack} again...`);
* } else {
* message.channel.send(`Now playing ${newTrack}...`);
* }
* });
*
* }
*
* });
*/
5 changes: 5 additions & 0 deletions src/Track.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@ class Track {
* @type {Queue}
*/
this.queue = queue

/**
* Stream time of the track (available on applying filters)
*/
this.streamTime = 0
}

/**
Expand Down

0 comments on commit a0cdcbc

Please sign in to comment.