From 7a7580368d5b868b4b229ede878c3f4bca926360 Mon Sep 17 00:00:00 2001 From: "Jonny_Bro (Nikita)" Date: Mon, 1 May 2023 01:32:02 +0500 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20queue=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- commands/Music/clips.js | 2 +- commands/Music/play.js | 2 +- commands/Music/queue.js | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/commands/Music/clips.js b/commands/Music/clips.js index bc91a559..dfe8f380 100644 --- a/commands/Music/clips.js +++ b/commands/Music/clips.js @@ -51,8 +51,8 @@ class Clips extends BaseCommand { client.player.play(interaction.member.voice.channel, query, { nodeOptions: { metadata: { - channel: interaction.channel, client, + channel: interaction.channel, requestedBy: interaction.user, }, }, diff --git a/commands/Music/play.js b/commands/Music/play.js index fe947921..7f6ecc1d 100644 --- a/commands/Music/play.js +++ b/commands/Music/play.js @@ -55,8 +55,8 @@ class Play extends BaseCommand { client.player.play(interaction.member.voice.channel, searchResult, { nodeOptions: { metadata: { - channel: interaction.channel, client, + channel: interaction.channel, requestedBy: interaction.user, }, }, diff --git a/commands/Music/queue.js b/commands/Music/queue.js index a79e6772..60ed331d 100644 --- a/commands/Music/queue.js +++ b/commands/Music/queue.js @@ -169,7 +169,7 @@ function generateQueueEmbeds(interaction, queue) { queue.repeatMode === QueueRepeatMode.AUTOPLAY ? interaction.translate("music/nowplaying:AUTOPLAY") : queue.repeatMode === QueueRepeatMode.QUEUE ? interaction.translate("music/nowplaying:QUEUE") : queue.repeatMode === QueueRepeatMode.TRACK ? interaction.translate("music/nowplaying:TRACK") : interaction.translate("common:DISABLED") - }\`\n${interaction.translate("music/queue:DURATION")}: \`${interaction.client.functions.convertTime(Date.now() + queue.totalTime, false, true, interaction.guild.data.language)}\`\n[${currentTrack.title}](${currentTrack.url})\n> ${interaction.translate("music/queue:ADDED")} ${currentTrack.requestedBy}\n\n**${interaction.translate("music/queue:NEXT")}**\n${interaction.translate("music/queue:NO_QUEUE")}`) + }\`\n${currentTrack.url.startsWith("./clips") ? `${currentTrack.title} (clips)` : `[${currentTrack.title}](${currentTrack.url})`}\n> ${interaction.translate("music/queue:ADDED")} ${currentTrack.requestedBy}\n\n**${interaction.translate("music/queue:NEXT")}**\n${interaction.translate("music/queue:NO_QUEUE")}`) .setTimestamp(); embeds.push(embed); @@ -181,7 +181,7 @@ function generateQueueEmbeds(interaction, queue) { let j = i; k += 10; - const info = current.map(track => `${++j}. [${track.title}](${track.url})\n> ${interaction.translate("music/queue:ADDED")} ${track.requestedBy}`).join("\n"); + const info = current.map(track => `${++j}. ${track.url.startsWith("./clips") ? `${track.title} (clips)` : `[${track.title}](${track.url})`}\n> ${interaction.translate("music/queue:ADDED")} ${track.requestedBy}`).join("\n"); const embed = new EmbedBuilder() .setTitle(interaction.translate("music/nowplaying:CURRENTLY_PLAYING")) @@ -191,7 +191,7 @@ function generateQueueEmbeds(interaction, queue) { queue.repeatMode === QueueRepeatMode.AUTOPLAY ? interaction.translate("music/nowplaying:AUTOPLAY") : queue.repeatMode === QueueRepeatMode.QUEUE ? interaction.translate("music/nowplaying:QUEUE") : queue.repeatMode === QueueRepeatMode.TRACK ? interaction.translate("music/nowplaying:TRACK") : interaction.translate("common:DISABLED") - }\`\n${interaction.translate("music/queue:DURATION")}: \`${interaction.client.functions.convertTime(Date.now() + queue.node.streamTime, false, true, interaction.guild.data.language)}\`\n[${currentTrack.title}](${currentTrack.url})\n> ${interaction.translate("music/queue:ADDED")} ${currentTrack.requestedBy}\n\n**${interaction.translate("music/queue:NEXT")}**\n${info}`) + }\`\n${currentTrack.url.startsWith("./clips") ? `${currentTrack.title} (clips)` : `[${currentTrack.title}](${currentTrack.url})`}\n> ${interaction.translate("music/queue:ADDED")} ${currentTrack.requestedBy}\n\n**${interaction.translate("music/queue:NEXT")}**\n${info}`) .setTimestamp(); embeds.push(embed); }