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

✨ Add support for soundcloud

Browse source
This commit is contained in:
Androz2091 2020-08-14 14:57:32 +02:00
parent 3ac073059c
commit 78114ec36d
3 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -32,7 +32,7 @@
"merge-options": "^2.0.0",
"moment": "^2.27.0",
"node-fetch": "^2.6.0",
"soundcloud-scraper": "^1.0.1",
"soundcloud-scraper": "^1.0.2",
"spotify-url-info": "^1.3.1",
"ytpl": "^0.2.4",
"ytsr": "^0.1.19"

27
src/Player.js
View file

@ -3,6 +3,7 @@ const Discord = require('discord.js')
const ytsr = require('ytsr')
const ytpl = require('ytpl')
const spotify = require('spotify-url-info')
const soundcloud = require('soundcloud-scraper')
const moment = require('moment')
const Queue = require('./Queue')
const Track = require('./Track')
@ -120,6 +121,8 @@ class Player extends EventEmitter {
return 'youtube-playlist'
} else if (this.util.isYTVideoLink(query)) {
return 'youtube-video'
} else if (this.util.isSoundcloudLink(query)) {
return 'soundcloud-song'
} else {
return 'youtube-video-keywords'
}
@ -133,25 +136,29 @@ class Player extends EventEmitter {
_searchTracks (message, query) {
return new Promise(async (resolve) => {
const tracks = []
let updatedQuery = null
const queryType = this.resolveQueryType(query)
let queryType = this.resolveQueryType(query)
if (queryType === 'spotify-song') {
const matchSpotifyURL = query.match(/https?:\/\/(?:embed\.|open\.)(?:spotify\.com\/)(?:track\/|\?uri=spotify:track:)((\w|-){22})/)
if (matchSpotifyURL) {
const spotifyData = await spotify.getPreview(query).catch(() => {})
if (spotifyData) {
const YTQuery = `${spotifyData.artist} - ${spotifyData.track}`
const results = await ytsr(YTQuery)
if (results.items.length !== 0) {
const resultsVideo = results.items.filter((i) => i.type === 'video')
tracks.push(...resultsVideo.map((r) => new Track(r, message.author, null)))
}
updatedQuery = `${spotifyData.artist} - ${spotifyData.track}`
queryType = 'youtube-video-keywords'
}
}
} else if (queryType === 'youtube-video-keywords') {
await ytsr(query).then((results) => {
} else if (queryType === 'soundcloud-song') {
const soundcloudData = await soundcloud.getSongInfo(query).catch(() => {})
if (soundcloudData) {
updatedQuery = `${soundcloudData.author} - ${soundcloudData.title}`
queryType = 'youtube-video-keywords'
}
}
if (queryType === 'youtube-video-keywords') {
await ytsr(updatedQuery || query).then((results) => {
if (results.items.length !== 0) {
const resultsVideo = results.items.filter((i) => i.type === 'video')
tracks.push(...resultsVideo.map((r) => new Track(r, message.author, null)))

4
src/Util.js
View file

@ -1,5 +1,5 @@
const ytpl = require('ytpl')
const scraper = require('soundcloud-scraper')
const soundcloud = require('soundcloud-scraper')
const Discord = require('discord.js')
const youtubeVideoRegex = (/(?:youtube\.com\/(?:[^\/]+\/.+\/|(?:v|e(?:mbed)?)\/|.*[?&]v=)|youtu\.be\/)([^"&?\/\s]{11})/)
@ -15,7 +15,7 @@ module.exports = class Util {
}
static isSoundcloudLink (query) {
return scraper.validateURL(query)
return soundcloud.validateURL(query)
}
static isSpotifyLink (query) {