mirror of
https://github.com/BluemediaDev/muse.git
synced 2025-05-08 19:31:35 +02:00
Limit playlist adds to 50 songs
This commit is contained in:
parent
a0c5875ee4
commit
0357373123
4 changed files with 47 additions and 8 deletions
|
@ -71,6 +71,7 @@ export default class implements Command {
|
|||
}
|
||||
|
||||
const newSongs: QueuedSong[] = [];
|
||||
let extraMsg = '';
|
||||
|
||||
// Test if it's a complete URL
|
||||
try {
|
||||
|
@ -95,7 +96,15 @@ export default class implements Command {
|
|||
}
|
||||
}
|
||||
} else if (url.protocol === 'spotify:' || url.host === 'open.spotify.com') {
|
||||
const [convertedSongs] = await this.getSongs.spotifySource(args[0]);
|
||||
const [convertedSongs, nSongsNotFound, totalSongs] = await this.getSongs.spotifySource(args[0]);
|
||||
|
||||
if (totalSongs > 50) {
|
||||
extraMsg = 'a random sample of 50 songs was taken';
|
||||
}
|
||||
|
||||
if (nSongsNotFound !== 0) {
|
||||
extraMsg += `and ${nSongsNotFound.toString()} songs were not found`;
|
||||
}
|
||||
|
||||
newSongs.push(...convertedSongs);
|
||||
}
|
||||
|
@ -122,10 +131,14 @@ export default class implements Command {
|
|||
|
||||
const firstSong = newSongs[0];
|
||||
|
||||
if (extraMsg !== '') {
|
||||
extraMsg = ` (${extraMsg})`;
|
||||
}
|
||||
|
||||
if (newSongs.length === 1) {
|
||||
await res.stop(`u betcha, **${firstSong.title}** added to the queue`);
|
||||
await res.stop(`u betcha, **${firstSong.title}** added to the queue${extraMsg}`);
|
||||
} else {
|
||||
await res.stop(`u betcha, **${firstSong.title}** and ${newSongs.length - 1} other songs were added to the queue`);
|
||||
await res.stop(`u betcha, **${firstSong.title}** and ${newSongs.length - 1} other songs were added to the queue${extraMsg}`);
|
||||
}
|
||||
|
||||
if (this.playerManager.get(msg.guild!.id).voiceConnection === null) {
|
||||
|
|
|
@ -7,6 +7,7 @@ import Spotify from 'spotify-web-api-node';
|
|||
import ytsr from 'ytsr';
|
||||
import YouTube from 'youtube.ts';
|
||||
import pLimit from 'p-limit';
|
||||
import uniqueRandomArray from 'unique-random-array';
|
||||
import {QueuedSong, QueuedPlaylist} from '../services/queue';
|
||||
import {TYPES} from '../types';
|
||||
|
||||
|
@ -77,10 +78,10 @@ export default class {
|
|||
});
|
||||
}
|
||||
|
||||
async spotifySource(url: string): Promise<[QueuedSong[], number]> {
|
||||
async spotifySource(url: string): Promise<[QueuedSong[], number, number]> {
|
||||
const parsed = spotifyURI.parse(url);
|
||||
|
||||
const tracks: SpotifyApi.TrackObjectSimplified[] = [];
|
||||
let tracks: SpotifyApi.TrackObjectSimplified[] = [];
|
||||
|
||||
let playlist: QueuedPlaylist | null = null;
|
||||
|
||||
|
@ -137,12 +138,24 @@ export default class {
|
|||
}
|
||||
|
||||
default: {
|
||||
return [[], 0];
|
||||
return [[], 0, 0];
|
||||
}
|
||||
}
|
||||
|
||||
// Get 50 random songs if many
|
||||
const originalNSongs = tracks.length;
|
||||
|
||||
if (tracks.length > 50) {
|
||||
const random = uniqueRandomArray(tracks);
|
||||
|
||||
tracks = [];
|
||||
for (let i = 0; i < 50; i++) {
|
||||
tracks.push(random());
|
||||
}
|
||||
}
|
||||
|
||||
// Limit concurrency so hopefully we don't get banned for searching
|
||||
const limit = pLimit(3);
|
||||
const limit = pLimit(5);
|
||||
let songs = await Promise.all(tracks.map(async track => limit(async () => this.spotifyToYouTube(track, playlist))));
|
||||
|
||||
let nSongsNotFound = 0;
|
||||
|
@ -158,7 +171,7 @@ export default class {
|
|||
return accum;
|
||||
}, []);
|
||||
|
||||
return [songs as QueuedSong[], nSongsNotFound];
|
||||
return [songs as QueuedSong[], nSongsNotFound, originalNSongs];
|
||||
}
|
||||
|
||||
private async spotifyToYouTube(track: SpotifyApi.TrackObjectSimplified, playlist: QueuedPlaylist | null): Promise<QueuedSong | null> {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue