bot: v3.1.3

* discord.js 14.15.2
* cleanups and some changes

package.json

@@ -1,6 +1,6 @@
 {
   "name": "music-bot",
-  "version": "3.0.0",
+  "version": "3.1.2",
   "description": "A general music Discord bot.",
   "main": "./src/bot.ts",
   "repository": {
@@ -16,11 +16,11 @@
     "node": ">=20.0.0"
   },
   "dependencies": {
-    "@discordjs/voice": "^0.16.1",
+    "@discordjs/voice": "^0.17.0",
     "array-move": "^3.0.1",
     "bufferutil": "^4.0.8",
     "chalk": "^4.1.2",
-    "discord.js": "^14.14.1",
+    "discord.js": "^14.15.2",
     "ffmpeg-static": "^5.2.0",
     "lyrics-finder": "^21.7.0",
     "opusscript": "^0.1.1",
@@ -34,9 +34,9 @@
   },
   "devDependencies": {
     "@rollup/plugin-typescript": "^11.1.6",
-    "@types/node": "^20.12.7",
+    "@types/node": "^20.12.8",
     "esbuild": "^0.20.2",
-    "rollup": "^4.17.1",
+    "rollup": "^4.17.2",
     "rollup-plugin-esbuild": "^6.1.1",
     "rollup-plugin-typescript-paths": "^1.5.0",
     "tslib": "^2.6.2",

src/commands/info/info.ts

@@ -10,6 +10,7 @@ export default {
         .setName("info")
         .setDescription("Displays information about the bot."),
     async execute(interaction) {
+
         const infoEmbed = new EmbedBuilder()
             .setColor("NotQuiteBlack")
             .setAuthor({ name: "Music Bot", iconURL: interaction.client.user.avatarURL() ?? undefined })

src/commands/music/play.ts

@@ -3,7 +3,7 @@ import { type GuildMember, EmbedBuilder, SlashCommandBuilder, PermissionFlagsBit
 import { MusicQueue } from "@components/MusicQueue";
 import { Song } from "@components/Song";
 import { Logger } from "@components/Logger";
-import play from "play-dl";
+import { sp_validate, so_validate, yt_validate } from "play-dl";
 import type { Command } from "@common/types";
 
 export default {
@@ -42,7 +42,7 @@ export default {
 
         if (!permissions?.has([PermissionFlagsBits.Connect, PermissionFlagsBits.Speak])) return interaction.reply({ embeds: [botNoPermissions], ephemeral: true });
 
-        if (play.yt_validate(url) === "playlist" || await play.so_validate(url) === "playlist" || play.sp_validate(url) === "album" || play.sp_validate(url) === "playlist") {
+        if (yt_validate(url) === "playlist" || await so_validate(url) === "playlist" || sp_validate(url) === "album" || sp_validate(url) === "playlist") {
             return interaction.reply({ content: "Playlist was provided, please use the `playlist` command.", ephemeral: true });
         }
 

src/common/types.ts

@@ -12,11 +12,6 @@ declare module "discord.js" {
     }
 }
 
-export type AuthTypes = {
-    TOKEN: string;
-    CLIENT_ID: string;
-};
-
 export type Config = {
     TOKEN: string;
     DEVTOKEN: string;

src/components/Bot.ts

@@ -3,14 +3,14 @@ import type { Command } from "@common/types";
 import { config } from "@components/config";
 import { Manager } from "@manager";
 import type { MusicQueue } from "@components/MusicQueue";
-import play from "play-dl";
+import { setToken } from "play-dl";
 import { Logger } from "@components/Logger";
 
 export class Bot extends Client {
     public commands = new Collection<string, Command>();
     public queues = new Collection<string, MusicQueue>();
     public readonly debug: boolean = false;
-    public readonly version: string = "3.1.2";
+    public readonly version: string = "3.1.3";
     public readonly branch: string;
 
     constructor(options: ClientOptions) {
@@ -20,7 +20,7 @@ export class Bot extends Client {
         this.branch = this.debug ? "development" : "stable";
 
         /* Music Authentication */
-        play.setToken({
+        setToken({
             soundcloud: {
                 client_id: config.SOUNDCLOUD_CLIENT_ID
             },

src/components/Playlist.ts

@@ -5,7 +5,7 @@ import type { CacheType, ChatInputCommandInteraction } from "discord.js";
 //@ts-expect-error
 import SpotifyUrlInfo, { Tracks } from "spotify-url-info";
 import { fetch } from "undici";
-import play, { type SoundCloudPlaylist } from "play-dl";
+import { sp_validate, so_validate, yt_validate, search as playSearch, soundcloud, type SoundCloudPlaylist } from "play-dl";
 
 export class Playlist {
     public readonly data: youtubePlaylist;
@@ -27,9 +27,9 @@ export class Playlist {
     }
 
     public static async from({ url = "", search = "", interaction }: { url: string; search: string; interaction: ChatInputCommandInteraction<CacheType> }): Promise<Playlist> {
-        const isYoutubeUrl = play.yt_validate(url) === "playlist";
-        const isSpotifyUrl = ["playlist", "album"].includes(play.sp_validate(url) as string);
-        const isSoundCloudUrl = await play.so_validate(url) === "playlist";
+        const isYoutubeUrl = yt_validate(url) === "playlist";
+        const isSpotifyUrl = ["playlist", "album"].includes(sp_validate(url) as string);
+        const isSoundCloudUrl = await so_validate(url) === "playlist";
 
         let playlist: youtubePlaylist;
         if (isSpotifyUrl) {
@@ -40,7 +40,7 @@ export class Playlist {
         } else if (isYoutubeUrl) {
             playlist = await youtube.getPlaylist(url); 
         } else if (isSoundCloudUrl) {
-            const scPl = await play.soundcloud(url) as SoundCloudPlaylist;
+            const scPl = await soundcloud(url) as SoundCloudPlaylist;
             const scPlTracks = (await scPl.all_tracks()).map((track) => ({
                 title: track.name,
                 url: track.permalink,
@@ -52,7 +52,7 @@ export class Playlist {
             }));
             playlist = new youtubePlaylist({ videos: scPlTracks, title: scPl.name, url: scPl.url });
         } else {
-            const result = await play.search(search, {
+            const result = await playSearch(search, {
                 source: {
                     youtube: "playlist"
                 },

src/components/Song.ts

@@ -1,5 +1,5 @@
 import { type AudioResource, createAudioResource } from "@discordjs/voice";
-import play, { video_basic_info, stream, type InfoData as videoInfo, type SoundCloud, type SoundCloudTrack, type Spotify, type SpotifyTrack } from "play-dl";
+import { yt_validate, sp_validate, so_validate, video_basic_info, stream, spotify, soundcloud, search as playSearch, type InfoData as videoInfo, type SoundCloud, type SoundCloudTrack, type Spotify, type SpotifyTrack } from "play-dl";
 import { type ChatInputCommandInteraction, EmbedBuilder, type CacheType } from "discord.js";
 
 export type SongData = {
@@ -26,19 +26,19 @@ export class Song {
     }
 
     public static async from({ url = "", search = "", interaction }: { url: string; search: string; interaction: ChatInputCommandInteraction<CacheType>; }): Promise<Song> {
-        const isYoutubeUrl = play.yt_validate(url) === "video";
-        const isSpotifyUrl = play.sp_validate(url) === "track";
-        const isSoundCloudUrl = await play.so_validate(url) === "track";
+        const isYoutubeUrl = yt_validate(url) === "video";
+        const isSpotifyUrl = sp_validate(url) === "track";
+        const isSoundCloudUrl = await so_validate(url) === "track";
 
         let songInfo: videoInfo | SoundCloud | Spotify;
         if (isSpotifyUrl) {
             let spotifyTitle: string, spotifyArtist: string;
 
-            const spotifyInfo = await play.spotify(url) as SpotifyTrack;
+            const spotifyInfo = await spotify(url) as SpotifyTrack;
             spotifyTitle = spotifyInfo.name;
             spotifyArtist = spotifyInfo.artists[0].name;
 
-            const spotifyresult = await play.search(`${spotifyArtist} - ${spotifyTitle}`, { limit: 1 });
+            const spotifyresult = await playSearch(`${spotifyArtist} - ${spotifyTitle}`, { limit: 1 });
             songInfo = await video_basic_info(spotifyresult[0].url);
 
             return new this({
@@ -49,7 +49,7 @@ export class Song {
                 req: interaction.user.tag
             });
         } else if (isSoundCloudUrl) {
-            const scSong = await play.soundcloud(url) as SoundCloudTrack;
+            const scSong = await soundcloud(url) as SoundCloudTrack;
             return new this({
                 title: scSong.name as string,
                 url: scSong.permalink,
@@ -68,7 +68,7 @@ export class Song {
                 req: interaction.user.tag
             });
         } else {
-            const result = await play.search(search, { limit: 1 });
+            const result = await playSearch(search, { limit: 1 });
             songInfo = await video_basic_info(result[0].url);
 
             return new this({

src/manager/modules/ready.ts

@@ -4,7 +4,6 @@ import { commands as musicCmds } from "commands/music";
 import { commands as infoCmds } from "commands/info";
 import { commands as utilCmds } from "commands/utility";
 import { config } from "@components/config";
-import { AuthTypes } from "@common/types";
 import { Bot } from "@components/Bot";
 
 export async function ready(client: Bot): Promise<void> {
@@ -17,7 +16,7 @@ export async function ready(client: Bot): Promise<void> {
 
     async function registerCommands(): Promise<void> {
         const commands = [...musicCmds, ...infoCmds, ...utilCmds];
-        const auth: AuthTypes = {
+        const auth = {
             TOKEN: client.debug ? config.DEVTOKEN : config.TOKEN,
             CLIENT_ID: client.debug ? config.DEVID : config.CLIENT_ID,
         };
@@ -43,7 +42,7 @@ export async function ready(client: Bot): Promise<void> {
         let state = 0;
 
         setInterval(async () => {
-            const presences: [{ type: ActivityType.Listening, message: string }] = [
+            const presences: [{ type: ActivityType, message: string }] = [
                 { type: ActivityType.Listening, message: `music.` },
             ];