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

Merge pull request #566 from Androz2091/develop

Browse source 
revert extractor first
This commit is contained in:
SN0WF14K3 2021-06-29 00:05:15 +05:45 committed by GitHub
commit 0319f4218d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 43 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -1,6 +1,6 @@
{
"name": "discord-player",
"version": "4.1.3",
"version": "4.1.4",
"description": "Complete framework to facilitate music commands using discord.js",
"main": "lib/index.js",
"types": "lib/index.d.ts",

63
src/Player.ts
View file

@ -488,32 +488,53 @@ export class Player extends EventEmitter {
if (typeof query === 'string') query = query.replace(/<(.+)>/g, '$1');
let track;
if (query instanceof Track) query = query.url;
if (query instanceof Track) track = query;
else {
for (const [_, extractor] of this.Extractors) {
if (extractor.validate(query)) {
const data = await extractor.handle(query);
if (data) {
track = new Track(this, {
title: data.title,
description: data.description,
duration: Util.buildTimeCode(Util.parseMS(data.duration)),
thumbnail: data.thumbnail,
author: data.author,
views: data.views,
engine: data.engine,
source: data.source ?? 'arbitrary',
fromPlaylist: false,
requestedBy: message.author,
url: data.url
});
if (ytdl.validateURL(query)) {
const info = await YouTube.getVideo(query).catch(() => {});
if (!info) return void this.emit(PlayerEvents.NO_RESULTS, message, query);
if (info.live && !this.options.enableLive) return void this.emit(PlayerEvents.ERROR, PlayerErrorEventCodes.LIVE_VIDEO, message, new PlayerError('Live video is not enabled!'));
const lastThumbnail = typeof info.thumbnail === "string" ? info.thumbnail : info.thumbnail.url;
if (extractor.important) break;
track = new Track(this, {
title: info.title,
description: info.description || "",
author: info.channel.name,
url: info.url,
thumbnail: lastThumbnail,
duration: Util.buildTimeCode(Util.parseMS(info.duration * 1000)),
views: parseInt(info.views as unknown as string),
requestedBy: message.author,
fromPlaylist: false,
source: 'youtube',
live: Boolean(info.live)
});
} else {
for (const [_, extractor] of this.Extractors) {
if (extractor.validate(query)) {
const data = await extractor.handle(query);
if (data) {
track = new Track(this, {
title: data.title,
description: data.description,
duration: Util.buildTimeCode(Util.parseMS(data.duration)),
thumbnail: data.thumbnail,
author: data.author,
views: data.views,
engine: data.engine,
source: data.source ?? 'arbitrary',
fromPlaylist: false,
requestedBy: message.author,
url: data.url
});
if (extractor.important) break;
}
}
}
}
if (!track) track = await this._searchTracks(message, query, firstResult);
if (!track) track = await this._searchTracks(message, query, firstResult);
}
}
if (track) {