Merge branch 'dev' into 'main'

Revert "Updated music system"

See merge request illegitimate/illegitimate-bot!328

package.json

@@ -37,18 +37,19 @@
     "author": "Taken",
     "license": "GPL-3.0-only",
     "dependencies": {
-        "@discord-player/extractor": "^7.1.0",
+        "@discord-player/extractor": "^4.5.1",
+        "@evan/opus": "^1.0.3",
         "@swc/cli": "^0.6.0",
         "@swc/core": "^1.11.5",
         "anilist": "^0.12.4",
         "axios": "^1.8.1",
         "chalk": "^5.4.1",
         "cron": "^4.1.0",
-        "discord-player": "^7.1.0",
+        "discord-player": "^6.7.1",
+        "discord-player-youtubei": "^1.4.2",
         "discord.js": "^14.18.0",
         "drizzle-orm": "^0.40.0",
         "ioredis": "^5.5.0",
-        "mediaplex": "^1.0.0",
         "ms": "^2.1.3",
         "postgres": "^3.4.5",
         "pretty-ms": "^9.2.0",

src/commands/music/skip.ts

@@ -20,10 +20,9 @@ const cmd: SubCommand = async (interaction) => {
     }
 
     if (amount > queue.size) {
-        queue.delete()
         await interaction.editReply({
             embeds: [{
-                description: "Skipped all songs in the queue",
+                description: `There are only ${queue.size} song${queue.size === 1 ? "" : "s"} in the queue`,
                 color: embedColor
             }]
         })

src/components/autocomplete/music.ts

@@ -19,11 +19,9 @@ export default {
 
         const player = useMainPlayer()
         const { tracks } = await player.search(focusedOption.value, {
-            searchEngine: QueryType.SPOTIFY_SEARCH
+            searchEngine: QueryType.YOUTUBE_SEARCH
         })
 
-        console.log(tracks)
-
         const results = tracks.map(track => ({
             name: `${track.title.slice(0, 20)} [${track.author}]`,
             value: track.url

src/utils/Illegitimate.ts

@@ -1,5 +1,5 @@
-import { DefaultExtractors } from "@discord-player/extractor"
 import { Player } from "discord-player"
+import { YoutubeiExtractor } from "discord-player-youtubei"
 import { Redis } from "ioredis"
 import { ExtendedClient as Client } from "~/utils/Client.js"
 import env from "~/utils/Env.js"
@@ -20,7 +20,9 @@ if (process.env.NODE_ENV === "dev" && process.env.TYPESCRIPT === "true") {
 class Illegitimate {
     async start() {
         await loadAllEvents(client, ft)
-        await player.extractors.loadMulti(DefaultExtractors)
+        // await player.extractors.loadDefault()
+        await player.extractors.loadDefault(ext => ext != "YouTubeExtractor")
+        await player.extractors.register(YoutubeiExtractor, {})
         await client.start()
         await this.databases()
         this.loadMethods()