chore: make linter parse

This commit is contained in:
sofushn 2024-09-07 21:49:10 +02:00
parent af639159d1
commit 107464e222
2 changed files with 13 additions and 18 deletions

View file

@ -18,7 +18,7 @@ export default class {
}
async getSongs(query: string, playlistLimit: number, shouldSplitChapters: boolean): Promise<[SongMetadata[], string]> {
let newSongs: SongMetadata[] = [];
const newSongs: SongMetadata[] = [];
let extraMsg = '';
// Test if it's a complete URL
@ -49,7 +49,7 @@ export default class {
}
} else if (url.protocol === 'spotify:' || url.host === 'open.spotify.com') {
if (this.spotifyAPI === undefined) {
throw new Error('Spotify is not enabled!')
throw new Error('Spotify is not enabled!');
}
const [convertedSongs, nSongsNotFound, totalSongs] = await this.spotifySource(query, playlistLimit, shouldSplitChapters);
@ -81,7 +81,7 @@ export default class {
}
}
} catch (err: any) {
if (err = 'spotify not enabled') {
if (err instanceof Error && err.message === 'Spotify is not enabled!') {
throw err;
}

View file

@ -15,11 +15,10 @@ const filterDuplicates = <T extends {name: string}>(items: T[]) => {
};
const getYouTubeAndSpotifySuggestionsFor = async (query: string, spotify?: SpotifyWebApi, limit = 10): Promise<APIApplicationCommandOptionChoice[]> => {
// Only search Spotify if enabled
let spotifySuggestionPromise = spotify !== undefined
? spotify.search(query, ['album', 'track'], {limit})
: undefined;
const spotifySuggestionPromise = spotify === undefined
? undefined
: spotify.search(query, ['album', 'track'], {limit});
const youtubeSuggestions = await getYouTubeSuggestionsFor(query);
@ -37,10 +36,8 @@ const getYouTubeAndSpotifySuggestionsFor = async (query: string, spotify?: Spoti
}),
));
if (spotify !== undefined && spotifySuggestionPromise !== undefined) {
const spotifyResponse = (await spotifySuggestionPromise).body
const spotifyResponse = (await spotifySuggestionPromise).body;
const spotifyAlbums = filterDuplicates(spotifyResponse.albums?.items ?? []);
const spotifyTracks = filterDuplicates(spotifyResponse.tracks?.items ?? []);
@ -51,14 +48,13 @@ const getYouTubeAndSpotifySuggestionsFor = async (query: string, spotify?: Spoti
const maxSpotifySuggestions = Math.floor(limit / 2);
const numOfSpotifySuggestions = Math.min(maxSpotifySuggestions, totalSpotifyResults);
const maxSpotifyAlbums = Math.floor(numOfSpotifySuggestions / 2);
const numOfSpotifyAlbums = Math.min(maxSpotifyAlbums, spotifyResponse.albums?.items.length ?? 0);
const maxSpotifyTracks = numOfSpotifySuggestions - numOfSpotifyAlbums;
// make room for spotify results
// Make room for spotify results
const maxYouTubeSuggestions = limit - numOfSpotifySuggestions;
suggestions = suggestions.slice(0, maxYouTubeSuggestions)
suggestions = suggestions.slice(0, maxYouTubeSuggestions);
suggestions.push(
...spotifyAlbums.slice(0, maxSpotifyAlbums).map(album => ({
@ -73,7 +69,6 @@ const getYouTubeAndSpotifySuggestionsFor = async (query: string, spotify?: Spoti
value: `spotify:track:${track.id}`,
})),
);
}
return suggestions;