Bluemedia/muse
1
0
Fork 0
mirror of https://github.com/BluemediaDev/muse.git synced 2025-06-28 01:32:42 +02:00
Code Issues Projects Releases Packages 1 Wiki Activity

Bump linter version

Browse source
This commit is contained in:
Max Isom 2021-09-19 22:24:46 -04:00
parent fd782219ef
commit dcac22832d
No known key found for this signature in database
GPG key ID: 25C9B1A7F6798880
28 changed files with 184 additions and 198 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/services/cache.ts
View file

@ -22,7 +22,7 @@ export default class CacheProvider {
const {
key = JSON.stringify(functionArgs),
expiresIn
expiresIn,
} = options[options.length - 1] as Options;
const cachedResult = await Cache.findByPk(key);
@ -30,7 +30,7 @@ export default class CacheProvider {
if (cachedResult) {
if (new Date() < cachedResult.expiresAt) {
debug(`Cache hit: ${key}`);
return JSON.parse(cachedResult.value);
return JSON.parse(cachedResult.value) as F;
}
await cachedResult.destroy();
@ -44,7 +44,7 @@ export default class CacheProvider {
await Cache.upsert({
key,
value: JSON.stringify(result),
expiresAt: futureTimeToDate(expiresIn)
expiresAt: futureTimeToDate(expiresIn),
});
return result;

2
src/services/config.ts
View file

@ -11,7 +11,7 @@ const CONFIG_MAP = {
SPOTIFY_CLIENT_ID: process.env.SPOTIFY_CLIENT_ID,
SPOTIFY_CLIENT_SECRET: process.env.SPOTIFY_CLIENT_SECRET,
DATA_DIR,
CACHE_DIR: path.join(DATA_DIR, 'cache')
CACHE_DIR: path.join(DATA_DIR, 'cache'),
} as const;
@injectable()

60
src/services/get-songs.ts
View file

@ -42,17 +42,17 @@ export default class {
this.ytsrQueue = new PQueue({concurrency: 4});
}
async youtubeVideoSearch(query: string): Promise<QueuedSongWithoutChannel|null> {
async youtubeVideoSearch(query: string): Promise<QueuedSongWithoutChannel | null> {
try {
const {items} = await this.ytsrQueue.add(async () => this.cache.wrap(
ytsr,
query,
{
limit: 10
limit: 10,
},
{
expiresIn: ONE_HOUR_IN_SECONDS
}
expiresIn: ONE_HOUR_IN_SECONDS,
},
));
let firstVideo: Video | undefined;
@ -74,14 +74,14 @@ export default class {
}
}
async youtubeVideo(url: string): Promise<QueuedSongWithoutChannel|null> {
async youtubeVideo(url: string): Promise<QueuedSongWithoutChannel | null> {
try {
const videoDetails = await this.cache.wrap(
this.youtube.videos.get,
cleanUrl(url),
{
expiresIn: ONE_HOUR_IN_SECONDS
}
expiresIn: ONE_HOUR_IN_SECONDS,
},
);
return {
@ -90,7 +90,7 @@ export default class {
length: toSeconds(parse(videoDetails.contentDetails.duration)),
url: videoDetails.id,
playlist: null,
isLive: videoDetails.snippet.liveBroadcastContent === 'live'
isLive: videoDetails.snippet.liveBroadcastContent === 'live',
};
} catch (_: unknown) {
return null;
@ -103,8 +103,8 @@ export default class {
this.youtube.playlists.get,
listId,
{
expiresIn: ONE_MINUTE_IN_SECONDS
}
expiresIn: ONE_MINUTE_IN_SECONDS,
},
);
interface VideoDetailsResponse {
@ -128,8 +128,8 @@ export default class {
listId,
{maxResults: '50', pageToken: nextToken},
{
expiresIn: ONE_MINUTE_IN_SECONDS
}
expiresIn: ONE_MINUTE_IN_SECONDS,
},
);
nextToken = nextPageToken;
@ -140,22 +140,20 @@ export default class {
videoDetailsPromises.push((async () => {
// Unfortunately, package doesn't provide a method for this
const {items: videoDetailItems} = await this.cache.wrap(
() => {
return got(
'https://www.googleapis.com/youtube/v3/videos',
{
searchParams: {
part: 'contentDetails',
id: items.map(item => item.contentDetails.videoId).join(','),
key: this.youtubeKey,
responseType: 'json'
}
}
).json();
},
async () => got(
'https://www.googleapis.com/youtube/v3/videos',
{
searchParams: {
part: 'contentDetails',
id: items.map(item => item.contentDetails.videoId).join(','),
key: this.youtubeKey,
responseType: 'json',
},
},
).json() as Promise<{items: VideoDetailsResponse[]}>,
{
expiresIn: ONE_MINUTE_IN_SECONDS
}
expiresIn: ONE_MINUTE_IN_SECONDS,
},
);
videoDetails.push(...videoDetailItems);
@ -168,9 +166,9 @@ export default class {
const songsToReturn: QueuedSongWithoutChannel[] = [];
for (let video of playlistVideos) {
for (const video of playlistVideos) {
try {
const length = toSeconds(parse(videoDetails.find((i: { id: string }) => i.id === video.contentDetails.videoId)!.contentDetails.duration));
const length = toSeconds(parse(videoDetails.find((i: {id: string}) => i.id === video.contentDetails.videoId)!.contentDetails.duration));
songsToReturn.push({
title: video.snippet.title,
@ -178,7 +176,7 @@ export default class {
length,
url: video.contentDetails.videoId,
playlist: queuedPlaylist,
isLive: false
isLive: false,
});
} catch (_: unknown) {
// Private and deleted videos are sometimes in playlists, duration of these is not returned and they should not be added to the queue.
@ -220,7 +218,7 @@ export default class {
// eslint-disable-next-line no-await-in-loop
({body: tracksResponse} = await this.spotify.getPlaylistTracks(uri.id, {
limit: parseInt(new URL(tracksResponse.next).searchParams.get('limit') ?? '50', 10),
offset: parseInt(new URL(tracksResponse.next).searchParams.get('offset') ?? '0', 10)
offset: parseInt(new URL(tracksResponse.next).searchParams.get('offset') ?? '0', 10),
}));
tracks.push(...tracksResponse.items.map(playlistItem => playlistItem.track));

12
src/services/natural-language-commands.ts
View file

@ -31,8 +31,8 @@ export default class {
length: 204,
playlist: null,
isLive: false,
addedInChannelId: msg.channel.id
}, 8, 10)
addedInChannelId: msg.channel.id,
}, 8, 10),
]);
return true;
@ -48,8 +48,8 @@ export default class {
length: 385,
playlist: null,
isLive: false,
addedInChannelId: msg.channel.id
}, 358, 5.5)
addedInChannelId: msg.channel.id,
}, 358, 5.5),
]);
return true;
@ -65,8 +65,8 @@ export default class {
length: 227,
playlist: null,
isLive: false,
addedInChannelId: msg.channel.id
}, 50, 13)
addedInChannelId: msg.channel.id,
}, 50, 13),
]);
return true;

4
src/services/player.ts
View file

@ -26,7 +26,7 @@ export interface QueuedSong {
export enum STATUS {
PLAYING,
PAUSED
PAUSED,
}
export default class {
@ -368,7 +368,7 @@ export default class {
'-reconnect_streamed',
'1',
'-reconnect_delay_max',
'5'
'5',
]);
if (options.seek) {

3
src/services/third-party.ts
View file

@ -13,10 +13,11 @@ export default class ThirdParty {
constructor(@inject(TYPES.Config) config: Config) {
// Library is transpiled incorrectly
// eslint-disable-next-line
this.youtube = new ((Youtube as any).default)(config.YOUTUBE_API_KEY);
this.spotify = new SpotifyWebApi({
clientId: config.SPOTIFY_CLIENT_ID,
clientSecret: config.SPOTIFY_CLIENT_SECRET
clientSecret: config.SPOTIFY_CLIENT_SECRET,
});
void this.refreshSpotifyToken();