complete spotify update
This commit is contained in:
Snowflake107
parent
aeb863e756
commit
0abfb26abc
2 changed files with 87 additions and 37 deletions
122
src/Player.ts
122
src/Player.ts
|
|
@ -187,14 +187,23 @@ export class Player extends EventEmitter {
|
||||||
if (matchSpotifyURL) {
|
if (matchSpotifyURL) {
|
||||||
const spotifyData = await spotify.getData(query).catch(() => {});
|
const spotifyData = await spotify.getData(query).catch(() => {});
|
||||||
if (spotifyData) {
|
if (spotifyData) {
|
||||||
const searchString = this.options.disableArtistSearch
|
const spotifyTrack = new Track(this, {
|
||||||
? spotifyData.name
|
title: spotifyData.name,
|
||||||
: `${spotifyData.name}${spotifyData.artists[0] ? ` - ${spotifyData.artists[0]?.name}` : ""}`;
|
description: spotifyData.description ?? '',
|
||||||
tracks = await Util.ytSearch(searchString, {
|
author: spotifyData.artists[0]?.name ?? 'Unknown Artist',
|
||||||
user: message.author,
|
url: spotifyData.external_urls?.spotify ?? query,
|
||||||
player: this,
|
thumbnail:
|
||||||
limit: 1
|
spotifyData.album?.images[0]?.url ?? spotifyData.preview_url?.length
|
||||||
|
? `https://i.scdn.co/image/${spotifyData.preview_url?.split('?cid=')[1]}`
|
||||||
|
: 'https://www.scdn.co/i/_global/twitter_card-default.jpg',
|
||||||
|
duration: Util.buildTimeCode(Util.parseMS(spotifyData.duration_ms)),
|
||||||
|
views: 0,
|
||||||
|
requestedBy: message.author,
|
||||||
|
fromPlaylist: false,
|
||||||
|
source: 'spotify'
|
||||||
});
|
});
|
||||||
|
|
||||||
|
tracks = [spotifyTrack];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -207,33 +216,49 @@ export class Player extends EventEmitter {
|
||||||
if (!playlist) return void this.emit(PlayerEvents.NO_RESULTS, message, query);
|
if (!playlist) return void this.emit(PlayerEvents.NO_RESULTS, message, query);
|
||||||
|
|
||||||
// tslint:disable-next-line:no-shadowed-variable
|
// tslint:disable-next-line:no-shadowed-variable
|
||||||
let tracks = await Promise.all<Track>(
|
let tracks: Track[] = [];
|
||||||
playlist.tracks.items.map(async (item: any) => {
|
|
||||||
const sq =
|
|
||||||
queryType === 'spotify_album'
|
|
||||||
? `${
|
|
||||||
this.options.disableArtistSearch
|
|
||||||
? item.artists[0].name
|
|
||||||
: `${item.artists[0].name} - `
|
|
||||||
}${item.name ?? item.track.name}`
|
|
||||||
: `${
|
|
||||||
this.options.disableArtistSearch
|
|
||||||
? item.track.artists[0].name
|
|
||||||
: `${item.track.artists[0].name} - `
|
|
||||||
}${item.name ?? item.track.name}`;
|
|
||||||
|
|
||||||
const data = await Util.ytSearch(sq, {
|
if (playlist.type !== 'playlist')
|
||||||
limit: 1,
|
tracks = playlist.tracks.items.map((m: any) => {
|
||||||
player: this,
|
const data = new Track(this, {
|
||||||
user: message.author,
|
title: m.name ?? '',
|
||||||
pl: true
|
description: m.description ?? '',
|
||||||
|
author: m.artists[0]?.name ?? 'Unknown Artist',
|
||||||
|
url: m.external_urls?.spotify ?? query,
|
||||||
|
thumbnail:
|
||||||
|
playlist.images[0]?.url ?? m.preview_url?.length
|
||||||
|
? `https://i.scdn.co/image/${m.preview_url?.split('?cid=')[1]}`
|
||||||
|
: 'https://www.scdn.co/i/_global/twitter_card-default.jpg',
|
||||||
|
duration: Util.buildTimeCode(Util.parseMS(m.duration_ms)),
|
||||||
|
views: 0,
|
||||||
|
requestedBy: message.author,
|
||||||
|
fromPlaylist: true,
|
||||||
|
source: 'spotify'
|
||||||
|
});
|
||||||
|
return data;
|
||||||
|
});
|
||||||
|
else {
|
||||||
|
tracks = playlist.tracks.items.map((m: any) => {
|
||||||
|
const data = new Track(this, {
|
||||||
|
title: m.track.name ?? '',
|
||||||
|
description: m.track.description ?? '',
|
||||||
|
author: m.track.artists[0]?.name ?? 'Unknown Artist',
|
||||||
|
url: m.track.external_urls?.spotify ?? query,
|
||||||
|
thumbnail:
|
||||||
|
playlist.images[0]?.url ?? m.track.preview_url?.length
|
||||||
|
? `https://i.scdn.co/image/${m.track.preview_url?.split('?cid=')[1]}`
|
||||||
|
: 'https://www.scdn.co/i/_global/twitter_card-default.jpg',
|
||||||
|
duration: Util.buildTimeCode(Util.parseMS(m.track.duration_ms)),
|
||||||
|
views: 0,
|
||||||
|
requestedBy: message.author,
|
||||||
|
fromPlaylist: true,
|
||||||
|
source: 'spotify'
|
||||||
});
|
});
|
||||||
|
|
||||||
if (data.length) return data[0];
|
return data;
|
||||||
})
|
});
|
||||||
);
|
}
|
||||||
|
|
||||||
tracks = tracks.filter((f) => !!f);
|
|
||||||
if (!tracks.length) return void this.emit(PlayerEvents.NO_RESULTS, message, query);
|
if (!tracks.length) return void this.emit(PlayerEvents.NO_RESULTS, message, query);
|
||||||
|
|
||||||
const pl = {
|
const pl = {
|
||||||
|
|
@ -1254,10 +1279,35 @@ export class Player extends EventEmitter {
|
||||||
}
|
}
|
||||||
|
|
||||||
let newStream: any;
|
let newStream: any;
|
||||||
if (queue.playing.raw.source === 'youtube') {
|
let clonedTrack = queue.playing;
|
||||||
newStream = ytdl(queue.playing.url, {
|
|
||||||
|
// modify spotify
|
||||||
|
if (clonedTrack.raw.source === 'spotify') {
|
||||||
|
const searchQueryString = this.options.disableArtistSearch
|
||||||
|
? clonedTrack.title
|
||||||
|
: `${clonedTrack.title}${' - ' + clonedTrack.author}`;
|
||||||
|
const yteqv = await Util.ytSearch(searchQueryString, {
|
||||||
|
player: this,
|
||||||
|
limit: 1,
|
||||||
|
user: clonedTrack.requestedBy
|
||||||
|
}).catch(() => {});
|
||||||
|
|
||||||
|
if (!yteqv || !yteqv.length)
|
||||||
|
return void this.emit(
|
||||||
|
PlayerEvents.ERROR,
|
||||||
|
PlayerErrorEventCodes.VIDEO_UNAVAILABLE,
|
||||||
|
queue.firstMessage,
|
||||||
|
queue.playing,
|
||||||
|
new PlayerError('Could not find alternative track on youtube!', 'SpotifyTrackError')
|
||||||
|
);
|
||||||
|
|
||||||
|
clonedTrack = yteqv[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (clonedTrack.raw.source === 'youtube') {
|
||||||
|
newStream = ytdl(clonedTrack.url, {
|
||||||
opusEncoded: true,
|
opusEncoded: true,
|
||||||
encoderArgs: queue.playing.raw.live ? [] : encoderArgs,
|
encoderArgs: clonedTrack.raw.live ? [] : encoderArgs,
|
||||||
seek: seekTime / 1000,
|
seek: seekTime / 1000,
|
||||||
// tslint:disable-next-line:no-bitwise
|
// tslint:disable-next-line:no-bitwise
|
||||||
highWaterMark: 1 << 25,
|
highWaterMark: 1 << 25,
|
||||||
|
|
@ -1265,9 +1315,9 @@ export class Player extends EventEmitter {
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
newStream = ytdl.arbitraryStream(
|
newStream = ytdl.arbitraryStream(
|
||||||
queue.playing.raw.source === 'soundcloud'
|
clonedTrack.raw.source === 'soundcloud'
|
||||||
? await queue.playing.raw.engine.downloadProgressive()
|
? await clonedTrack.raw.engine.downloadProgressive()
|
||||||
: queue.playing.raw.engine,
|
: clonedTrack.raw.engine,
|
||||||
{
|
{
|
||||||
opusEncoded: true,
|
opusEncoded: true,
|
||||||
encoderArgs,
|
encoderArgs,
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@ export interface PlayerOptions {
|
||||||
|
|
||||||
export type FiltersName = keyof QueueFilters;
|
export type FiltersName = keyof QueueFilters;
|
||||||
|
|
||||||
export type TrackSource = 'soundcloud' | 'youtube' | 'arbitrary';
|
export type TrackSource = 'soundcloud' | 'youtube' | 'spotify' | 'arbitrary';
|
||||||
|
|
||||||
export interface TrackData {
|
export interface TrackData {
|
||||||
title: string;
|
title: string;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue