aboutsummaryrefslogtreecommitdiff
path: root/src/services
diff options
context:
space:
mode:
authorMax Isom <[email protected]>2020-03-25 17:59:09 -0500
committerMax Isom <[email protected]>2020-03-25 17:59:09 -0500
commit4e1a156f9be48eaefbd3f6dc09f302db7deaddb2 (patch)
treebd10d224834684b242aefd87a475241d09e3b324 /src/services
parentdc70a37e962d39ddc5781525d3178e5d9ebe6861 (diff)
downloadmuse-4e1a156f9be48eaefbd3f6dc09f302db7deaddb2.tar.xz
muse-4e1a156f9be48eaefbd3f6dc09f302db7deaddb2.zip
Bump dependencies
Diffstat (limited to 'src/services')
-rw-r--r--src/services/get-songs.ts14
-rw-r--r--src/services/player.ts6
2 files changed, 15 insertions, 5 deletions
diff --git a/src/services/get-songs.ts b/src/services/get-songs.ts
index 4e8d955..8cbb60c 100644
--- a/src/services/get-songs.ts
+++ b/src/services/get-songs.ts
@@ -56,8 +56,16 @@ export default class {
const playlist = await this.youtube.playlists.get(listId);
const {items} = await this.youtube.playlists.items(listId, {maxResults: '50'});
+ interface videoResult {
+ id: string;
+ contentDetails: {
+ videoId: string;
+ duration: string;
+ };
+ }
+
// Unfortunately, package doesn't provide a method for this
- const res: any = await got('https://www.googleapis.com/youtube/v3/videos', {searchParams: {
+ const {items: videos}: {items: videoResult[]} = await got('https://www.googleapis.com/youtube/v3/videos', {searchParams: {
part: 'contentDetails',
id: items.map(item => item.contentDetails.videoId).join(','),
key: this.youtubeKey
@@ -66,7 +74,7 @@ export default class {
const queuedPlaylist = {title: playlist.snippet.title, source: playlist.id};
return items.map(video => {
- const length = toSeconds(parse(res.items.find((i: any) => i.id === video.contentDetails.videoId).contentDetails.duration));
+ const length = toSeconds(parse(videos.find((i: { id: string }) => i.id === video.contentDetails.videoId)!.contentDetails.duration));
return {
title: video.snippet.title,
@@ -178,7 +186,7 @@ export default class {
private async spotifyToYouTube(track: SpotifyApi.TrackObjectSimplified, playlist: QueuedPlaylist | null): Promise<QueuedSong | null> {
try {
const {items} = await ytsr(`"${track.name}" "${track.artists[0].name}" offical`, {limit: 5});
- const video = items.find((item: { type: string }) => item.type === 'video');
+ const video = items.find(item => item.type === 'video');
if (!video) {
throw new Error('No video found for query.');
diff --git a/src/services/player.ts b/src/services/player.ts
index ad25744..074fe5d 100644
--- a/src/services/player.ts
+++ b/src/services/player.ts
@@ -238,7 +238,9 @@ export default class {
}
shuffle(): void {
- this.queue = [...this.queue.slice(0, this.queuePosition + 1), ...shuffle(this.queue.slice(this.queuePosition + 1))];
+ const shuffledSongs = shuffle(this.queue.slice(this.queuePosition + 1));
+
+ this.queue = [...this.queue.slice(0, this.queuePosition + 1), ...shuffledSongs];
}
clear(): void {
@@ -306,7 +308,7 @@ export default class {
const nextBestFormat = (formats: ytdl.videoFormat[]): ytdl.videoFormat | undefined => {
if (formats[0].live) {
- formats = formats.sort((a, b) => (b as any).audioBitrate - (a as any).audioBitrate); // Bad typings
+ formats = formats.sort((a, b) => (b as unknown as {audioBitrate: number}).audioBitrate - (a as unknown as {audioBitrate: number}).audioBitrate); // Bad typings
return formats.find(format => [128, 127, 120, 96, 95, 94, 93].includes(parseInt(format.itag as unknown as string, 10))); // Bad typings
}