feat: Version 3.0.0

package.json

@@ -11,7 +11,7 @@
     "lint": "eslint . --ext .ts",
     "lint:fix": "eslint . --ext .ts --fix",
     "start": "node dist/index.js",
-    "start:dev": "ts-node -r dotenv/config src/bot.ts"
+    "start:dev": "ts-node -r dotenv/config src/index.ts"
   },
   "main": "dist/index.js",
   "dependencies": {
@@ -23,6 +23,8 @@
     "erela.js-filter": "^0.2.3",
     "got": "^11.8.2",
     "mongodb": "^3.7.3",
+    "pino": "^7.3.0",
+    "pino-pretty": "^7.2.0",
     "reflect-metadata": "^0.1.13",
     "tslib": "^2.3.1",
     "typeorm": "^0.2.40",

src/bot.ts

@@ -1,25 +1,21 @@
+import "./extension/Global";
 import { BotClient } from "./structures/BotClient";
 import { clientOptions } from "./config";
-import { NoStackError } from "./utils/NoStackError";
+import { CustomError } from "./utils/CustomError";
 
 export const client = new BotClient(clientOptions);
 
-process.on("exit", code => {
-    client.logger.info(`NodeJS process exited with code ${code}`);
-});
-process.on("uncaughtException", err => {
-    // Temporary fix for winston crash
-    if (err.message === "self._addDefaultMeta is not a function") {
-        return undefined;
+process.on("unhandledRejection", e => {
+    if (e instanceof Error) {
+        client.logger.error(e);
+    } else {
+        client.logger.error(CustomError("PromiseError", e as string));
     }
-    client.logger.error("UNCAUGHT_EXCEPTION:", err);
-    client.logger.warn("Uncaught Exception detected. Restarting...");
-    process.exit(1);
 });
-process.on("unhandledRejection", reason => {
-    client.logger.error("UNHANDLED_REJECTION:", (reason as Error).stack ? reason : new NoStackError(reason as string));
+process.on("uncaughtException", e => {
+    client.logger.fatal(e);
+    process.exit(1);
 });
-process.on("warning", client.logger.warn);
 
 client.build(process.env.DISCORD_TOKEN!)
-    .catch(e => client.logger.error("PROMISE_ERR:", e));
+    .catch(e => client.logger.error(e));

src/commands/administrator/SetupCommand.ts

@@ -42,9 +42,9 @@ export class SetupCommand extends BaseCommand {
                 embeds: [createEmbed("error", `Already setup in ${old.toString()}`)]
             });
         }
-        if (!channel.permissionsFor(this.client.user!.id)?.has(["SEND_MESSAGES", "ATTACH_FILES"])) {
+        if (!channel.permissionsFor(this.client.user!.id)?.has(["SEND_MESSAGES", "ATTACH_FILES", "MANAGE_MESSAGES"])) {
             return ctx.send({
-                embeds: [createEmbed("error", "I need these permissions to make requester channel: `SEND_MESSAGES`, `ATTACH_FILES`")]
+                embeds: [createEmbed("error", "I need these permissions to make requester channel: `SEND_MESSAGES`, `ATTACH_FILES`, `MANAGE_MESSAGES`")]
             });
         }
         if (channel.isText()) {

src/commands/developers/EvalCommand.ts

@@ -4,6 +4,7 @@ import { MessageEmbed } from "discord.js";
 import { request } from "https";
 import { DefineCommand } from "../../utils/decorators/DefineCommand";
 import { CommandContext } from "../../structures/CommandContext";
+import { CustomError } from "../../utils/CustomError";
 
 @DefineCommand({
     aliases: ["ev", "js-exec", "e", "evaluate"],
@@ -57,14 +58,14 @@ export class EvalCommand extends BaseCommand {
                 const hastebin = await this.hastebin(output);
                 embed.addField("Output", `${hastebin}.js`);
             } else { embed.addField("Output", `\`\`\`js\n${output}\`\`\``); }
-            ctx.send({ embeds: [embed] }).catch(e => this.client.logger.error("PROMISE_ERR:", e));
+            ctx.send({ embeds: [embed] }).catch(e => this.client.logger.error(CustomError("PROMISE_ERR:", String(e))));
         } catch (e) {
             const error = this.clean(String(e));
             if (error.length > 1024) {
                 const hastebin = await this.hastebin(error);
                 embed.addField("Error", `${hastebin}.js`);
             } else { embed.setColor("#FF0000").addField("Error", `\`\`\`js\n${error}\`\`\``); }
-            ctx.send({ embeds: [embed] }).catch(e => this.client.logger.error("PROMISE_ERR:", e));
+            ctx.send({ embeds: [embed] }).catch(e => this.client.logger.error(CustomError("PROMISE_ERR:", String(e))));
         }
     }
 

src/commands/filters/EightDCommand.ts

@@ -20,6 +20,7 @@ export class EightDCommand extends BaseCommand {
     @isMemberVoiceChannelJoinable()
     @isSameVoiceChannel()
     public async execute(ctx: CommandContext): Promise<any> {
+        if (ctx.isInteraction() && !ctx.deferred) await ctx.deferReply();
         await ctx.guild!.music.player!.setEightD(!ctx.guild!.music.player!.filters.eightD);
         const msg = await ctx.send({
             embeds: [

src/commands/music/PlayCommand.ts

@@ -56,7 +56,7 @@ export class PlayCommand extends BaseCommand {
                 embeds: [createEmbed("error", `This command is restricted to <#${ctx.guild!.music.playerChannel}>.`)]
             });
         }
-        const { max_queue: maxQueue, duplicate_song: duplicateSong } = await this.client.databases.guilds.get(ctx.guild!.id, { select: ["max_queue", "duplicate_song"] });
+        const { max_queue: maxQueue, duplicate_song: duplicateSong } = await this.client.databases.guilds.get(ctx.guild!.id);
         if (maxQueue <= (ctx.guild!.music.player?.queue.totalSize || 0)) {
             const msg = await ctx.send({
                 embeds: [
@@ -111,8 +111,11 @@ export class PlayCommand extends BaseCommand {
         }
         if (!ctx.guild!.music.player) await ctx.guild!.music.join(vc!.id, ctx.channel as TextChannel);
         if (response.loadType === "PLAYLIST_LOADED") {
-            const duplicated = response.tracks.filter(x => ctx.guild!.music.player!.queue.find(y => y.identifier === x.identifier));
-            const toAdd = response.tracks.filter(x => duplicateSong && !ctx.guild!.music.player?.queue.find(y => y.identifier === x.identifier));
+            const duplicated = response.tracks.filter(x => ctx.guild!.music.player!.queue.some(y => y.identifier === x.identifier) || ctx.guild!.music.player!.queue.current?.identifier === x.identifier);
+            const toAdd = response.tracks.filter(x => {
+                if (duplicateSong) return !duplicated.some(y => y.identifier === x.identifier);
+                return true;
+            });
             for (const trck of toAdd) await ctx.guild!.music.player!.queue.add(trck);
             if (duplicateSong && duplicated.length) {
                 const duplicateMessage = await ctx.send({
@@ -138,7 +141,7 @@ export class PlayCommand extends BaseCommand {
             if (duplicateSong && duplicated) {
                 const duplicateMessage = await ctx.send({
                     embeds: [
-                        createEmbed("warn", `Track **[${duplicated.title}](${duplicated.uri!})** is already queued, and this server configuration disallow duplicated tracks in queue`)
+                        createEmbed("warn", `Track **[${duplicated.title.escapeMarkdown()}](${duplicated.uri!})** is already queued, and this server configuration disallow duplicated tracks in queue`)
                     ]
                 });
                 if (fromRequester) {
@@ -151,11 +154,11 @@ export class PlayCommand extends BaseCommand {
             if (!ctx.additionalArgs.get("values") && (!ctx.additionalArgs.get("fromRequesterChannel"))) {
                 if (fromRequester && ctx.isInteraction()) {
                     await ctx.send({
-                        embeds: [createEmbed("info", `✅ Track **[${response.tracks[0].title}](${response.tracks[0].uri})** has been added to the queue`).setThumbnail(response.tracks[0].thumbnail!)]
+                        embeds: [createEmbed("info", `✅ Track **[${response.tracks[0].title.escapeMarkdown()}](${response.tracks[0].uri})** has been added to the queue`).setThumbnail(response.tracks[0].thumbnail!)]
                     });
                 } else if (!fromRequester) {
                     await ctx.send({
-                        embeds: [createEmbed("info", `✅ Track **[${response.tracks[0].title}](${response.tracks[0].uri})** has been added to the queue`).setThumbnail(response.tracks[0].thumbnail!)]
+                        embeds: [createEmbed("info", `✅ Track **[${response.tracks[0].title.escapeMarkdown()}](${response.tracks[0].uri})** has been added to the queue`).setThumbnail(response.tracks[0].thumbnail!)]
                     });
                 }
             }

src/commands/music/QueueCommand.ts

@@ -21,18 +21,18 @@ export class QueueCommand extends BaseCommand {
         if (ctx.isInteraction() && !ctx.deferred) await ctx.deferReply();
         const { music } = ctx.guild!;
         const queue = music.player?.queue ?? [];
-        const pages = chunk(queue.map((x, i) => `**${++i}.** **[${x.title}](${x.uri!})** <@${String(x.requester)}>`), 10).map(x => x.join("\n"));
+        const pages = chunk(queue.map((x, i) => `**${++i}.** **[${x.title.escapeMarkdown()}](${x.uri!})** <@${String(x.requester)}>`), 10).map(x => x.join("\n"));
         const embed = createEmbed("info", pages[0] || "Empty, add some by using `play` command", false)
             .setAuthor(`${ctx.guild!.name} Queue`, ctx.guild!.iconURL({ dynamic: true, size: 4096 })!);
         const msg = await ctx.send({
             embeds: [embed],
-            content: music.player?.queue.current ? `▶ **Now playing: __${music.player.queue.current.title}__**` : null
+            content: music.player?.queue.current ? `▶ **Now playing: __${music.player.queue.current.title.escapeMarkdown()}__**` : null
         });
         if (pages.length) embed.setFooter(`Page 1 of ${pages.length}.`);
         if (pages.length > 1) {
             const pagination = new ButtonPagination(msg, {
                 author: ctx.author.id,
-                content: music.player?.queue.current ? `▶ **Now playing: __${music.player.queue.current.title}__**` : "",
+                content: music.player?.queue.current ? `▶ **Now playing: __${music.player.queue.current.title.escapeMarkdown()}__**` : "",
                 edit: (i, emb, page): MessageEmbed => emb.setDescription(page).setFooter(`Page ${i + 1} of ${pages.length}`),
                 embed, pages
             });

src/commands/music/RemoveCommand.ts

@@ -19,7 +19,7 @@ import { isMemberDJ, isMemberInVoiceChannel, isMemberVoiceChannelJoinable, isMus
             }
         ]
     },
-    usage: "{prefix}volume [new volume]"
+    usage: "{prefix}remove [track position]"
 })
 export class RemoveCommand extends BaseCommand {
     @isMusicPlaying()
@@ -37,7 +37,7 @@ export class RemoveCommand extends BaseCommand {
             });
         }
         const removed = music.player!.queue.splice(position - 1, 1)[0];
-        const m = await ctx.send({ embeds: [createEmbed("info", `Removed **[${removed.title}](${removed.uri!})** from the queue!`)] });
+        const m = await ctx.send({ embeds: [createEmbed("info", `Removed **[${removed.title.escapeMarkdown()}](${removed.uri!})** from the queue!`)] });
         if (ctx.channel!.id === ctx.guild!.music.playerChannel) {
             setTimeout(() => m.delete().catch(() => null), 5000);
         }

src/commands/music/SearchCommand.ts

@@ -156,7 +156,7 @@ export class SearchCommand extends BaseCommand {
         const emojis = ["1️⃣", "2️⃣", "3️⃣", "4️⃣", "5️⃣", "6️⃣", "7️⃣", "8️⃣", "9️⃣", "🔟"];
         return tracks.slice(0, 10).map((x, i) => (
             {
-                label: x.title.length > 98 ? `${x.title.substr(0, 97)}...` : x.title,
+                label: x.title.escapeMarkdown().length > 98 ? `${x.title.escapeMarkdown().substr(0, 97)}...` : x.title.escapeMarkdown(),
                 emoji: emojis[i],
                 description: `${x.author} · ${readableTime(x.duration)}`,
                 value: x.uri

src/commands/music/SkipCommand.ts

@@ -52,7 +52,7 @@ export class SkipCommand extends BaseCommand {
         }
         const msg = await ctx.send({
             embeds: [
-                createEmbed("info", `Skipped **[${music.player!.queue.current!.title}](${music.player!.queue.current!.uri!})**`, true)
+                createEmbed("info", `Skipped **[${music.player!.queue.current!.title.escapeMarkdown()}](${music.player!.queue.current!.uri!})**`, true)
             ]
         });
         if (music.playerChannel === ctx.context.channelId) {

src/config.ts

@@ -4,7 +4,7 @@ export const defaultPrefix = ".";
 export const devs: UserResolvable[] = ["725331428962992131", "740075062190669884", "736943755344609301"];
 export const clientOptions: ClientOptions = {
     allowedMentions: { parse: ["users"] },
-    intents: [Intents.FLAGS.GUILD_MESSAGES, Intents.FLAGS.GUILDS, Intents.FLAGS.GUILD_VOICE_STATES, Intents.FLAGS.GUILD_MEMBERS],
+    intents: [Intents.FLAGS.GUILD_MESSAGES, Intents.FLAGS.GUILDS, Intents.FLAGS.GUILD_VOICE_STATES, Intents.FLAGS.GUILD_MEMBERS, Intents.FLAGS.GUILD_MESSAGE_REACTIONS],
     makeCache: () => new Collection(),
     restTimeOffset: 300,
     retryLimit: 3
@@ -32,7 +32,7 @@ export const leftTimeout = 120000;
 export const defaultBanner = process.env.DEFAULT_BANNER!;
 export const databaseName = process.env.DATABASE_NAME;
 export const enableProgressBar = process.env.ENABLE_PROGRESS_BAR === "yes";
-export const databaseCacheLifetime = 60000;
+// export const emojis = ["⏯", "⏭", "🔁", "⏹", "🔀"];
 
 if (typeof databaseName !== "string") throw new Error("config#databaseName must be a string.");
 if (typeof defaultBanner !== "string") throw new Error("config#defaultBanner must be a string.");

src/extension/Global.ts

@@ -0,0 +1,9 @@
+import { Util } from "discord.js";
+
+globalThis.String.prototype.toProperCase = function toProperCase() {
+    return this.replace(/([^\W_]+[^\s-]*) */g, txt => txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase());
+};
+
+globalThis.String.prototype.escapeMarkdown = function escapeMarkdown() {
+    return Util.escapeMarkdown(this.toString());
+};

src/extension/index.ts

@@ -4,6 +4,6 @@ import { Guild } from "discord.js";
 Reflect.defineProperty(Guild.prototype, "music", {
     get() {
         // @ts-expect-error-next-line
-        return this.client._music.fetch(this.id);
+        return this.client.queue.fetch(this.id);
     }
 });

src/index.ts

@@ -1,24 +1,34 @@
 import "dotenv/config";
-import { ShardingManager } from "discord.js";
 import { resolve } from "path";
-import { isProd, shardsCount } from "./config";
+import { ShardingManager } from "discord.js";
 import { createLogger } from "./utils/Logger";
+import { shardsCount as totalShards, isDev } from "./config";
+const log = createLogger(`shardingmanager`, "en-US", "manager", undefined, isDev);
 
-const log = createLogger(`shardingmanager`, isProd);
-
-const manager = new ShardingManager(resolve(__dirname, "bot.js"), {
-    totalShards: shardsCount,
-    respawn: true,
-    token: process.env.DISCORD_TOKEN,
-    mode: "process"
+process.on("uncaughtException", e => {
+    log.fatal(e);
+    process.exit(1);
 });
 
-manager.on("shardCreate", shard => {
-    log.info(`[ShardManager] Shard #${shard.id} Spawned.`);
-    shard.on("disconnect", () => {
-        log.warn("SHARD_DISCONNECTED: ", { stack: `[ShardManager] Shard #${shard.id} Disconnected` });
-    }).on("reconnecting", () => {
-        log.info(`[ShardManager] Shard #${shard.id} Reconnected.`);
+// @ts-expect-error Ignore next line
+if (process[Symbol.for("ts-node.register.instance")]) {
+    log.warn("ts-node detected, sharding is disabled. Please only use ts-node for development purposes.");
+    require("./bot");
+} else {
+    const manager = new ShardingManager(resolve(__dirname, "bot.js"), {
+        totalShards,
+        mode: "worker",
+        respawn: true,
+        token: process.env.DISCORD_TOKEN
     });
-    if (manager.shards.size === manager.totalShards) log.info("[ShardManager] All shards spawned successfully.");
-}).spawn().catch(e => log.error("SHARD_SPAWN_ERR: ", e));
+
+    manager.on("shardCreate", shard => {
+        log.info(`[ShardManager] Shard #${shard.id} Spawned.`);
+        shard.on("disconnect", () => {
+            log.warn("SHARD_DISCONNECTED: ", { stack: `[ShardManager] Shard #${shard.id} Disconnected` });
+        }).on("reconnecting", () => {
+            log.info(`[ShardManager] Shard #${shard.id} Reconnected.`);
+        });
+        if (manager.shards.size === manager.totalShards) log.info("[ShardManager] All shards spawned successfully.");
+    }).spawn().catch(e => log.error(e.status ? `Error while fetching recommended shards: ${e.status}, ${e.statusText}` : e));
+}

src/listeners/InteractionCreateEvent.ts

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-unnecessary-type-assertion */
 import { Interaction, VoiceChannel } from "discord.js";
 import { BaseListener } from "../structures/BaseListener";
 import { CommandContext } from "../structures/CommandContext";
@@ -71,15 +70,6 @@ export class InteractionCreateEvent extends BaseListener {
                     setTimeout(() => this.client.util.convertToMessage(msg).delete().catch(() => null), 5000);
                     return undefined;
                 }
-                if (!vc.permissionsFor(interaction.guild!.me!)!.has(["CONNECT", "SPEAK"])) {
-                    await interaction.deferReply({ ephemeral: true });
-                    const msg = await interaction.followUp({
-                        ephemeral: true,
-                        embeds: [createEmbed("error", "I'm missing `CONNECT` or `SPEAK` permission in your voice!", true)]
-                    });
-                    setTimeout(() => this.client.util.convertToMessage(msg).delete().catch(() => null), 5000);
-                    return undefined;
-                }
                 if (!vc.joinable) {
                     await interaction.deferReply({ ephemeral: true });
                     const msg = await interaction.followUp({
@@ -111,7 +101,7 @@ export class InteractionCreateEvent extends BaseListener {
                         return undefined;
                     }
                 }
-                this.client.logger.info(`${this.client.shard ? `[Shard #${this.client.shard.ids[0]}]` : ""} ${interaction.user.tag} [${interaction.user.id}] executed "${action}" on ${interaction.guild!.name} [${interaction.guildId}]`);
+                this.client.logger.info(`${interaction.user.tag} [${interaction.user.id}] executed "${action}" on ${interaction.guild!.name} [${interaction.guildId}]`);
                 if (action === "resumepause") {
                     await music.player.pause(!music.player.paused);
                     await interaction.deferUpdate();
@@ -126,7 +116,7 @@ export class InteractionCreateEvent extends BaseListener {
                     context.args = [loopModes[(music.loopType + 1) as 0|1|2] || loopModes[LoopType.NONE]];
                     void this.client.commands.get("loop")!.execute(context);
                 } else if (action === "stop") {
-                    await music.player!.destroy();
+                    await music.player.destroy();
                     await music.reset();
                     await interaction.deferUpdate();
                 } else {

src/listeners/MessageCreateEvent.ts

@@ -8,7 +8,7 @@ export class MessageCreateEvent extends BaseListener {
     public async execute(message: Message): Promise<any> {
         if (message.channel.type === "DM" || !this.client.commands.isReady) return message;
         const data = await this.client.databases.guilds.get(message.guild!.id);
-        if (message.channelId === message.guild!.music.playerChannel) {
+        if (message.channelId === data.requesterChannel) {
             if (message.deletable && message.author.id !== this.client.user!.id) await message.delete().catch(() => null);
             if ((!message.content.startsWith(data.prefix) && !message.content.startsWith(this.client.config.prefix)) && !message.author.bot) {
                 this.client.logger.info(`${message.author.tag} [${message.author.id}] is using play command on ${message.guild!.name}`);
@@ -18,7 +18,7 @@ export class MessageCreateEvent extends BaseListener {
         if (message.author.bot) return;
         if (message.content.startsWith(data.prefix) || message.content.startsWith(this.client.config.prefix)) void this.client.commands.handle(message, message.content.startsWith(this.client.config.prefix) ? this.client.config.prefix : data.prefix);
 
-        if ((await this.getUserFromMention(message.content))?.id === this.client.user?.id && message.channelId !== message.guild!.music.playerChannel) {
+        if ((await this.getUserFromMention(message.content))?.id === this.client.user?.id && message.channelId !== data.requesterChannel) {
             message.channel.send({
                 embeds: [
                     new MessageEmbed()