fix: bug and formatted code

.env.sample

@@ -13,5 +13,5 @@ DEV_IDS=12345678901234567,98765432101234567
 # Support Server Invite Link
 SUPPORT_SERVER=https://discord.gg/invite/abc123
 
-# Development Mode (true/false)
-DEVELOPMENT_MODE=false
+# Node Env (development/production)
+NODE_ENV=production

CODE_OF_CONDUCT.md

@@ -17,23 +17,23 @@ diverse, inclusive, and healthy community.
 Examples of behavior that contributes to a positive environment for our
 community include:
 
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes,
+- Demonstrating empathy and kindness toward other people
+- Being respectful of differing opinions, viewpoints, and experiences
+- Giving and gracefully accepting constructive feedback
+- Accepting responsibility and apologizing to those affected by our mistakes,
   and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the
+- Focusing on what is best not just for us as individuals, but for the
   overall community
 
 Examples of unacceptable behavior include:
 
-* The use of sexualized language or imagery, and sexual attention or
+- The use of sexualized language or imagery, and sexual attention or
   advances of any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or email
+- Trolling, insulting or derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or email
   address, without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
+- Other conduct which could reasonably be considered inappropriate in a
   professional setting
 
 ## Enforcement Responsibilities
@@ -106,7 +106,7 @@ Violating these terms may lead to a permanent ban.
 ### 4. Permanent Ban
 
 **Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior,  harassment of an
+standards, including sustained inappropriate behavior, harassment of an
 individual, or aggression toward or disparagement of classes of individuals.
 
 **Consequence**: A permanent ban from any sort of public interaction within

Dockerfile

@@ -10,7 +10,7 @@ WORKDIR /usr/app
 COPY package*.json ./
 
 # Install necessary dependencies only
-RUN npm ci --omit=dev --no-optional
+RUN npm ci --omit=dev --omit=optional
 
 # Install mediaplex
 RUN npm install mediaplex

eslint.config.js

@@ -7,8 +7,8 @@ export default [
   eslintConfigPrettier,
   {
     languageOptions: { globals: globals.node },
-    files: ["src/**/*.js"],
-    ignores: [".github/*", "node_modules", "src/website"],
+    files: ["src/**/*.js", "scripts/**/*.js"],
+    ignores: [".github/*", "node_modules", "docs/", "previews/"],
     rules: {
       "handle-callback-err": "off",
       "max-nested-callbacks": ["error", { "max": 4 }],

package.json

@@ -1,6 +1,6 @@
 {
   "name": "discord-player-bot",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "A discord music bot built using discord.js and discord-player",
   "main": "src/index.js",
   "type": "module",
@@ -9,8 +9,8 @@
     "lint:fix": "eslint . --fix",
     "format": "prettier . --write",
     "doc": "node scripts/cmd-doc.js",
-    "build": "docker build -t lakhindarpal/discord-player-bot:latest .",
-    "run": "docker run --env-file .env lakhindarpal/discord-player-bot:latest",
+    "build": "podman build -t lakhindarpal/discord-player-bot:latest .",
+    "run": "podman run --env-file .env lakhindarpal/discord-player-bot:latest",
     "register": "node scripts/register.js",
     "start": "node .",
     "dev": "node --watch-path=./src ."
@@ -54,7 +54,7 @@
     "@eslint/js": "^9.6.0",
     "eslint": "^9.6.0",
     "eslint-config-prettier": "^9.1.0",
-    "globals": "^15.7.0",
+    "globals": "^15.8.0",
     "prettier": "3.3.2"
   }
 }

src/commands/music/back.js

@@ -12,11 +12,12 @@ export const data = {
 export async function execute(interaction) {
   const history = useHistory(interaction.guildId);
 
-  if (history.isEmpty())
+  if (history.isEmpty()) {
     return interaction.reply({
       ephemeral: true,
       embeds: [ErrorEmbed("There is no previous song to go back.")],
     });
+  }
 
   await interaction.deferReply();
 

src/commands/music/clear.js

@@ -31,27 +31,34 @@ export function execute(interaction, queue) {
   const subcmd = interaction.options.getSubcommand();
   const history = useHistory(interaction.guildId);
 
-  if ((subcmd === "queue" || subcmd === "all") && queue.isEmpty()) {
-    return interaction.reply({
-      ephemeral: true,
-      embeds: [ErrorEmbed("The queue is already empty.")],
-    });
-  }
-  if ((subcmd === "history" || subcmd === "all") && history.isEmpty()) {
-    return interaction.reply({
-      ephemeral: true,
-      embeds: [ErrorEmbed("The history is already empty.")],
-    });
-  }
-
   switch (subcmd) {
     case "queue":
+      if (queue.isEmpty()) {
+        return interaction.reply({
+          ephemeral: true,
+          embeds: [ErrorEmbed("The queue is already empty.")],
+        });
+      }
       queue.tracks.clear();
       break;
+
     case "history":
+      if (history.isEmpty()) {
+        return interaction.reply({
+          ephemeral: true,
+          embeds: [ErrorEmbed("The history is already empty.")],
+        });
+      }
       history.clear();
       break;
+
     default:
+      if (history.isEmpty() && history.isEmpty()) {
+        return interaction.reply({
+          ephemeral: true,
+          embeds: [ErrorEmbed("Both queue and history is already empty.")],
+        });
+      }
       queue.clear();
       break;
   }

src/commands/music/jump.js

@@ -19,19 +19,21 @@ export const data = {
 };
 
 export function execute(interaction, queue) {
-  if (queue.isEmpty())
+  if (queue.isEmpty()) {
     return interaction.reply({
       ephemeral: true,
       embeds: [ErrorEmbed("The queue is empty.")],
     });
+  }
 
   const position = interaction.options.getNumber("position", true);
 
-  if (position > queue.size)
+  if (position > queue.size) {
     return interaction.reply({
       ephemeral: true,
       embeds: [ErrorEmbed("The provided position is not valid.")],
     });
+  }
 
   queue.node.jump(position - 1);
 

src/commands/music/lyrics.js

@@ -21,16 +21,17 @@ export const data = {
 export async function execute(interaction, queue) {
   await interaction.deferReply({ ephemeral: true });
 
-  const query =
-    interaction.options.getString("query", false) ??
-    `${queue?.currentTrack?.author} - ${queue?.currentTrack?.title}`;
+  let query = interaction.options.getString("query", false);
 
-  if (!query) {
+  if (!query && !queue?.currentTrack) {
     return interaction.editReply({
-      embeds: [ErrorEmbed("You forgot to provide the song title.")],
+      embeds: [ErrorEmbed("Provide a song title to search lyrics.")],
     });
   }
 
+  if (!query)
+    query = `${queue?.currentTrack?.author} - ${queue?.currentTrack?.title}`;
+
   const result = await lyricsFinder.search(query).catch(() => null);
 
   if (!result || !result.lyrics) {

src/commands/music/move.js

@@ -61,14 +61,10 @@ export function execute(interaction, queue) {
     });
   }
 
+  const track = queue.tracks.at(from);
   queue.node.move(from, to);
 
   return interaction.reply({
-    ephemeral: true,
-    embeds: [
-      SuccessEmbed(
-        `Moved \`${queue.tracks.at(from).title}\` to position ${to + 1}.`
-      ),
-    ],
+    embeds: [SuccessEmbed(`Moved \`${track.title}\` to position ${to + 1}.`)],
   });
 }

src/commands/music/pause.js

@@ -9,11 +9,12 @@ export const data = {
 };
 
 export function execute(interaction, queue) {
-  if (queue.node.isPaused())
+  if (queue.node.isPaused()) {
     return interaction.reply({
       ephemeral: true,
       embeds: [ErrorEmbed("The playback is already paused.")],
     });
+  }
 
   queue.node.pause();
 

src/commands/music/play.js

@@ -129,10 +129,11 @@ export async function execute(interaction) {
     requestedBy: interaction.user,
   });
 
-  if (!result.hasTracks())
+  if (!result.hasTracks()) {
     return interaction.editReply({
       embeds: [ErrorEmbed(`No results found for \`${query}\`.`)],
     });
+  }
 
   try {
     const { queue, track, searchResult } = await player.play(channel, result, {

src/commands/music/remove.js

@@ -19,27 +19,25 @@ export const data = {
 };
 
 export function execute(interaction, queue) {
-  if (queue.isEmpty())
+  if (queue.isEmpty()) {
     return interaction.reply({
       ephemeral: true,
       embeds: [ErrorEmbed("The queue is empty.")],
     });
+  }
 
   const index = interaction.options.getNumber("position", true) - 1;
 
-  if (index >= queue.size)
+  if (index >= queue.size) {
     return interaction.reply({
       ephemeral: true,
       embeds: [ErrorEmbed("The provided position is not valid.")],
     });
+  }
 
-  const removed = queue.node.remove(index);
+  const track = queue.node.remove(index);
 
   return interaction.reply({
-    embeds: [
-      SuccessEmbed(
-        `Removed [${removed.title}](${removed.url}) from the queue.`
-      ),
-    ],
+    embeds: [SuccessEmbed(`Removed ${track.toHyperlink()} from the queue.`)],
   });
 }

src/commands/music/repeat.js

@@ -1,6 +1,6 @@
 import { ApplicationCommandOptionType } from "discord.js";
 import { QueueRepeatMode } from "discord-player";
-import { BaseEmbed } from "../../modules/embeds.js";
+import { BaseEmbed, Colors } from "../../modules/embeds.js";
 
 export const data = {
   name: "repeat",
@@ -74,7 +74,11 @@ export function execute(interaction, queue) {
   queue.emit("repeatChange", queue);
 
   return interaction.reply({
-    ephemeral: subCmd !== "status",
-    embeds: [BaseEmbed().setDescription(description)],
+    ephemeral: subCmd === "status",
+    embeds: [
+      BaseEmbed()
+        .setDescription(description)
+        .setColor(subCmd === "status" ? Colors.Blurple : Colors.Green),
+    ],
   });
 }

src/commands/music/resume.js

@@ -9,11 +9,12 @@ export const data = {
 };
 
 export function execute(interaction, queue) {
-  if (queue.node.isPlaying())
+  if (queue.node.isPlaying()) {
     return interaction.reply({
       ephemeral: true,
       embeds: [ErrorEmbed("The playback is not paused.")],
     });
+  }
 
   queue.node.resume();