f3d0r4/woomy
1
0
Fork 0
forked from embee/woomy
Code Issues Pull requests Projects Releases Wiki Activity

playing from links *kinda* works now

Browse source
This commit is contained in:
Emily 2020-04-14 19:44:02 +10:00
parent 5dfbbb8e53
commit 6748f1fb03
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
helpers/music.js
View file

@ -47,21 +47,16 @@ module.exports = client => {
return guild return guild
} }
client.music.isYouTubeLink = function (query) {
return query.startsWith('https://youtube.com/') || query.startsWith('http://youtube.com/') || query.startsWith('https://youtu.be/') || query.startsWith('http://youtu.be/') || query.startsWith('https://m.youtube.com/') || query.startsWith('http://m.youtube.com/') || query.startsWith('https://www.youtube.com/') || query.startsWith('http://www.youtube.com/')
}
client.music.getLinkFromID = function (id) { client.music.getLinkFromID = function (id) {
return 'https://www.youtube.com/watch?v=' + id return 'https://www.youtube.com/watch?v=' + id
} }
client.music.getVideoByQuery = async function (query) { client.music.getVideoByQuery = async function (query) {
const isLink = client.music.isYouTubeLink(query)
let response let response
if (isLink) { if (ytdl.validateURL(query)) {
response = await fetch('https://www.googleapis.com/youtube/v3/search?key=' + client.config.keys.yt + '&part=id,snippet&maxResults=1&type=video&id=' + id) const id = await await ytdl.getURLVideoID(query)
response = await fetch('https://invidio.us/api/v1/videos/' + id)
} else { } else {
// TODO: replace this workaround // TODO: replace this workaround
response = await fetch('https://invidio.us/api/v1/search?q=' + encodeURIComponent(query) + '**') response = await fetch('https://invidio.us/api/v1/search?q=' + encodeURIComponent(query) + '**')
@ -69,7 +64,7 @@ module.exports = client => {
const parsed = await response.json() const parsed = await response.json()
if (parsed[0]) { if (parsed) {
const videos = parsed const videos = parsed
if (videos) { if (videos) {
@ -137,8 +132,10 @@ module.exports = client => {
} }
} }
if (!video) { if (!video && videos[0]) {
video = videos[0] video = videos[0]
} else {
video = videos
} }
// Add video to queue // Add video to queue