aboutsummaryrefslogtreecommitdiff
path: root/src/services
diff options
context:
space:
mode:
authorMax Isom <[email protected]>2020-10-24 12:32:43 -0400
committerMax Isom <[email protected]>2020-10-24 12:32:43 -0400
commit599dbce6e652ad1f4decb940170a26bd3b038af6 (patch)
tree6d508c7b6df71f82a5aac23d3139108e97cc9a54 /src/services
parent4f0ab9b54924ff03e9696018ad204bd98688c0ed (diff)
downloadmuse-599dbce6e652ad1f4decb940170a26bd3b038af6.tar.xz
muse-599dbce6e652ad1f4decb940170a26bd3b038af6.zip
Bump packages
Diffstat (limited to 'src/services')
-rw-r--r--src/services/get-songs.ts6
-rw-r--r--src/services/natural-language-commands.ts2
-rw-r--r--src/services/player.ts16
3 files changed, 15 insertions, 9 deletions
diff --git a/src/services/get-songs.ts b/src/services/get-songs.ts
index 221a79c..48a1dc7 100644
--- a/src/services/get-songs.ts
+++ b/src/services/get-songs.ts
@@ -29,7 +29,7 @@ export default class {
const {items: [video]} = await this.youtube.videos.search({q: query, maxResults: 1, type: 'video'});
return await this.youtubeVideo(video.id.videoId);
- } catch (_) {
+ } catch (_: unknown) {
return null;
}
}
@@ -46,7 +46,7 @@ export default class {
playlist: null,
isLive: videoDetails.snippet.liveBroadcastContent === 'live'
};
- } catch (_) {
+ } catch (_: unknown) {
return null;
}
}
@@ -200,7 +200,7 @@ export default class {
playlist,
isLive: video.live
};
- } catch (_) {
+ } catch (_: unknown) {
return null;
}
}
diff --git a/src/services/natural-language-commands.ts b/src/services/natural-language-commands.ts
index fa2b119..45605e1 100644
--- a/src/services/natural-language-commands.ts
+++ b/src/services/natural-language-commands.ts
@@ -84,7 +84,7 @@ export default class {
resolve();
}, duration * 1000);
- } catch (error) {
+ } catch (error: unknown) {
reject(error);
}
});
diff --git a/src/services/player.ts b/src/services/player.ts
index 0ba79c9..76ff73f 100644
--- a/src/services/player.ts
+++ b/src/services/player.ts
@@ -141,7 +141,7 @@ export default class {
this.startTrackingPosition(0);
this.lastSongURL = currentSong.url;
}
- } catch (error) {
+ } catch (error: unknown) {
this.removeCurrent();
throw error;
}
@@ -171,7 +171,7 @@ export default class {
this.status = STATUS.PAUSED;
this.disconnect();
}
- } catch (error) {
+ } catch (error: unknown) {
this.queuePosition--;
throw error;
}
@@ -282,7 +282,7 @@ export default class {
await fs.access(this.getCachedPath(url));
return true;
- } catch (_) {
+ } catch (_: unknown) {
return false;
}
}
@@ -313,7 +313,7 @@ export default class {
format = formats.find(filter);
const nextBestFormat = (formats: ytdl.videoFormat[]): ytdl.videoFormat | undefined => {
- if (formats[0].live) {
+ if (formats[0].isLive) {
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
@@ -321,7 +321,13 @@ export default class {
formats = formats
.filter(format => format.averageBitrate)
- .sort((a, b) => b.averageBitrate - a.averageBitrate);
+ .sort((a, b) => {
+ if (a && b) {
+ return b.averageBitrate! - a.averageBitrate!;
+ }
+
+ return 0;
+ });
return formats.find(format => !format.bitrate) ?? formats[0];
};