Merge pull request #25 from RainyXeon/dev

v4.2.0
RainyXeon · Dec 31, 2023 · a397853 · a397853
2 parents 5459d0a + 9dc147f
commit a397853
Show file tree

Hide file tree

Showing 58 changed files with 631 additions and 2,257 deletions.
diff --git a/src/@types/Interaction.ts b/src/@types/Interaction.ts
@@ -24,6 +24,8 @@ export type NoAutoInteraction =
   | ButtonInteraction
   | ModalSubmitInteraction;
 
+export type ReplyOnlyInteraction = CommandInteraction | ButtonInteraction;
+
 export type AutocompleteInteractionChoices = {
   name: string;
   value: string;

diff --git a/src/assets/radioLink.ts b/src/assets/radioLink.ts
diff --git a/src/commands/prefix/Music/Clear.ts → src/commands/prefix/Music/ClearQueue.ts b/src/commands/prefix/Music/Clear.ts → src/commands/prefix/Music/ClearQueue.ts
@@ -4,11 +4,11 @@ import { EmbedBuilder, Message } from "discord.js";
 
 // Main code
 export default class implements PrefixCommand {
-  name = "clear";
+  name = "clearqueue";
   description = "Clear song in queue!";
   category = "Music";
   usage = "";
-  aliases = [];
+  aliases = ["clear", "cq"];
   accessableby = Accessableby.Member;
   lavalink = true;
 

diff --git a/src/commands/prefix/Music/File.ts b/src/commands/prefix/Music/File.ts
@@ -7,6 +7,8 @@ import {
 } from "discord.js";
 import { Manager } from "../../../manager.js";
 import { Accessableby, PrefixCommand } from "../../../@types/Command.js";
+import { StartQueueDuration } from "../../../structures/QueueDuration.js";
+import { ConvertTime } from "../../../structures/ConvertTime.js";
 
 // Main code
 export default class implements PrefixCommand {
@@ -37,7 +39,7 @@ export default class implements PrefixCommand {
       embeds: [
         new EmbedBuilder()
           .setDescription(
-            `${client.i18n.get(language, "music", "play_loading", {
+            `${client.i18n.get(language, "music", "file_loading", {
               result: file.name,
             })}`
           )
@@ -46,10 +48,7 @@ export default class implements PrefixCommand {
     });
 
     const { channel } = message.member!.voice;
-    if (
-      !channel ||
-      message.member!.voice.channel !== message.guild!.members.me!.voice.channel
-    )
+    if (!channel)
       return msg.edit({
         embeds: [
           new EmbedBuilder()
@@ -112,6 +111,8 @@ export default class implements PrefixCommand {
       for (let track of tracks) player.queue.add(track);
     else player.play(tracks[0]);
 
+    const TotalDuration = new StartQueueDuration().parse(tracks);
+
     await message.delete();
 
     if (result.type === "PLAYLIST") {
@@ -120,7 +121,9 @@ export default class implements PrefixCommand {
           `${client.i18n.get(language, "music", "play_playlist", {
             title: file.name,
             url: file.url,
-            length: String(tracks.length),
+            duration: new ConvertTime().parse(TotalDuration),
+            songs: String(tracks.length),
+            request: String(tracks[0].requester),
           })}`
         )
         .setColor(client.color);
@@ -132,6 +135,8 @@ export default class implements PrefixCommand {
           `${client.i18n.get(language, "music", "play_track", {
             title: file.name,
             url: file.url,
+            duration: new ConvertTime().parse(tracks[0].length as number),
+            request: String(tracks[0].requester),
           })}`
         )
         .setColor(client.color);
@@ -142,6 +147,8 @@ export default class implements PrefixCommand {
         `${client.i18n.get(language, "music", "play_result", {
           title: file.name,
           url: file.url,
+          duration: new ConvertTime().parse(tracks[0].length as number),
+          request: String(tracks[0].requester),
         })}`
       );
       msg.edit({ content: " ", embeds: [embed] });

diff --git a/src/commands/prefix/Music/Forward.ts b/src/commands/prefix/Music/Forward.ts
@@ -7,9 +7,9 @@ const fastForwardNum = 10;
 // Main code
 export default class implements PrefixCommand {
   name = "forward";
-  description = "Forward timestamp in the song!";
+  description = "Forward timestamp in the song! (10s)";
   category = "Music";
-  usage = "<seconds>";
+  usage = "";
   aliases = [];
   lavalink = true;
   accessableby = Accessableby.Member;
@@ -21,8 +21,6 @@ export default class implements PrefixCommand {
     language: string,
     prefix: string
   ) {
-    const value = args[0];
-
     const msg = await message.reply({
       embeds: [
         new EmbedBuilder()
@@ -61,80 +59,37 @@ export default class implements PrefixCommand {
 
     const song = player.queue.current;
     const song_position = player.shoukaku.position;
-    const CurrentDuration = new FormatDuration().parse(song_position);
+    const CurrentDuration = new FormatDuration().parse(
+      song_position + fastForwardNum * 1000
+    );
 
-    if (value && !isNaN(+value)) {
-      if (song_position + Number(value) * 1000 < song!.length!) {
-        player.send({
-          guildId: message.guild!.id,
-          playerOptions: {
-            position: song_position + Number(value) * 1000,
-          },
-        });
+    if (song_position + fastForwardNum * 1000 < song!.length!) {
+      player.send({
+        guildId: message.guild!.id,
+        playerOptions: {
+          position: song_position + fastForwardNum * 1000,
+        },
+      });
 
-        const forward1 = new EmbedBuilder()
-          .setDescription(
-            `${client.i18n.get(language, "music", "forward_msg", {
-              duration: CurrentDuration,
-            })}`
-          )
-          .setColor(client.color);
+      const forward2 = new EmbedBuilder()
+        .setDescription(
+          `${client.i18n.get(language, "music", "forward_msg", {
+            duration: CurrentDuration,
+          })}`
+        )
+        .setColor(client.color);
 
-        msg.edit({ content: " ", embeds: [forward1] });
-      } else {
-        return msg.edit({
-          embeds: [
-            new EmbedBuilder()
-              .setDescription(
-                `${client.i18n.get(language, "music", "forward_beyond")}`
-              )
-              .setColor(client.color),
-          ],
-        });
-      }
-    } else if (value && isNaN(+value)) {
+      msg.edit({ content: " ", embeds: [forward2] });
+    } else {
       return msg.edit({
         embeds: [
           new EmbedBuilder()
             .setDescription(
-              `${client.i18n.get(language, "music", "forward_invalid", {
-                prefix: prefix,
-              })}`
+              `${client.i18n.get(language, "music", "forward_beyond")}`
             )
             .setColor(client.color),
         ],
       });
     }
-
-    if (!value) {
-      if (song_position + fastForwardNum * 1000 < song!.length!) {
-        player["send"]({
-          guildId: message.guild!.id,
-          playerOptions: {
-            position: song_position + fastForwardNum * 1000,
-          },
-        });
-
-        const forward2 = new EmbedBuilder()
-          .setDescription(
-            `${client.i18n.get(language, "music", "forward_msg", {
-              duration: CurrentDuration,
-            })}`
-          )
-          .setColor(client.color);
-
-        msg.edit({ content: " ", embeds: [forward2] });
-      } else {
-        return msg.edit({
-          embeds: [
-            new EmbedBuilder()
-              .setDescription(
-                `${client.i18n.get(language, "music", "forward_beyond")}`
-              )
-              .setColor(client.color),
-          ],
-        });
-      }
-    }
   }
 }
diff --git a/src/commands/prefix/Music/Join.ts b/src/commands/prefix/Music/Join.ts
@@ -8,7 +8,7 @@ export default class implements PrefixCommand {
   description = "Make the bot join the voice channel.";
   category = "Music";
   usage = "";
-  aliases = [];
+  aliases = ["j"];
   lavalink = true;
   accessableby = Accessableby.Member;
 

diff --git a/src/commands/prefix/Music/Lofi.ts b/src/commands/prefix/Music/Lofi.ts