chore: update dependencies and fixes CI (#244)

Close #242
Close #243

Reviewed-on: #244
Co-authored-by: Mylloon <kennel.anri@tutanota.com>
Co-committed-by: Mylloon <kennel.anri@tutanota.com>

.forgejo/workflows/pr-check.yml

@@ -9,6 +9,10 @@ on:
 
 jobs:
   lint-and-format:
+    runs-on: docker
+    container:
+      image: node
+
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.forgejo/workflows/publish.yml

@@ -6,8 +6,10 @@ on:
 
 jobs:
   build:
+    runs-on: docker
     container:
       image: ghcr.io/catthehacker/ubuntu:act-latest
+
     steps:
       - name: Checkout
         uses: actions/checkout@v4

README.md

@@ -41,8 +41,6 @@ services:
 | :-----------: | :-------------------: | :--------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: |
 | TOKEN_DISCORD |     Token Discord     |   Aucune   |
 | DEFAULT_LANG  |   Langue par défaut   |    `fr`    | Expérimental, si la langue par défaut n'est pas complète (c.-à-d. 100%), le bot pourrait ne pas fonctionner correctement.<br>Liste des traductions disponibles [ici](./src/locales/) |
-|   SP_CLIENT   |   Client ID Spotify   |   Aucune   |                                                                                   Pas obligatoire                                                                                    |
-|   SP_SECRET   | Client secret Spotify |   Aucune   |                                                                                   Pas obligatoire                                                                                    |
 
 ## Volumes
 

package.json

@@ -20,24 +20,24 @@
   "license": "AGPL-3.0-only",
   "dependencies": {
     "@discord-player/extractor": "^7.1.0",
-    "@discordjs/rest": "^2.4.3",
+    "@discordjs/rest": "^2.5.0",
     "bgutils-js": "^3.2.0",
     "discord-player": "^7.1.0",
-    "discord-player-spotify": "^1.0.1",
-    "discord-player-youtubei": "^1.4.3",
-    "discord.js": "^14.18.0",
+    "discord-player-spotify": "^1.1.2",
+    "discord-player-youtubei": "^1.4.5",
+    "discord.js": "^14.19.3",
     "moment-timezone": "^0.5.48",
     "sqlite3": "^5.1.7",
-    "typescript": "^5.8.2",
+    "typescript": "^5.8.3",
     "uuid": "^11.1.0"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "~8.28.0",
-    "@typescript-eslint/parser": "~8.28.0",
-    "dotenv": "~16.4.7",
-    "prettier-eslint": "~16.3.0",
+    "@typescript-eslint/eslint-plugin": "~8.32.0",
+    "@typescript-eslint/parser": "~8.32.0",
+    "dotenv": "~16.5.0",
+    "prettier-eslint": "~16.4.1",
     "ts-node-dev": "~2.0.0",
-    "tsx": "^4.19.3"
+    "tsx": "^4.19.4"
   },
   "overrides": {
     "esbuild": "^0.23.1"

src/commands/music/play.ts

@@ -244,9 +244,7 @@ export default {
         delay,
         player.search(query, {
           requestedBy: interaction.user,
-          searchEngine: interaction.client.config.spotify_enabled
-            ? QueryType.SPOTIFY_SEARCH
-            : QueryType.APPLE_MUSIC_SEARCH,
+          searchEngine: QueryType.SPOTIFY_SEARCH,
         }),
       ])
         .then((res) => {

src/modules/client.ts

@@ -15,8 +15,6 @@ declare module "discord.js" {
       token_discord: string | undefined;
       /** Default lang used */
       default_lang: string;
-      /** Check about spotify extractor */
-      spotify_enabled: boolean;
     };
     /** Store all the modals */
     modals: {

src/utils/client.ts

@@ -36,7 +36,6 @@ export default async () => {
     version: JSON.parse(readFileSync("./package.json").toString()).version,
     token_discord: process.env.TOKEN_DISCORD,
     default_lang: process.env.DEFAULT_LANG ?? "fr",
-    spotify_enabled: false,
   };
 
   client.modals = {
@@ -57,17 +56,11 @@ export default async () => {
   const player = new Player(client, { skipFFmpeg: true });
 
   await player.extractors.loadMulti(DefaultExtractors);
+
   await player.extractors.register(YoutubeiExtractor, {});
 
-  if (process.env.SP_CLIENT && process.env.SP_SECRET) {
-    await player.extractors.unregister(SpotifyExtractorDiscordPlayer.identifier);
-    await player.extractors.register(SpotifyExtractor, {
-      clientId: process.env.SP_CLIENT,
-      clientSecret: process.env.SP_SECRET,
-    });
-
-    client.config.spotify_enabled = true;
-  }
+  await player.extractors.unregister(SpotifyExtractorDiscordPlayer.identifier);
+  await player.extractors.register(SpotifyExtractor, { market: "FR" });
 
   console.log("Translations progression :");
   client.locales = await loadLocales(client.config.default_lang);