From 94c9d2714c31f7995f9cac24a10667c384d085d0 Mon Sep 17 00:00:00 2001 From: LakhindarPal <72681474+LakhindarPal@users.noreply.github.com> Date: Sat, 22 Jun 2024 21:06:54 +0530 Subject: [PATCH] Minor optimisation --- bun.lockb | Bin 92544 -> 92544 bytes package-lock.json | 7 ++++--- package.json | 6 +++--- src/commands/dev/eval.js | 6 +++++- src/commands/music/play.js | 18 ++++++++++++------ src/commands/music/songs.js | 10 +++++++--- 6 files changed, 31 insertions(+), 16 deletions(-) diff --git a/bun.lockb b/bun.lockb index a4ce9bca48240bafa3d3b2c7c2aa7f9ade6ce586..a4c176d341e4cd3bdcbe462cf6423b5b2c8175be 100755 GIT binary patch delta 144 zcmV;B0B`?*(*=Oj1&}Tv3>yIWm)D{&wj!``ytuvfVN}+bGhp;ouO)37xed!&u}(TU zlSnZzv$#2BTR^M@ULAuRzrYh$mwD5`g?4|u{*lk6cZiAILw2+9UUq?soIQN}$fY*nR` zhy;&MA+li{fTtN+Sv>Gl6-}-eFb=a_m2qbQF|*J7cvhEXT>&7MAZGy+w|Y|n1{Uk| BLYM#m diff --git a/package-lock.json b/package-lock.json index 303fe6d..acf2e3c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,7 +25,7 @@ "eslint": "^9.5.0", "eslint-config-prettier": "^9.1.0", "globals": "^15.6.0", - "prettier": "3.3.1" + "prettier": "3.3.2" }, "engines": { "node": "20.x" @@ -1822,9 +1822,10 @@ } }, "node_modules/prettier": { - "version": "3.3.1", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.2.tgz", + "integrity": "sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==", "dev": true, - "license": "MIT", "bin": { "prettier": "bin/prettier.cjs" }, diff --git a/package.json b/package.json index bcd8044..181b66d 100644 --- a/package.json +++ b/package.json @@ -5,8 +5,8 @@ "main": "src/index.js", "type": "module", "scripts": { - "lint": "eslint src/**/*.js", - "lint:fix": "eslint src/**/*.js --fix", + "lint": "eslint .", + "lint:fix": "eslint . --fix", "format": "prettier . --write", "register": "node src/scripts/register.js", "doc": "node src/scripts/cmd-doc.js", @@ -54,6 +54,6 @@ "eslint": "^9.5.0", "eslint-config-prettier": "^9.1.0", "globals": "^15.6.0", - "prettier": "3.3.1" + "prettier": "3.3.2" } } diff --git a/src/commands/dev/eval.js b/src/commands/dev/eval.js index 04c3e25..27cc2bd 100644 --- a/src/commands/dev/eval.js +++ b/src/commands/dev/eval.js @@ -1,4 +1,6 @@ +/* eslint-disable no-unused-vars */ import { codeBlock, ApplicationCommandOptionType, Colors } from "discord.js"; +import * as DP from "discord-player"; import { inspect } from "node:util"; import { ErrorEmbed } from "../../modules/Embeds.js"; @@ -17,7 +19,7 @@ export const data = { devOnly: true, }; -export async function execute(interaction) { +export async function execute(interaction, queue) { await interaction.deferReply({ ephemeral: true }); const code = interaction.options.getString("code", true); @@ -34,6 +36,8 @@ export async function execute(interaction) { }); } + const client = interaction.client; + let result; let error; let executionTime; diff --git a/src/commands/music/play.js b/src/commands/music/play.js index e9f0b96..6a7141d 100644 --- a/src/commands/music/play.js +++ b/src/commands/music/play.js @@ -146,14 +146,20 @@ export async function execute(interaction) { if (searchResult.hasPlaylist()) { const playlist = searchResult.playlist; embed - .setTitle(`Playlist enqueued - ${playlist.tracks.length} tracks.`) - .setDescription(`[${playlist.title}](${playlist.url})`); + .setAuthor({ + name: `Playlist added - ${playlist.tracks.length} tracks.`, + iconURL: playlist.thumbnail, + }) + .setTitle(playlist.title) + .setURL(playlist.url); } else { embed - .setTitle( - `Track enqueued - Position ${queue.node.getTrackPosition(track) + 1}` - ) - .setDescription(track.toHyperlink()); + .setAuthor({ + name: `Track added - Position ${queue.node.getTrackPosition(track) + 1}`, + iconURL: track.thumbnail, + }) + .setTitle(track.title) + .setURL(track.url); } return interaction.editReply({ embeds: [embed] }).catch(console.error); diff --git a/src/commands/music/songs.js b/src/commands/music/songs.js index 35021cb..7e6378c 100644 --- a/src/commands/music/songs.js +++ b/src/commands/music/songs.js @@ -1,6 +1,7 @@ import { ApplicationCommandOptionType } from "discord.js"; -import { BaseEmbed, ErrorEmbed } from "../../modules/Embeds.js"; import { useHistory } from "discord-player"; +import { BaseEmbed, ErrorEmbed } from "../../modules/Embeds.js"; +import { titleCase } from "../../modules/utils.js"; export const data = { name: "songs", @@ -49,11 +50,15 @@ export function execute(interaction, queue) { const tracks = songsdata.slice(start, end); const embed = BaseEmbed() + .setAuthor({ + iconURL: interaction.guild.iconURL(), + name: `${titleCase(type)} songs`, + }) .setDescription( tracks .map( (track, i) => - `${start + i + 1} - [${track.title}](${track.url}) ~ [${track.requestedBy.toString()}]` + `**${start + i + 1}**. [${track.title}](${track.url}) ~ [${track.requestedBy.toString()}]` ) .join("\n") ) @@ -61,7 +66,6 @@ export function execute(interaction, queue) { text: `Page ${page} of ${maxPage} | Showing songs ${start + 1} to ${ end > songsLength ? songsLength : end } of ${songsLength}`, - iconURL: interaction.user.displayAvatarURL(), }); return interaction.reply({ ephemeral: true, embeds: [embed] });