Bump packages

9 files changed, 24 insertions, 19 deletions

diff --git a/src/bot.ts b/src/bot.ts
index 296c06b..2345a25 100644
--- a/src/bot.ts
+++ b/src/bot.ts
@@ -89,7 +89,7 @@ export default class {
         }
 
         await handler.execute(msg, args);
-      } catch (error) {
+      } catch (error: unknown) {
         debug(error);
         await msg.channel.send(errorMsg((error as Error).message.toLowerCase()));
       }
diff --git a/src/commands/fseek.ts b/src/commands/fseek.ts
index fe8ee93..19d9fbf 100644
--- a/src/commands/fseek.ts
+++ b/src/commands/fseek.ts
@@ -52,8 +52,8 @@ export default class implements Command {
       await player.forwardSeek(seekTime);
 
       await loading.stop();
-    } catch (error) {
-      await loading.stop(errorMsg(error));
+    } catch (error: unknown) {
+      await loading.stop(errorMsg(error as Error));
     }
   }
 }
diff --git a/src/commands/play.ts b/src/commands/play.ts
index 10db7d2..d4f8ba2 100644
--- a/src/commands/play.ts
+++ b/src/commands/play.ts
@@ -2,8 +2,7 @@ import {TextChannel, Message} from 'discord.js';
 import {URL} from 'url';
 import {TYPES} from '../types';
 import {inject, injectable} from 'inversify';
-import {QueuedSong} from '../services/player';
-import {STATUS} from '../services/player';
+import {QueuedSong, STATUS} from '../services/player';
 import PlayerManager from '../managers/player';
 import {getMostPopularVoiceChannel} from '../utils/channels';
 import LoadingMessage from '../utils/loading-message';
@@ -111,7 +110,7 @@ export default class implements Command {
 
         newSongs.push(...convertedSongs);
       }
-    } catch (_) {
+    } catch (_: unknown) {
       // Not a URL, must search YouTube
       const query = args.join(' ');
 
diff --git a/src/commands/seek.ts b/src/commands/seek.ts
index de8f03e..edbb5bd 100644
--- a/src/commands/seek.ts
+++ b/src/commands/seek.ts
@@ -63,8 +63,8 @@ export default class implements Command {
       await player.seek(seekTime);
 
       await loading.stop();
-    } catch (error) {
-      await loading.stop(errorMsg(error));
+    } catch (error: unknown) {
+      await loading.stop(errorMsg(error as Error));
     }
   }
 }
diff --git a/src/commands/skip.ts b/src/commands/skip.ts
index 72b3f46..677ad03 100644
--- a/src/commands/skip.ts
+++ b/src/commands/skip.ts
@@ -32,7 +32,7 @@ export default class implements Command {
       await player.forward();
 
       await loader.stop('keep \'er movin\'');
-    } catch (_) {
+    } catch (_: unknown) {
       await loader.stop(errorMsg('no song to skip to'));
     }
   }
diff --git a/src/commands/unskip.ts b/src/commands/unskip.ts
index 60147b0..5dba251 100644
--- a/src/commands/unskip.ts
+++ b/src/commands/unskip.ts
@@ -28,7 +28,7 @@ export default class implements Command {
       await player.back();
 
       await msg.channel.send('back \'er up\'');
-    } catch (_) {
+    } catch (_: unknown) {
       await msg.channel.send(errorMsg('no song to go back to'));
     }
   }
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];
       };