Merge b7ee0fe291 into b570759c09

.gitignore

@@ -13,6 +13,3 @@ Thumbs.db
 
 # Node
 node_modules
-
-# Dashboard DB
-/json.sqlite

.gitmodules

@@ -1,4 +0,0 @@
-[submodule "dashboard/dashboard-core"]
-	path = dashboard/dashboard-core
-	url = https://git.jonnybro.ru/jonny_bro/dashboard-core
-	branch = main

.prettierrc

@@ -8,4 +8,4 @@
 	"trailingComma": "all",
 	"useTabs": true,
 	"parser": "babel"
-}
+}

README.md

@@ -14,7 +14,6 @@ JaBa offers:
 * Slash and Context commands.
 * Supports commands in DMs.
 * Localization support (any language; English, Russian and Ukrainian for now).
-* Dashboard for changing various settings.
 * Basic messages monitoring (updating and deletion).
 
 ## Commands
@@ -29,10 +28,6 @@ JaBa does many thing, here is **8 main categories**:
 * **General**: `afk`, `avatar`, `boosters`, `minecraft`, `remindme`, `shorturl`, `serverinfo`, `userinfo`, `whois` and **7** more!
 * **Bot's owner commands**: `eval`, `servers`, `reload` and **2** more!
 
-## *Kinda* Cool Dashboard
-
-JaBa has it's own dashboard to change server's settings!
-
 ## Get The Bot
 
 ### Ready To Use
@@ -53,7 +48,6 @@ Use [this instruction](https://github.com/JonnyBro/JaBa/wiki/Self-Hosting) to le
 * [Full commands list](https://dash.jababot.ru/commands)
 * [Discord](https://discord.gg/Ptkj2n9nzZ)
 * [Github](https://github.com/JonnyBro/JaBa/)
-* [Dashboard](https://dash.jababot.ru)
 
 ## Support
 
@@ -63,7 +57,7 @@ If you want to contribute, feel free to fork this repo and making a pull request
 ## TODO
 
 * [ ] Refactor [tictactoe](./helpers/tictactoe.js).
-* [ ] Finish and release *dashboard-core* submodule.
+* [ ] Rewrite dashboard.
 
 ## License
 

base/BaseCommand.js

@@ -1,5 +1,5 @@
 /* eslint-disable no-unused-vars */
-const path = require("path");
+import { sep } from "path";
 
 class BaseCommand {
 	constructor(options, client) {
@@ -15,8 +15,8 @@ class BaseCommand {
 		/**
 		 * @type {String}
 		 */
-		this.category = this.dirname ? this.dirname.split(path.sep)[parseInt(this.dirname.split(path.sep).length - 1, 10)] : "Other";
+		this.category = this.dirname ? this.dirname.split(sep)[parseInt(this.dirname.split(sep).length - 1, 10)] : "Other";
 	}
 }
 
-module.exports = BaseCommand;
+export default BaseCommand;

base/BaseEvent.js

@@ -11,4 +11,4 @@ class BaseEvent {
 	}
 }
 
-module.exports = BaseEvent;
+export default BaseEvent;

base/Client.js

@@ -1,32 +1,41 @@
-const { Client, Collection, SlashCommandBuilder, ContextMenuCommandBuilder, EmbedBuilder, PermissionsBitField, ChannelType } = require("discord.js"),
+import { Client, Collection, SlashCommandBuilder, ContextMenuCommandBuilder, EmbedBuilder, PermissionsBitField, ChannelType } from "discord.js";
-	{ GiveawaysManager } = require("discord-giveaways"),
+import { GiveawaysManager } from "discord-giveaways";
-	{ REST } = require("@discordjs/rest"),
+import { REST } from "@discordjs/rest";
-	{ Player: DiscordPlayer } = require("discord-player"),
+import { Player } from "discord-player";
-	{ SpotifyExtractor } = require("@discord-player/extractor"),
+import { SpotifyExtractor } from "@discord-player/extractor";
-	{ YoutubeiExtractor } = require("discord-player-youtubei"),
+import { YoutubeiExtractor } from "discord-player-youtubei";
-	{ Routes } = require("discord-api-types/v10");
+import { Routes } from "discord-api-types/v10";
+import { join, sep } from "path";
+import { promises as fs } from "fs";
+import { setTimeout } from "timers/promises";
+import mongoose from "mongoose";
 
-const BaseEvent = require("./BaseEvent.js"),
+import config from "../config.js";
-	BaseCommand = require("./BaseCommand.js"),
+import * as emojis from "../emojis.json";
-	path = require("path"),
+import langs from "../languages/language-meta.js";
-	fs = require("fs").promises,
+import logger from "../helpers/logger.js";
-	mongoose = require("mongoose");
+import * as funcs from "../helpers/functions.js";
+
+import BaseEvent from "./BaseEvent.js";
+import BaseCommand from "./BaseCommand.js";
+import guild from "./Guild.js";
+import user from "./User.js";
+import member from "./Member.js";
 
 class JaBaClient extends Client {
 	constructor(options) {
 		super(options);
 
-		this.config = require("../config");
+		this.config = config;
-		this.customEmojis = require("../emojis");
+		this.customEmojis = emojis;
-		this.languages = require("../languages/language-meta");
+		this.languages = langs;
 		this.commands = new Collection();
-		this.logger = require("../helpers/logger");
+		this.logger = logger;
-		this.wait = require("node:timers/promises").setTimeout;
+		this.wait = setTimeout;
-		this.functions = require("../helpers/functions");
+		this.functions = funcs;
-		this.guildsData = require("../base/Guild");
+		this.guildsData = guild.default;
-		this.usersData = require("../base/User");
+		this.usersData = user.default;
-		this.membersData = require("../base/Member");
+		this.membersData = member.default;
-		this.dashboard = require("../dashboard/dashboard");
 
 		this.databaseCache = {};
 		this.databaseCache.users = new Collection();
@@ -43,7 +52,7 @@ class JaBaClient extends Client {
 	 * @returns {Promise<void>} A Promise that resolves when the client is fully initialized.
 	 */
 	async init() {
-		this.player = new DiscordPlayer(this);
+		this.player = new Player(this);
 
 		await this.player.extractors.register(YoutubeiExtractor, {
 			authentication: this.config.youtubeCookie,
@@ -63,25 +72,33 @@ class JaBaClient extends Client {
 		this.player.events.on("playerStart", async (queue, track) => {
 			const m = (
 				await queue.metadata.channel.send({
-					content: this.translate("music/play:NOW_PLAYING", {
+					content: this.translate(
-						songName: `${track.title} - ${track.author}`,
+						"music/play:NOW_PLAYING",
-						songURL: track.url,
+						{
-					}, queue.metadata.data.guild.language),
+							songName: `${track.title} - ${track.author}`,
+							songURL: track.url,
+						},
+						queue.metadata.data.guild.language,
+					),
 				})
 			).id;
 
-			if (track.durationMS > 1)
+			if (track.durationMS > 1) {
 				setTimeout(() => {
 					const message = queue.metadata.channel.messages.cache.get(m);
 
 					if (message && message.deletable) message.delete();
 				}, track.durationMS);
-			else
+			} else {
-				setTimeout(() => {
+				setTimeout(
-					const message = queue.metadata.channel.messages.cache.get(m);
+					() => {
+						const message = queue.metadata.channel.messages.cache.get(m);
 
-					if (message && message.deletable) message.delete();
+						if (message && message.deletable) message.delete();
-				}, 5 * 60 * 1000);
+					},
+					5 * 60 * 1000,
+				);
+			}
 		});
 		this.player.events.on("emptyQueue", queue => queue.metadata.channel.send(this.translate("music/play:QUEUE_ENDED", null, queue.metadata.data.guild.language)));
 		this.player.events.on("emptyChannel", queue => queue.metadata.channel.send(this.translate("music/play:STOP_EMPTY", null, queue.metadata.data.guild.language)));
@@ -106,9 +123,7 @@ class JaBaClient extends Client {
 
 		mongoose
 			.connect(this.config.mongoDB)
-			.then(() => {
+			.then(this.logger.log("Connected to the MongoDB database."))
-				this.logger.log("Connected to the MongoDB database.");
-			})
 			.catch(e => {
 				this.logger.error(`Unable to connect to the MongoDB database.\nError: ${e.message}\n${e.stack}`);
 			});
@@ -127,8 +142,8 @@ class JaBaClient extends Client {
 	 */
 	async loadCommands(dir) {
 		const rest = new REST().setToken(this.config.token),
-			filePath = path.join(__dirname, dir),
+			filePath = join(__dirname, dir),
-			folders = (await fs.readdir(filePath)).map(file => path.join(filePath, file));
+			folders = (await fs.readdir(filePath)).map(file => join(filePath, file));
 
 		const commands = [];
 		for (const folder of folders) {
@@ -137,7 +152,7 @@ class JaBaClient extends Client {
 			for (const file of files) {
 				if (!file.endsWith(".js")) continue;
 
-				const Command = require(path.join(folder, file));
+				const Command = require(join(folder, file));
 
 				if (!(Command.prototype instanceof BaseCommand)) continue;
 
@@ -158,8 +173,8 @@ class JaBaClient extends Client {
 			await rest.put(route, { body: commands });
 
 			this.logger.log("Successfully registered application commands.");
-		} catch (err) {
+		} catch (e) {
-			this.logger.error("Error registering application commands:", err);
+			this.logger.error("Error registering application commands:", e);
 		}
 	}
 
@@ -171,7 +186,7 @@ class JaBaClient extends Client {
 	 */
 	async loadCommand(dir, file) {
 		try {
-			const Command = require(path.join(dir, `${file}.js`));
+			const Command = require(join(dir, `${file}.js`));
 
 			if (!(Command.prototype instanceof BaseCommand)) {
 				return this.logger.error(`Tried to load a non-command file: "${file}.js"`);
@@ -183,8 +198,8 @@ class JaBaClient extends Client {
 			if (typeof command.onLoad === "function") await command.onLoad(this);
 
 			this.logger.log(`Successfully loaded "${file}" command file. (Command: ${command.command.name})`);
-		} catch (error) {
+		} catch (e) {
-			this.logger.error(`Error loading command "${file}":`, error);
+			this.logger.error(`Error loading command "${file}":`, e);
 		}
 	}
 
@@ -195,7 +210,7 @@ class JaBaClient extends Client {
 	 * @returns {void} This method does not return a value.
 	 */
 	unloadCommand(dir, name) {
-		delete require.cache[require.resolve(`${dir}${path.sep}${name}.js`)];
+		delete require.cache[require.resolve(`${dir}${sep}${name}.js`)];
 
 		return;
 	}
@@ -206,15 +221,15 @@ class JaBaClient extends Client {
 	 * @returns {Promise<void>} This method does not return a value.
 	 */
 	async loadEvents(dir) {
-		const filePath = path.join(__dirname, dir);
+		const filePath = join(__dirname, dir);
 		const files = await fs.readdir(filePath);
 
 		for (const file of files) {
-			const fullPath = path.join(filePath, file);
+			const fullPath = join(filePath, file);
 			const stat = await fs.lstat(fullPath);
 
 			if (stat.isDirectory()) {
-				await this.loadEvents(path.join(dir, file));
+				await this.loadEvents(join(dir, file));
 				continue;
 			}
 
@@ -237,8 +252,8 @@ class JaBaClient extends Client {
 					event.once ? this.once(event.name, event.execute.bind(event, this)) : this.on(event.name, event.execute.bind(event, this));
 
 					this.logger.log(`Successfully loaded "${file}" event. (Event: ${event.name})`);
-				} catch (error) {
+				} catch (e) {
-					this.logger.error(`Error loading event "${file}":`, error);
+					this.logger.error(`Error loading event "${file}":`, e);
 				}
 			}
 		}
@@ -291,7 +306,7 @@ class JaBaClient extends Client {
 			.setColor(data.color ?? this.config.embed.color)
 			.setFooter(typeof data.footer === "object" ? data.footer : data.footer ? { text: data.footer } : this.config.embed.footer)
 			.setTimestamp(data.timestamp ?? null)
-			.setAuthor(typeof data.author === "string" ? { name: data.author, iconURL: this.user.avatarURL() } : data.author ?? null);
+			.setAuthor(typeof data.author === "string" ? { name: data.author, iconURL: this.user.avatarURL() } : (data.author ?? null));
 
 		return embed;
 	}
@@ -341,6 +356,7 @@ class JaBaClient extends Client {
 			await memberData.save();
 
 			const guildData = await this.getGuildData(guildId);
+
 			if (guildData) {
 				guildData.members.push(memberData._id);
 				await guildData.save();
@@ -370,4 +386,4 @@ class JaBaClient extends Client {
 	}
 }
 
-module.exports = JaBaClient;
+export default JaBaClient;

base/Guild.js

@@ -1,55 +1,57 @@
-const mongoose = require("mongoose"),
+import { model, Schema } from "mongoose";
-	Schema = mongoose.Schema,
+import { langs } from "../languages/language-meta.js";
-	languages = require("../languages/language-meta.json");
 
-module.exports = mongoose.model("Guild", new Schema({
+export default model(
-	id: { type: String },
+	"Guild",
+	new Schema({
+		id: { type: String },
 
-	membersData: { type: Object, default: {} },
+		membersData: { type: Object, default: {} },
-	members: [{ type: Schema.Types.ObjectId, ref: "Member" }],
+		members: [{ type: Schema.Types.ObjectId, ref: "Member" }],
 
-	language: { type: String, default: languages.find(l => l.default).name },
+		language: { type: String, default: langs.find(l => l.default).name },
-	plugins: {
+		plugins: {
-		type: Object,
+			type: Object,
-		default: {
+			default: {
-			welcome: {
+				welcome: {
-				enabled: false,
+					enabled: false,
-				message: null,
+					message: null,
-				channel: null,
+					channel: null,
-				withImage: null,
+					withImage: null,
+				},
+				goodbye: {
+					enabled: false,
+					message: null,
+					channel: null,
+					withImage: null,
+				},
+				autorole: {
+					enabled: false,
+					role: null,
+				},
+				automod: {
+					enabled: false,
+					ignored: [],
+				},
+				warnsSanctions: {
+					kick: null,
+					ban: null,
+				},
+				monitoring: {
+					messageUpdate: null,
+					messageDelete: null,
+				},
+				tickets: {
+					count: 0,
+					ticketLogs: null,
+					transcriptionLogs: null,
+					ticketsCategory: null,
+				},
+				suggestions: null,
+				reports: null,
+				birthdays: null,
+				modlogs: null,
 			},
-			goodbye: {
-				enabled: false,
-				message: null,
-				channel: null,
-				withImage: null,
-			},
-			autorole: {
-				enabled: false,
-				role: null,
-			},
-			automod: {
-				enabled: false,
-				ignored: [],
-			},
-			warnsSanctions: {
-				kick: null,
-				ban: null,
-			},
-			monitoring: {
-				messageUpdate: null,
-				messageDelete: null,
-			},
-			tickets: {
-				count: 0,
-				ticketLogs: null,
-				transcriptionLogs: null,
-				ticketsCategory: null,
-			},
-			suggestions: null,
-			reports: null,
-			birthdays: null,
-			modlogs: null,
 		},
-	},
+	}),
-}));
+);

base/Member.js

@@ -1,33 +1,36 @@
-const mongoose = require("mongoose");
+import { model, Schema } from "mongoose";
 
-module.exports = mongoose.model("Member", new mongoose.Schema({
+export default model(
-	id: { type: String },
+	"Member",
-	guildID: { type: String },
+	new Schema({
+		id: { type: String },
+		guildID: { type: String },
 
-	money: { type: Number, default: 0 },
+		money: { type: Number, default: 0 },
-	workStreak: { type: Number, default: 0 },
+		workStreak: { type: Number, default: 0 },
-	bankSold: { type: Number, default: 0 },
+		bankSold: { type: Number, default: 0 },
-	exp: { type: Number, default: 0 },
+		exp: { type: Number, default: 0 },
-	level: { type: Number, default: 0 },
+		level: { type: Number, default: 0 },
-	transactions: { type: Array, default: [] },
+		transactions: { type: Array, default: [] },
 
-	registeredAt: { type: Number, default: Date.now() },
+		registeredAt: { type: Number, default: Date.now() },
 
-	cooldowns: {
+		cooldowns: {
-		type: Object,
+			type: Object,
-		default: {
+			default: {
-			work: 0,
+				work: 0,
-			rob: 0,
+				rob: 0,
+			},
 		},
-	},
 
-	sanctions: { type: Array, default: [] },
+		sanctions: { type: Array, default: [] },
-	mute: {
+		mute: {
-		type: Object,
+			type: Object,
-		default: {
+			default: {
-			muted: false,
+				muted: false,
-			case: null,
+				case: null,
-			endDate: null,
+				endDate: null,
+			},
 		},
-	},
+	}),
-}));
+);

base/User.js

@@ -1,5 +1,5 @@
-const mongoose = require("mongoose"),
+import { Schema, model } from "mongoose";
-	Canvas = require("@napi-rs/canvas");
+import { createCanvas, loadImage } from "@napi-rs/canvas";
 
 const genToken = () => {
 	let token = "";
@@ -9,7 +9,7 @@ const genToken = () => {
 	return token;
 };
 
-const userSchema = new mongoose.Schema({
+const userSchema = new Schema({
 	id: { type: String },
 
 	rep: { type: Number, default: 0 },
@@ -88,17 +88,17 @@ const userSchema = new mongoose.Schema({
 });
 
 userSchema.method("getAchievements", async function () {
-	const canvas = Canvas.createCanvas(1800, 250),
+	const canvas = createCanvas(1800, 250),
 		ctx = canvas.getContext("2d");
 
 	const images = [
-		await Canvas.loadImage(`./assets/img/achievements/achievement${this.achievements.work.achieved ? "_colored" : ""}1.png`),
+		await loadImage(`./assets/img/achievements/achievement${this.achievements.work.achieved ? "_colored" : ""}1.png`),
-		await Canvas.loadImage(`./assets/img/achievements/achievement${this.achievements.firstCommand.achieved ? "_colored" : ""}2.png`),
+		await loadImage(`./assets/img/achievements/achievement${this.achievements.firstCommand.achieved ? "_colored" : ""}2.png`),
-		await Canvas.loadImage(`./assets/img/achievements/achievement${this.achievements.married.achieved ? "_colored" : ""}3.png`),
+		await loadImage(`./assets/img/achievements/achievement${this.achievements.married.achieved ? "_colored" : ""}3.png`),
-		await Canvas.loadImage(`./assets/img/achievements/achievement${this.achievements.slots.achieved ? "_colored" : ""}4.png`),
+		await loadImage(`./assets/img/achievements/achievement${this.achievements.slots.achieved ? "_colored" : ""}4.png`),
-		await Canvas.loadImage(`./assets/img/achievements/achievement${this.achievements.tip.achieved ? "_colored" : ""}5.png`),
+		await loadImage(`./assets/img/achievements/achievement${this.achievements.tip.achieved ? "_colored" : ""}5.png`),
-		await Canvas.loadImage(`./assets/img/achievements/achievement${this.achievements.rep.achieved ? "_colored" : ""}6.png`),
+		await loadImage(`./assets/img/achievements/achievement${this.achievements.rep.achieved ? "_colored" : ""}6.png`),
-		await Canvas.loadImage(`./assets/img/achievements/achievement${this.achievements.invite.achieved ? "_colored" : ""}7.png`),
+		await loadImage(`./assets/img/achievements/achievement${this.achievements.invite.achieved ? "_colored" : ""}7.png`),
 	];
 	let dim = 0;
 
@@ -107,7 +107,7 @@ userSchema.method("getAchievements", async function () {
 		dim += 200;
 	}
 
-	return (await canvas.encode("png"));
+	return await canvas.encode("png");
 });
 
-module.exports = mongoose.model("User", userSchema);
+export default model("User", userSchema);

base/newClient.js

@@ -0,0 +1,19 @@
+import { Client } from "discord.js";
+import { config } from "../config.js";
+import { init as initCommands } from "../handlers/command-handler/index.js";
+import { init as initEvents } from "../handlers/event-handler/index.js";
+
+export class ExtendedClient extends Client {
+	/**
+	 * @param {import("discord.js").ClientOptions} options
+	 */
+	constructor(options) {
+		super(options);
+	}
+
+	async init() {
+		return this.login(config.token)
+			.then(async () => await Promise.all([initCommands(), initEvents()]))
+			.catch(console.error);
+	}
+}

commands/Administration/config.js

@@ -103,7 +103,8 @@ class Config extends BaseCommand {
 							? interaction.translate("administration/config:WELCOME_CONTENT", {
 								channel: `<#${guildData.plugins.welcome.channel}>`,
 								withImage: guildData.plugins.welcome.withImage ? interaction.translate("common:YES") : interaction.translate("common:NO"),
-							}) : interaction.translate("common:DISABLED"),
+							})
+							: interaction.translate("common:DISABLED"),
 						inline: true,
 					},
 					{
@@ -112,7 +113,8 @@ class Config extends BaseCommand {
 							? interaction.translate("administration/config:GOODBYE_CONTENT", {
 								channel: `<#${guildData.plugins.goodbye.channel}>`,
 								withImage: guildData.plugins.goodbye.withImage ? interaction.translate("common:YES") : interaction.translate("common:NO"),
-							}) : interaction.translate("common:DISABLED"),
+							})
+							: interaction.translate("common:DISABLED"),
 						inline: true,
 					},
 					{
@@ -125,19 +127,22 @@ class Config extends BaseCommand {
 							(guildData.plugins.warnsSanctions.kick
 								? interaction.translate("administration/config:KICK_CONTENT", {
 									count: guildData.plugins.warnsSanctions.kick,
-								}) : interaction.translate("administration/config:KICK_NOT_DEFINED")) +
+								})
+								: interaction.translate("administration/config:KICK_NOT_DEFINED")) +
 							"\n" +
 							(guildData.plugins.warnsSanctions.ban
 								? interaction.translate("administration/config:BAN_CONTENT", {
 									count: guildData.plugins.warnsSanctions.ban,
-								}) : interaction.translate("administration/config:BAN_NOT_DEFINED")),
+								})
+								: interaction.translate("administration/config:BAN_NOT_DEFINED")),
 					},
 					{
 						name: interaction.translate("administration/config:AUTOMOD_TITLE"),
 						value: guildData.plugins.automod.enabled
 							? interaction.translate("administration/config:AUTOMOD_CONTENT", {
 								channels: guildData.plugins.automod.ignored.map(ch => ` ${ch}`),
-							}) : interaction.translate("common:DISABLED"),
+							})
+							: interaction.translate("common:DISABLED"),
 					},
 					{
 						name: interaction.translate("administration/config:MONITORING_CHANNELS"),
@@ -156,10 +161,6 @@ class Config extends BaseCommand {
 							`${interaction.translate("administration/config:TICKETLOGS")}: ${guildData.plugins?.tickets?.ticketLogs ? `<#${guildData.plugins?.tickets?.ticketLogs}>` : `*${interaction.translate("common:NOT_DEFINED")}*`}\n` +
 							`${interaction.translate("administration/config:TRANSCRIPTIONLOGS")}: ${guildData.plugins?.tickets?.transcriptionLogs ? `<#${guildData.plugins?.tickets?.transcriptionLogs}>` : `*${interaction.translate("common:NOT_DEFINED")}*`}\n`,
 					},
-					{
-						name: interaction.translate("administration/config:DASHBOARD_TITLE"),
-						value: `[${interaction.translate("administration/config:DASHBOARD_CONTENT")}](${client.config.dashboard.domain})`,
-					},
 				],
 			});
 
@@ -215,13 +216,14 @@ async function changeSetting(interaction, setting, state, channel) {
 					content: `${interaction.translate(`administration/config:${settingSplitted.length === 2 ? settingSplitted[1].toUpperCase() : setting.toUpperCase()}`)}: **${interaction.translate("common:ENABLED")}** (${channel.toString()})`,
 					ephemeral: true,
 				});
-			} else
+			} else {
 				return interaction.reply({
 					content: `${interaction.translate(`administration/config:${settingSplitted.length === 2 ? settingSplitted[1].toUpperCase() : setting.toUpperCase()}`)}: ${
 						data.plugins[setting] ? `**${interaction.translate("common:ENABLED")}** (<#${data.plugins[setting]}>)` : `**${interaction.translate("common:DISABLED")}**`
 					}`,
 					ephemeral: true,
 				});
+			}
 		}
 	} else {
 		if (!state) {
@@ -245,13 +247,14 @@ async function changeSetting(interaction, setting, state, channel) {
 					content: `${interaction.translate(`administration/config:${setting.toUpperCase()}`)}: **${interaction.translate("common:ENABLED")}** (${channel.toString()})`,
 					ephemeral: true,
 				});
-			} else
+			} else {
 				return interaction.reply({
 					content: `${interaction.translate(`administration/config:${setting.toUpperCase()}`)}: ${
 						data.plugins[setting] ? `**${interaction.translate("common:ENABLED")}** (<#${data.plugins[setting]}>)` : `**${interaction.translate("common:DISABLED")}**`
 					}`,
 					ephemeral: true,
 				});
+			}
 		}
 	}
 }

commands/General/shorturl.js

@@ -63,7 +63,7 @@ class Shorturl extends BaseCommand {
 		}).then(res => res.json());
 
 		interaction.editReply({
-			content: `<https://s.jonnybro.ru/${res.link.slug}>`,
+			content: `<${res.shortLink}>`,
 		});
 	}
 }

commands/General/stats.js

@@ -91,7 +91,6 @@ class Stats extends BaseCommand {
 				{
 					name: client.customEmojis.link + " " + interaction.translate("general/stats:LINKS_TITLE"),
 					value: interaction.translate("misc:STATS_FOOTER", {
-						dashboardLink: client.config.dashboard.domain,
 						supportLink: "https://discord.gg/Ptkj2n9nzZ",
 						inviteLink: client.generateInvite({ scopes: ["bot", "applications.commands"], permissions: [PermissionsBitField.Flags.Administrator] }),
 						owner: client.config.owner.id,

config.sample.js

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
 	/* The token of your Discord Bot */
 	token: "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
 	/* UserID of your Discord Bot */
@@ -22,19 +22,23 @@ module.exports = {
 		invite: "https://discord.gg/discord", // Invite link to the support server
 	},
 	/* Dashboard configuration */
-	dashboard: {
+	/* dashboard: {
 		enabled: false, // Whether the dashboard is enabled or not
 		maintanceKey: "letmein", // Maintance key
 		port: 80, // Dashboard port
 		domain: "http://localhost", // The base URL of the dashboard without / at the end
 		secret: "XXXXXXXXXXXXXXXXXXXXXXXXXXXX", // Your Bot's Client Secret
 		logs: "123456789098765432", // The channel ID for logs
-	},
+	}, */
 	/* Embeds defaults */
 	embed: {
 		color: "#00FF00", // Color
 		footer: {
-			text: "My Discord Bot | v" + require("./package.json").version, // Footer text
+			text:
+				"My Discord Bot | v" +
+				import("./package.json", {
+					with: { type: "json" },
+				}).version, // Footer text
 		},
 	},
 	/* Bot's owner informations */
@@ -42,7 +46,5 @@ module.exports = {
 		id: "123456789098765432", // The ID of the bot's owner
 	},
 	/* Add your own API keys here */
-	apiKeys: {
+	apiKeys: {},
-		shlink: "12345678-1234-1234-1234-123456789098" /* Shlink.io REST API key */,
-	},
 };

dashboard/dashboard-core

@@ -1 +0,0 @@
-Subproject commit 42cb44000f844f17b0d9e12e15a45ab60f3dcdb7

dashboard/dashboard.js

@@ -1,221 +0,0 @@
-const SoftUI = require("./dashboard-core/theme/dbd-soft-ui"),
-	DBD = require("./dashboard-core/index"),
-	settings = require("./settings");
-
-const { PermissionsBitField } = require("discord.js");
-
-const locales = {
-	"en-US": require("../languages/en-US/dashboard.json"),
-	"ru-RU": require("../languages/ru-RU/dashboard.json"),
-	"uk-UA": require("../languages/uk-UA/dashboard.json"),
-};
-
-/**
- *
- * @param {import("../base/Client")} client
- */
-module.exports.load = async client => {
-	const commands = client.commands.map(v => {
-		return {
-			commandName: v.command.name,
-			commandDescription: client.translate(`${v.category.toLowerCase()}/${v.command.name}:DESCRIPTION`),
-			commandUsage: client.translate(`${v.category.toLowerCase()}/${v.command.name}:USAGE`),
-			commandAlias: "",
-			_category: v.category,
-		};
-	});
-	let categories = [];
-
-	commands.forEach(c => {
-		if (!categories.includes(c._category)) categories.push(c._category);
-	});
-
-	categories = categories.map(c => {
-		return {
-			category: c,
-			categoryId: c.toLowerCase(),
-			subTitle: "",
-			hideAlias: true,
-			hideDescription: false,
-			hideSidebarItem: c === "Owner" || c === "IAT" ? true : false,
-			list: commands.filter(v => v._category === c),
-		};
-	});
-
-	const Dashboard = new DBD.Dashboard({
-		port: client.config.dashboard.port,
-		client: {
-			id: client.user.id,
-			secret: client.config.dashboard.secret,
-		},
-		cookiesSecret: client.config.dashboard.secret,
-		domain: client.config.dashboard.domain,
-		redirectUri: `${client.config.dashboard.domain}/discord/callback`,
-		bot: client,
-		ownerIDs: [client.config.owner.id],
-		requiredPermissions: PermissionsBitField.Flags.ViewChannel,
-		invite: {
-			clientId: client.user.id,
-			scopes: ["bot", "applications.commands"],
-			permissions: "8",
-			redirectUri: `${client.config.dashboard.domain}`,
-		},
-		supportServer: {
-			slash: "/support",
-			inviteUrl: client.config.support.invite,
-		},
-		rateLimits: {
-			manage: {
-				windowMs: 15 * 60 * 1000, // 15 minutes
-				max: 100, // Limit each IP to 100 requests per `window` (here, per 15 minutes)
-				message: "You are ratelimited!", // Message returned if user should be rate limited, could be also JSON/HTML
-				store: null, // <Rate Limiter Store> - if null, new MemoryStore()
-				// supported stores: https://www.npmjs.com/package/express-rate-limit#store
-			},
-			guildPage: {
-				windowMs: 15 * 60 * 1000,
-				max: 100,
-				message: "You are ratelimited!",
-				store: null,
-			},
-			settingsUpdatePostAPI: {
-				windowMs: 15 * 60 * 1000,
-				max: 100,
-				message: "You are ratelimited!",
-				store: null,
-			},
-		},
-		useTheme404: true,
-		useThemeMaintenance: true,
-		useUnderMaintenance: false,
-		underMaintenanceAccessKey: client.config.dashboard.maintanceKey,
-		underMaintenanceAccessPage: "/get-access",
-		underMaintenance: {
-			title: "Under Maintenance",
-			contentTitle: "This page is under maintenance",
-			texts: [
-				"<br>",
-				"We still want to change for the better for you.",
-				"Therefore, we are introducing technical updates so that we can allow you to enjoy the quality of our services.",
-				"<br>",
-				`Come back to us later or join our <a href="${client.config.support.invite}">Discord Support Server</a>`,
-			],
-		},
-		theme: SoftUI({
-			customThemeOptions: {
-				// eslint-disable-next-line no-unused-vars
-				index: async ({ req, res, config }) => {
-					const user = req.session?.user;
-					const username = (user?.discriminator === "0" ? user?.username : user?.tag) || "Guest";
-
-					let users = 0;
-					client.guilds.cache.forEach(g => {
-						users += g.memberCount;
-					});
-
-					const cards = [
-						{
-							title: "Current User",
-							icon: "single-02",
-							getValue: username,
-						},
-						{
-							title: "Playing music in this much servers",
-							icon: "settings-gear-65",
-							getValue: client.player.nodes.cache.size,
-						},
-						{
-							title: "Users Count",
-							icon: "favourite-28",
-							getValue: users,
-						},
-						{
-							title: "Servers Count",
-							icon: "notification-70",
-							getValue: `${client.guilds.cache.size - 1} out of 2000`,
-							progressBar: {
-								enabled: true,
-								getProgress: Math.round(((client.guilds.cache.size - 1) / 2000) * 100),
-							},
-						},
-					];
-
-					return {
-						values: [],
-						graph: {},
-						cards,
-					};
-				},
-			},
-			websiteName: `${client.user.username} Dashboard`,
-			colorScheme: "blue",
-			supporteMail: "",
-			icons: {
-				favicon: client.user.avatarURL(),
-				noGuildIcon: "https://pnggrid.com/wp-content/uploads/2021/05/Discord-Logo-Circle-1024x1024.png",
-				sidebar: {
-					darkUrl: client.user.avatarURL(),
-					lightUrl: client.user.avatarURL(),
-					hideName: false,
-					borderRadius: "1rem",
-					alignCenter: true,
-				},
-			},
-			index: {
-				card: {
-					category: "JaBa Bot",
-					title: "Simple bot made by <a href=\"https://github.com/JonnyBro\">Jonny_Bro</a>",
-					description: "JaBa's dashboard",
-					image: "",
-					link: {
-						enabled: false,
-						url: "https://github.com/JonnyBro",
-					},
-				},
-				graph: {
-					enabled: false,
-					lineGraph: true,
-					title: "Memory Usage",
-					tag: "Memory (MB)",
-					max: 100,
-				},
-			},
-			notify: {
-				errors: {
-					settingsSave: "Failed to save setttings",
-				},
-				success: {
-					settingsSave: "Successfully saved setttings.",
-					login: "Successfully logged in.",
-					logout: "Successfully logged out.",
-				},
-			},
-			preloader: {
-				image: "",
-				spinner: true,
-				text: "Page is loading",
-			},
-			commands: categories,
-			locales: {
-				enUS: locales["en-US"],
-				ruRU: locales["ru-RU"],
-				ukUA: locales["uk-UA"],
-			},
-		}),
-		customPages: [
-			DBD.customPagesTypes.redirectToUrl("/github", () => {
-				return "https://github.com/JonnyBro/JaBa";
-			}),
-			DBD.customPagesTypes.redirectToUrl("/updates", () => {
-				return "https://github.com/JonnyBro/JaBa/blob/main/dashboard/docs/updates.md";
-			}),
-		],
-		settings: settings(client),
-	});
-
-	await Dashboard.init().then(() => {
-		client.logger.ready(`Dashboard launched on port ${client.config.dashboard.port}`);
-	}).catch(err => {
-		client.logger.error(`Dashboard failed to initialize:\n${err}`);
-	});
-};

dashboard/settings.js

@@ -1,459 +0,0 @@
-const SoftUI = require("./dashboard-core/theme/dbd-soft-ui"),
-	DBD = require("./dashboard-core/index");
-
-const { PermissionsBitField, ChannelType } = require("discord.js");
-
-module.exports = client => [
-	{
-		categoryId: "main",
-		categoryName: "Main settings",
-		categoryDescription: "Setup your bot here!",
-		categoryPermissions: PermissionsBitField.Flags.ManageGuild,
-		categoryOptionsList: [
-			{
-				optionId: "lang",
-				optionName: "Language",
-				optionDescription: "Change bot's language on the server",
-				optionType: DBD.formTypes.select({
-					English: "en-US",
-					Russian: "ru-RU",
-					Ukrainian: "uk-UA",
-				}),
-				getActualSet: async ({ guild }) => {
-					const guildData = await client.getGuildData(guild.id);
-
-					return guildData.language;
-				},
-				setNew: async ({ guild, newData }) => {
-					const guildData = await client.getGuildData(guild.id);
-
-					guildData.language = newData;
-
-					await guildData.save();
-
-					return;
-				},
-			},
-			{
-				optionId: "welcome",
-				optionName: "Welcome Message",
-				optionDescription: "Setup welcome message on the server",
-				optionType: SoftUI.formTypes.multiRow([
-					{
-						optionId: "welcome_enable",
-						optionName: "Enabled",
-						optionDescription: "Toggle welcome messages sending",
-						optionType: DBD.formTypes.switch(),
-						getActualSet: async ({ guild }) => {
-							const guildData = await client.getGuildData(guild.id);
-
-							return guildData.plugins.welcome.enabled;
-						},
-						setNew: async ({ guild, newData }) => {
-							const guildData = await client.getGuildData(guild.id);
-
-							guildData.plugins.welcome.enabled = newData;
-
-							await guildData.save();
-
-							return;
-						},
-					},
-					{
-						optionId: "welcome_image",
-						optionName: "Add Image",
-						optionDescription: "Toggle sending an image with welcome message",
-						optionType: DBD.formTypes.switch(),
-						getActualSet: async ({ guild }) => {
-							const guildData = await client.getGuildData(guild.id);
-
-							return guildData.plugins.welcome.withImage;
-						},
-						setNew: async ({ guild, newData }) => {
-							const guildData = await client.getGuildData(guild.id);
-
-							guildData.plugins.welcome.withImage = newData;
-
-							await guildData.save();
-
-							return;
-						},
-					},
-					{
-						optionId: "welcome_message",
-						optionName: "Message",
-						optionDescription: "Change welcome message (You can use {user}, {server} and {membercount} wildcards)",
-						optionType: DBD.formTypes.input("Welcome, {user}!", 2, 100, false, false),
-						getActualSet: async ({ guild }) => {
-							const guildData = await client.getGuildData(guild.id);
-
-							return guildData.plugins.welcome.message;
-						},
-						setNew: async ({ guild, newData }) => {
-							const guildData = await client.getGuildData(guild.id);
-
-							guildData.plugins.welcome.message = newData !== "" ? newData : null;
-
-							await guildData.save();
-
-							return;
-						},
-					},
-					{
-						optionId: "welcome_channel",
-						optionName: "Channel",
-						optionDescription: "Select a channel for welcome messages",
-						optionType: DBD.formTypes.channelsSelect(false, [ChannelType.GuildText]),
-						getActualSet: async ({ guild }) => {
-							const guildData = await client.getGuildData(guild.id);
-
-							return guildData.plugins.welcome.channel;
-						},
-						setNew: async ({ guild, newData }) => {
-							const guildData = await client.getGuildData(guild.id);
-
-							guildData.plugins.welcome.channel = newData !== "" ? newData : null;
-
-							await guildData.save();
-
-							return;
-						},
-					},
-				]),
-			},
-			{
-				optionId: "goodbye",
-				optionName: "Goodbye Message",
-				optionDescription: "Setup goodbye message on the server",
-				optionType: SoftUI.formTypes.multiRow([
-					{
-						optionId: "goodbye_enable",
-						optionName: "Enabled",
-						optionDescription: "Toggle goodbye messages sending",
-						optionType: DBD.formTypes.switch(),
-						getActualSet: async ({ guild }) => {
-							const guildData = await client.getGuildData(guild.id);
-
-							return guildData.plugins.goodbye.enabled;
-						},
-						setNew: async ({ guild, newData }) => {
-							const guildData = await client.getGuildData(guild.id);
-
-							guildData.plugins.goodbye.enabled = newData;
-
-							await guildData.save();
-
-							return;
-						},
-					},
-					{
-						optionId: "goodbye_image",
-						optionName: "Add Image",
-						optionDescription: "Toggle sending an image with goodbye message",
-						optionType: DBD.formTypes.switch(),
-						getActualSet: async ({ guild }) => {
-							const guildData = await client.getGuildData(guild.id);
-
-							return guildData.plugins.goodbye.withImage;
-						},
-						setNew: async ({ guild, newData }) => {
-							const guildData = await client.getGuildData(guild.id);
-
-							guildData.plugins.goodbye.withImage = newData;
-
-							await guildData.save();
-
-							return;
-						},
-					},
-					{
-						optionId: "goodbye_message",
-						optionName: "Message",
-						optionDescription: "Change goodbye message (You can use {user}, {server} and {membercount} wildcards)",
-						optionType: DBD.formTypes.input("goodbye, {user}!", 2, 100, false, false),
-						getActualSet: async ({ guild }) => {
-							const guildData = await client.getGuildData(guild.id);
-
-							return guildData.plugins.goodbye.message;
-						},
-						setNew: async ({ guild, newData }) => {
-							const guildData = await client.getGuildData(guild.id);
-
-							guildData.plugins.goodbye.message = newData !== "" ? newData : null;
-
-							await guildData.save();
-
-							return;
-						},
-					},
-					{
-						optionId: "goodbye_channel",
-						optionName: "Channel",
-						optionDescription: "Select a channel for goodbye messages",
-						optionType: DBD.formTypes.channelsSelect(false, [ChannelType.GuildText]),
-						getActualSet: async ({ guild }) => {
-							const guildData = await client.getGuildData(guild.id);
-
-							return guildData.plugins.goodbye.channel;
-						},
-						setNew: async ({ guild, newData }) => {
-							const guildData = await client.getGuildData(guild.id);
-
-							guildData.plugins.goodbye.channel = newData !== "" ? newData : null;
-
-							await guildData.save();
-
-							return;
-						},
-					},
-				]),
-			},
-			{
-				optionId: "autorole",
-				optionName: "Auto Role",
-				optionDescription: "Setup auto role on the server",
-				optionType: SoftUI.formTypes.multiRow([
-					{
-						optionId: "autorole_enable",
-						optionName: "Enabled",
-						optionDescription: "Toggle auto role granting for new members",
-						optionType: DBD.formTypes.switch(),
-						getActualSet: async ({ guild }) => {
-							const guildData = await client.getGuildData(guild.id);
-
-							return guildData.plugins.autorole.enabled;
-						},
-						setNew: async ({ guild, newData }) => {
-							const guildData = await client.getGuildData(guild.id);
-
-							guildData.plugins.autorole.enabled = newData;
-
-							await guildData.save();
-
-							return;
-						},
-					},
-					{
-						optionId: "autorole_role",
-						optionName: "Role",
-						optionDescription: "Select a role for auto role. Select \"-\" to disable",
-						optionType: DBD.formTypes.rolesSelect(false, false, true),
-						getActualSet: async ({ guild }) => {
-							const guildData = await client.getGuildData(guild.id);
-
-							return guildData.plugins.autorole.role;
-						},
-						setNew: async ({ guild, newData }) => {
-							const guildData = await client.getGuildData(guild.id);
-
-							guildData.plugins.autorole.role = newData !== "" ? newData : null;
-
-							await guildData.save();
-
-							return;
-						},
-					},
-				]),
-			},
-			{
-				optionId: "automod",
-				optionName: "Auto Mod",
-				optionDescription: "Setup auto mod on the server",
-				optionType: SoftUI.formTypes.multiRow([
-					{
-						optionId: "automod_enable",
-						optionName: "Enabled",
-						optionDescription: "Toggle auto mod. It will remove invite links from non-moderators",
-						optionType: DBD.formTypes.switch(),
-						getActualSet: async ({ guild }) => {
-							const guildData = await client.getGuildData(guild.id);
-
-							return guildData.plugins.automod.enabled;
-						},
-						setNew: async ({ guild, newData }) => {
-							const guildData = await client.getGuildData(guild.id);
-
-							guildData.plugins.automod.enabled = newData;
-
-							await guildData.save();
-
-							return;
-						},
-					},
-					{
-						optionId: "automod_ignore",
-						optionName: "Ignore Channels",
-						optionDescription: "Select a channels for auto mod to ignore",
-						optionType: DBD.formTypes.channelsMultiSelect(false, false, [ChannelType.GuildText]),
-						getActualSet: async ({ guild }) => {
-							const guildData = await client.getGuildData(guild.id);
-
-							return guildData.plugins.automod.ignored;
-						},
-						setNew: async ({ guild, newData }) => {
-							const guildData = await client.getGuildData(guild.id);
-
-							guildData.plugins.automod.ignored = newData;
-
-							await guildData.save();
-
-							return;
-						},
-					},
-				]),
-			},
-			{
-				optionId: "monitoring",
-				optionName: "Monitoring Channels",
-				optionDescription: "Setup monitoring channels on the server",
-				optionType: SoftUI.formTypes.multiRow([
-					{
-						optionId: "monitoring_messageupdate",
-						optionName: "Message Update Channel",
-						optionDescription: "Select a channel for messages update logs to go to. Select \"-\" to disable",
-						optionType: DBD.formTypes.channelsSelect(false, [ChannelType.GuildText]),
-						getActualSet: async ({ guild }) => {
-							const guildData = await client.getGuildData(guild.id);
-
-							return guildData.plugins?.monitoring?.messageUpdate;
-						},
-						setNew: async ({ guild, newData }) => {
-							const guildData = await client.getGuildData(guild.id);
-
-							if (guildData.plugins.monitoring === undefined) guildData.plugins.monitoring = {};
-
-							guildData.plugins.monitoring.messageUpdate = newData !== "" ? newData : null;
-
-							await guildData.save();
-
-							return;
-						},
-					},
-					{
-						optionId: "monitoring_messagedelete",
-						optionName: "Message Deletion Channel",
-						optionDescription: "Select a channel for messages deletion logs to go to. Select \"-\" to disable",
-						optionType: DBD.formTypes.channelsSelect(false, [ChannelType.GuildText]),
-						getActualSet: async ({ guild }) => {
-							const guildData = await client.getGuildData(guild.id);
-
-							return guildData.plugins?.monitoring?.messageDelete;
-						},
-						setNew: async ({ guild, newData }) => {
-							const guildData = await client.getGuildData(guild.id);
-
-							if (guildData.plugins.monitoring === undefined) guildData.plugins.monitoring = {};
-
-							guildData.plugins.monitoring.messageDelete = newData !== "" ? newData : null;
-
-							await guildData.save();
-
-							return;
-						},
-					},
-				]),
-			},
-			{
-				optionId: "channels",
-				optionName: "Special Channels",
-				optionDescription: "Setup special channels on the server. Select \"-\" to disable",
-				optionType: SoftUI.formTypes.multiRow([
-					{
-						optionId: "channels_suggestions",
-						optionName: "Suggestions Channel",
-						optionDescription: "Select a channel for suggestions to go to",
-						optionType: DBD.formTypes.channelsSelect(false, [ChannelType.GuildText]),
-						getActualSet: async ({ guild }) => {
-							const guildData = await client.getGuildData(guild.id);
-
-							return guildData.plugins.suggestions;
-						},
-						setNew: async ({ guild, newData }) => {
-							const guildData = await client.getGuildData(guild.id);
-
-							guildData.plugins.suggestions = newData !== "" ? newData : null;
-
-							await guildData.save();
-
-							return;
-						},
-					},
-					{
-						optionId: "channels_reports",
-						optionName: "Reports Channel",
-						optionDescription: "Select a channel for reports to go to. Select \"-\" to disable",
-						optionType: DBD.formTypes.channelsSelect(false, [ChannelType.GuildText]),
-						getActualSet: async ({ guild }) => {
-							const guildData = await client.getGuildData(guild.id);
-
-							return guildData.plugins.reports;
-						},
-						setNew: async ({ guild, newData }) => {
-							const guildData = await client.getGuildData(guild.id);
-
-							guildData.plugins.reports = newData !== "" ? newData : null;
-
-							await guildData.save();
-
-							return;
-						},
-					},
-					{
-						optionId: "channels_birthdays",
-						optionName: "Birthdays Channel",
-						optionDescription: "Select a channel for birthdays message to go to. Select \"-\" to disable",
-						optionType: DBD.formTypes.channelsSelect(false, [ChannelType.GuildText]),
-						getActualSet: async ({ guild }) => {
-							const guildData = await client.getGuildData(guild.id);
-
-							return guildData.plugins.birthdays;
-						},
-						setNew: async ({ guild, newData }) => {
-							const guildData = await client.getGuildData(guild.id);
-
-							guildData.plugins.birthdays = newData !== "" ? newData : null;
-
-							await guildData.save();
-
-							return;
-						},
-					},
-					{
-						optionId: "channels_modlogs",
-						optionName: "Moderation Logs Channel",
-						optionDescription: "Select a channel for moderation logs to go to (warns). Select \"-\" to disable",
-						optionType: DBD.formTypes.channelsSelect(false, [ChannelType.GuildText]),
-						getActualSet: async ({ guild }) => {
-							const guildData = await client.getGuildData(guild.id);
-
-							return guildData.plugins.modlogs;
-						},
-						setNew: async ({ guild, newData }) => {
-							const guildData = await client.getGuildData(guild.id);
-
-							guildData.plugins.modlogs = newData !== "" ? newData : null;
-
-							await guildData.save();
-
-							return;
-						},
-					},
-				]),
-			},
-		],
-	},
-	{
-		categoryId: "test",
-		categoryName: "test settings",
-		categoryDescription: "ooga booga",
-		categoryPermissions: PermissionsBitField.Flags.ViewChannel,
-		categoryOptionsList: [
-			{
-				optionType: DBD.formTypes.embedBuilder({
-					username: "JaBa",
-					avatarURL: "https://cdn.discordapp.com/avatars/708637495054565426/af98d49ebc9bf28b40b45ed5a0a623b4.png?size=4096",
-				}),
-			},
-		],
-	},
-];

eslint.config.js

@@ -0,0 +1,50 @@
+import globals from "globals";
+import pluginJs from "@eslint/js";
+import stylisticJs from "@stylistic/eslint-plugin-js";
+
+/** @type {import("eslint").Linter.Config[]} */
+export default [
+	pluginJs.configs.recommended,
+	{
+		languageOptions: {
+			globals: globals.node,
+			ecmaVersion: "latest",
+			sourceType: "module",
+		},
+		ignores: ["node_modules", "dashboard"],
+		plugins: {
+			"@stylistic/js": stylisticJs,
+		},
+		rules: {
+			"arrow-body-style": ["error", "as-needed"],
+			camelcase: "error",
+			curly: ["error", "multi-line"],
+			eqeqeq: ["error", "always"],
+			"no-console": "off",
+			"no-var": "error",
+			"prefer-const": "error",
+			yoda: "error",
+			"@stylistic/js/arrow-spacing": ["error", { before: true, after: true }],
+			"@stylistic/js/comma-dangle": ["error", "always-multiline"],
+			"@stylistic/js/comma-spacing": ["error", { before: false, after: true }],
+			"@stylistic/js/comma-style": ["error", "last"],
+			"@stylistic/js/dot-location": ["error", "property"],
+			"@stylistic/js/keyword-spacing": ["error", { before: true, after: true }],
+			"@stylistic/js/no-multi-spaces": "error",
+			"@stylistic/js/no-multiple-empty-lines": [
+				"error",
+				{
+					max: 2,
+					maxEOF: 1,
+					maxBOF: 0,
+				},
+			],
+			"@stylistic/js/no-trailing-spaces": ["error"],
+			"@stylistic/js/object-curly-spacing": ["error", "always"],
+			"@stylistic/js/quotes": ["error", "double"],
+			"@stylistic/js/indent": ["error", "tab"],
+			"@stylistic/js/semi": ["error", "always"],
+			"@stylistic/js/space-infix-ops": "error",
+		},
+	},
+];

events/CommandHandler.js

@@ -1,5 +1,5 @@
-const { InteractionType } = require("discord.js");
+import { InteractionType } from "discord.js";
-const BaseEvent = require("../base/BaseEvent");
+import BaseEvent from "../base/BaseEvent";
 
 class CommandHandler extends BaseEvent {
 	constructor() {
@@ -33,12 +33,10 @@ class CommandHandler extends BaseEvent {
 		if (interaction.type !== InteractionType.ApplicationCommand || !interaction.isCommand()) return;
 
 		// IAT Guild Command Check
-		if (command?.dirname.includes("IAT") && interaction.guildId !== "1039187019957555252")
+		if (command?.dirname.includes("IAT") && interaction.guildId !== "1039187019957555252") return interaction.reply({ content: "IAT only", ephemeral: true });
-			return interaction.reply({ content: "IAT only", ephemeral: true });
 
 		// Owner-only command check
-		if (command.ownerOnly && interaction.user.id !== client.config.owner.id)
+		if (command.ownerOnly && interaction.user.id !== client.config.owner.id) return interaction.error("misc:OWNER_ONLY", null, { ephemeral: true });
-			return interaction.error("misc:OWNER_ONLY", null, { ephemeral: true });
 
 		// First command achievement check
 		const { firstCommand } = interaction.data.user.achievements;
@@ -68,4 +66,4 @@ class CommandHandler extends BaseEvent {
 	}
 }
 
-module.exports = CommandHandler;
+export default CommandHandler;

events/Guild/guildBanAdd.js

@@ -1,4 +1,4 @@
-const BaseEvent = require("../../base/BaseEvent");
+import BaseEvent from "../../base/BaseEvent";
 
 class guildBanAdd extends BaseEvent {
 	constructor() {
@@ -26,8 +26,10 @@ class guildBanAdd extends BaseEvent {
 			await ban.user.send({
 				embeds: [embed],
 			});
-		} catch (e) { /**/ }
+		} catch {
+			/**/
+		}
 	}
 }
 
-module.exports = guildBanAdd;
+export default guildBanAdd;

events/Guild/guildCreate.js

@@ -1,4 +1,4 @@
-const BaseEvent = require("../../base/BaseEvent");
+import BaseEvent from "../../base/BaseEvent";
 
 class GuildCreate extends BaseEvent {
 	constructor() {
@@ -62,12 +62,13 @@ class GuildCreate extends BaseEvent {
 
 			const logChannel = client.channels.cache.get(client.config.support.logs);
 
-			if (logChannel)
+			if (logChannel) {
 				await logChannel.send({
 					embeds: [embed],
 				});
+			}
 		}
 	}
 }
 
-module.exports = GuildCreate;
+export default GuildCreate;

events/Guild/guildDelete.js

@@ -1,4 +1,4 @@
-const BaseEvent = require("../../base/BaseEvent");
+import BaseEvent from "../../base/BaseEvent";
 
 class GuildDelete extends BaseEvent {
 	constructor() {
@@ -25,13 +25,13 @@ class GuildDelete extends BaseEvent {
 
 			const logChannel = client.channels.cache.get(client.config.support.logs);
 
-			if (logChannel)
+			if (logChannel) {
 				await logChannel.send({
 					embeds: [embed],
 				});
-			else client.logger.warn(`Log channel not found for guild deletion: ${guild.name}`);
+			} else client.logger.warn(`Log channel not found for guild deletion: ${guild.name}`);
 		}
 	}
 }
 
-module.exports = GuildDelete;
+export default GuildDelete;

events/Guild/guildMemberAdd.js

@@ -1,4 +1,4 @@
-const BaseEvent = require("../../base/BaseEvent");
+import BaseEvent from "../../base/BaseEvent";
 
 class GuildMemberAdd extends BaseEvent {
 	constructor() {
@@ -46,4 +46,4 @@ class GuildMemberAdd extends BaseEvent {
 	}
 }
 
-module.exports = GuildMemberAdd;
+export default GuildMemberAdd;

events/Guild/guildMemberRemove.js

@@ -1,4 +1,4 @@
-const BaseEvent = require("../../base/BaseEvent");
+import BaseEvent from "../../base/BaseEvent";
 
 class GuildMemberRemove extends BaseEvent {
 	constructor() {
@@ -37,4 +37,4 @@ class GuildMemberRemove extends BaseEvent {
 	}
 }
 
-module.exports = GuildMemberRemove;
+export default GuildMemberRemove;

events/Guild/guildMemberUpdate.js

@@ -1,4 +1,4 @@
-const BaseEvent = require("../../base/BaseEvent");
+import BaseEvent from "../../base/BaseEvent";
 
 class GuildMemberUpdate extends BaseEvent {
 	constructor() {
@@ -44,4 +44,4 @@ class GuildMemberUpdate extends BaseEvent {
 	}
 }
 
-module.exports = GuildMemberUpdate;
+export default GuildMemberUpdate;

events/MessageHandler.js

@@ -1,5 +1,5 @@
-const { PermissionsBitField, ActionRowBuilder, ButtonBuilder, ButtonStyle } = require("discord.js");
+import { PermissionsBitField, ActionRowBuilder, ButtonBuilder, ButtonStyle } from "discord.js";
-const BaseEvent = require("../base/BaseEvent");
+import BaseEvent from "../base/BaseEvent";
 
 const xpCooldown = {};
 
@@ -23,7 +23,7 @@ class MessageCreate extends BaseEvent {
 
 		if (message.guild) {
 			if (!message.member) await message.guild.members.fetch(message.author.id);
-			
+
 			data.guild = await client.getGuildData(message.guildId);
 			data.member = await client.getMemberData(message.author.id, message.guildId);
 		}
@@ -69,8 +69,7 @@ class MessageCreate extends BaseEvent {
 
 			if (msg.content) embed.addFields([{ name: message.translate("misc:QUOTE_CONTENT"), value: msg.content }]);
 			if (msg.attachments.size > 0) {
-				if (msg.attachments.find(a => a.contentType.includes("image/")))
+				if (msg.attachments.find(a => a.contentType.includes("image/"))) embed.setImage(msg.attachments.find(a => a.contentType.includes("image/")).url);
-					embed.setImage(msg.attachments.find(a => a.contentType.includes("image/")).url);
 
 				embed.addFields([
 					{
@@ -160,4 +159,4 @@ class MessageCreate extends BaseEvent {
 	}
 }
 
-module.exports = MessageCreate;
+export default MessageCreate;

events/Monitoring/messageDelete.js

@@ -1,4 +1,4 @@
-const BaseEvent = require("../../base/BaseEvent");
+import BaseEvent from "../../base/BaseEvent";
 
 class messageDelete extends BaseEvent {
 	constructor() {
@@ -40,4 +40,4 @@ class messageDelete extends BaseEvent {
 	}
 }
 
-module.exports = messageDelete;
+export default messageDelete;

events/Monitoring/messageUpdate.js

@@ -1,4 +1,4 @@
-const BaseEvent = require("../../base/BaseEvent");
+import BaseEvent from "../../base/BaseEvent";
 
 class messageUpdate extends BaseEvent {
 	constructor() {
@@ -42,4 +42,4 @@ class messageUpdate extends BaseEvent {
 	}
 }
 
-module.exports = messageUpdate;
+export default messageUpdate;

events/Ready.js

@@ -1,5 +1,5 @@
-const { ActivityType } = require("discord.js");
+import { ActivityType } from "discord.js";
-const BaseEvent = require("../base/BaseEvent");
+import BaseEvent from "../base/BaseEvent";
 
 class Ready extends BaseEvent {
 	constructor() {
@@ -28,8 +28,6 @@ class Ready extends BaseEvent {
 		const checkReminds = require("../helpers/checkReminds");
 		checkReminds.init(client);
 
-		if (client.config.dashboard.enabled) await client.dashboard.load(client);
-
 		client.logger.ready(`Loaded a total of ${commands.length} command(s).`);
 		client.logger.ready(`${client.user.getUsername()}, ready to serve ${users} members in ${servers} servers.`);
 		console.timeEnd("botReady");
@@ -63,4 +61,4 @@ class Ready extends BaseEvent {
 	}
 }
 
-module.exports = Ready;
+export default Ready;

events/TicketsButton.js

@@ -1,5 +1,5 @@
-const { ButtonBuilder, ActionRowBuilder, ButtonStyle, ChannelType, PermissionsBitField } = require("discord.js");
+import { ButtonBuilder, ActionRowBuilder, ButtonStyle, ChannelType, PermissionsBitField } from "discord.js";
-const BaseEvent = require("../base/BaseEvent");
+import BaseEvent from "../base/BaseEvent";
 
 class CommandHandler extends BaseEvent {
 	constructor() {
@@ -60,9 +60,13 @@ class CommandHandler extends BaseEvent {
 			});
 
 			await logChannel.send({ embeds: [logEmbed] });
-			await interaction.success("tickets/createticketembed:TICKET_CREATED", {
+			await interaction.success(
-				channel: channel.toString(),
+				"tickets/createticketembed:TICKET_CREATED",
-			}, { ephemeral: true });
+				{
+					channel: channel.toString(),
+				},
+				{ ephemeral: true },
+			);
 
 			await channel.send(`<@${interaction.user.id}>`);
 
@@ -75,14 +79,8 @@ class CommandHandler extends BaseEvent {
 				description: interaction.translate("tickets/createticketembed:TICKET_CREATED_DESC"),
 			});
 
-			const closeButton = new ButtonBuilder()
+			const closeButton = new ButtonBuilder().setCustomId("close_ticket").setLabel(interaction.translate("tickets/closeticket:CLOSE_TICKET")).setStyle(ButtonStyle.Danger);
-				.setCustomId("close_ticket")
+			const transcriptButton = new ButtonBuilder().setCustomId("transcript_ticket").setLabel(interaction.translate("tickets/closeticket:TRANSCRIPT_TICKET")).setStyle(ButtonStyle.Secondary);
-				.setLabel(interaction.translate("tickets/closeticket:CLOSE_TICKET"))
-				.setStyle(ButtonStyle.Danger);
-			const transcriptButton = new ButtonBuilder()
-				.setCustomId("transcript_ticket")
-				.setLabel(interaction.translate("tickets/closeticket:TRANSCRIPT_TICKET"))
-				.setStyle(ButtonStyle.Secondary);
 			const row = new ActionRowBuilder().addComponents(closeButton, transcriptButton);
 
 			guildData.plugins.tickets.count++;
@@ -135,14 +133,18 @@ class CommandHandler extends BaseEvent {
 						});
 						transcript += "---- TICKET CLOSED ----\n";
 
-						if (transcriptionLogs !== null) interaction.guild.channels.cache.get(transcriptionLogs).send({ content: interaction.translate("tickets/closeticket:TRANSCRIPT", { channel: `<#${interaction.channelId}>` }), files: [{ attachment: Buffer.from(transcript), name: `${interaction.channel.name}.txt` }] });
+						if (transcriptionLogs !== null) {
+							interaction.guild.channels.cache
+								.get(transcriptionLogs)
+								.send({ content: interaction.translate("tickets/closeticket:TRANSCRIPT", { channel: `<#${interaction.channelId}>` }), files: [{ attachment: Buffer.from(transcript), name: `${interaction.channel.name}.txt` }] });
+						}
 
 						try {
 							await interaction.user.send({
 								content: interaction.translate("tickets/closeticket:TRANSCRIPT", { channel: interaction.channel.name }),
 								files: [{ attachment: Buffer.from(transcript), name: `${interaction.channel.name}.txt` }],
 							});
-						} catch (e) {
+						} catch {
 							interaction.followUp({ content: interaction.translate("misc:CANT_DM"), ephemeral: true });
 						}
 					}
@@ -181,7 +183,7 @@ class CommandHandler extends BaseEvent {
 						content: interaction.translate("tickets/closeticket:TRANSCRIPT", { channel: `<#${interaction.channelId}>` }),
 						files: [{ attachment: Buffer.from(transcript), name: `${interaction.channel.name}.txt` }],
 					});
-				} catch (error) {
+				} catch {
 					interaction.followUp({ content: interaction.translate("misc:CANT_DM"), ephemeral: true });
 				}
 			} else return;
@@ -189,4 +191,4 @@ class CommandHandler extends BaseEvent {
 	}
 }
 
-module.exports = CommandHandler;
+export default CommandHandler;

handlers/command-handler/functions/registerCommands.js

@@ -0,0 +1,28 @@
+import logger from "../../../helpers/logger.js";
+import differentCommands from "../utils/differentcommands.js";
+
+export default async function registerCommands(props) {
+	const globalCommands = props.commands.filter(cmd => !cmd.options?.devOnly);
+	props.client.once("ready", () => registerGlobalCommands(props.client, globalCommands));
+}
+
+const registerGlobalCommands = async (client, commands) => {
+	const appCommandsManager = client.application.commands;
+	await appCommandsManager.fetch();
+
+	await Promise.all(
+		commands.map(async ({ data }) => {
+			const targetCommand = appCommandsManager.cache.find(cmd => cmd.name === data.name);
+
+			if (targetCommand && differentCommands(targetCommand, data)) {
+				await targetCommand.edit(data).catch(() => logger.error(`Failed to update command: ${data.name} globally`));
+
+				logger.log(`Edited command globally: ${data.name}`);
+			} else if (!targetCommand) {
+				await appCommandsManager.create(data).catch(() => logger.error(`Failed to register command: ${data.name}`));
+			}
+		}),
+	);
+
+	logger.log("Registered global commands");
+};

handlers/command-handler/index.js

@@ -0,0 +1,36 @@
+import logger from "../../helpers/logger.js";
+import { client } from "../../index.js";
+import { getFilePaths } from "../../utils/get-path.js";
+import { toFileURL } from "../../utils/resolve-file.js";
+import registerCommands from "./functions/registerCommands.js";
+
+export const commands = [];
+
+export const init = async () => {
+	await buildCommands();
+
+	await registerCommands({
+		client,
+		commands,
+	});
+};
+
+const buildCommands = async () => {
+	const commandFilePaths = (await getFilePaths("./newCommands", true)).filter(path => path.endsWith(".js"));
+
+	for (const cmdFilePath of commandFilePaths) {
+		const { data, run } = await import(toFileURL(cmdFilePath));
+
+		if (!data || !data.name) {
+			logger.warn(`Command ${cmdFilePath} does not have a data object or name`);
+			continue;
+		}
+
+		if (typeof run !== "function") {
+			logger.warn(`Command ${cmdFilePath} does not have a run function or it is not a function`);
+			continue;
+		}
+
+		commands.push({ data, run });
+	}
+};

handlers/command-handler/utils/differentcommands.js

@@ -0,0 +1,8 @@
+export default function differentCommands(appCommand, localCommand) {
+	const appOptions = appCommand.options || [];
+	const localOptions = localCommand.options || [];
+	const appDescription = appCommand.description || "";
+	const localDescription = localCommand.description || "";
+
+	return localDescription !== appDescription || localOptions.length !== appOptions.length;
+}

handlers/event-handler/index.js

@@ -0,0 +1,42 @@
+import logger from "../../helpers/logger.js";
+import { client } from "../../index.js";
+import { getFilePaths } from "../../utils/get-path.js";
+import { toFileURL } from "../../utils/resolve-file.js";
+
+export const events = [];
+
+export const init = async () => {
+	await buildEvents();
+	registerEvents();
+};
+
+const buildEvents = async () => {
+	try {
+		const eventFilePaths = (await getFilePaths("./newEvents", true)).filter(path => path.endsWith(".js"));
+
+		for (const eventFilePath of eventFilePaths) {
+			const { data, run } = await import(toFileURL(eventFilePath));
+
+			if (!data || !data.name) {
+				logger.warn(`Event ${eventFilePath} does not have a data object or name`);
+				continue;
+			}
+
+			if (typeof run !== "function") {
+				logger.warn(`Event ${eventFilePath} does not have a run function or it is not a function`);
+				continue;
+			}
+
+			events.push({ data, run });
+		}
+	} catch (error) {
+		logger.error("Error build events: ", error);
+	}
+};
+
+const registerEvents = async () => {
+	for (const { data, run } of events) {
+		if (data.once) client.once(data.name, run);
+		else client.on(data.name, run);
+	}
+};

helpers/birthdays.js

@@ -1,4 +1,4 @@
-const { CronJob } = require("cron");
+import { CronJob } from "cron";
 
 /**
  *
@@ -61,5 +61,9 @@ async function checkBirthdays(client) {
 	}
 }
 
-module.exports.init = async client => new CronJob("0 5 * * *", checkBirthdays(client), null, true, "Europe/Moscow");
+export async function init(client) {
-module.exports.run = async client => await checkBirthdays(client);
+	new CronJob("0 5 * * *", checkBirthdays(client), null, true, "Europe/Moscow");
+}
+export async function run(client) {
+	await checkBirthdays(client);
+}

helpers/checkReminds.js

@@ -56,5 +56,11 @@ async function checkReminds(client) {
 	});
 }
 
-module.exports.init = async client => setInterval(async () => await checkReminds(client), 1000);
+export async function init(client) {
-module.exports.run = async client => await checkReminds(client);
+	setInterval(async () => {
+		await checkReminds(client);
+	}, 1000);
+}
+export async function run(client) {
+	await checkReminds(client);
+}

helpers/cleanup.js

@@ -1,5 +1,4 @@
 // Thanks Stackoverflow <3
-
 function setDaysTimeout(callback, days) {
 	// 86400 seconds in a day
 	const msInDay = 86400 * 1000;
@@ -19,7 +18,7 @@ function setDaysTimeout(callback, days) {
  *
  * @param {import("../base/Client")} client
  */
-module.exports.init = async function (client) {
+export async function init(client) {
 	setDaysTimeout(async () => {
 		const timestamp = Date.now() + 29 * 24 * 60 * 60 * 1000; // 29 days
 		const members = client.membersData.find({ transactions: { $gt: [] } });
@@ -66,4 +65,4 @@ module.exports.init = async function (client) {
 			}
 		});
 	}, 30);
-};
+}

helpers/extenders.js

@@ -1,4 +1,4 @@
-const { Message, BaseInteraction, User, GuildMember } = require("discord.js");
+import { Message, BaseInteraction, User, GuildMember } from "discord.js";
 
 /**
  *

helpers/functions.js

@@ -1,147 +1,119 @@
-const moment = require("moment");
+import moment from "moment";
 
-module.exports = {
+/**
-	/**
+ * Asynchronously iterates over a collection and executes a callback function for each item.
-	 * Asynchronously iterates over a collection and executes a callback function for each item.
+ *
-	 *
+ * @param {any[]} collection - The collection to iterate over.
-	 * @param {any[]} collection - The collection to iterate over.
+ * @param {(item: any) => Promise<void>} callback - The async callback function to execute for each item in the collection.
-	 * @param {(item: any) => Promise<void>} callback - The async callback function to execute for each item in the collection.
+ * @returns {Promise<void>} A promise that resolves when all items in the collection have been processed.
-	 * @returns {Promise<void>} A promise that resolves when all items in the collection have been processed.
+ */
-	 */
+export async function asyncForEach(collection, callback) {
-	async asyncForEach(collection, callback) {
+	const allPromises = collection.map(async key => {
-		const allPromises = collection.map(async key => {
+		await callback(key);
-			await callback(key);
+	});
-		});
 
-		return await Promise.all(allPromises);
+	return await Promise.all(allPromises);
-	},
+}
 
-	/**
+/**
-	 * Sorts an array by the specified key in ascending order.
+ * Sorts an array by the specified key in ascending order.
-	 *
+ *
-	 * @param {any[]} array - The array to sort.
+ * @param {any[]} array - The array to sort.
-	 * @param {string} key - The key to sort the array by.
+ * @param {string} key - The key to sort the array by.
-	 * @returns {any[]} The sorted array.
+ * @returns {any[]} The sorted array.
-	 */
+ */
-	sortByKey(array, key) {
+export function sortByKey(array, key) {
-		return array.sort(function (a, b) {
+	return array.sort(function (a, b) {
-			const x = a[key];
+		const x = a[key];
-			const y = b[key];
+		const y = b[key];
-			return x < y ? 1 : x > y ? -1 : 0;
+		return x < y ? 1 : x > y ? -1 : 0;
-		});
+	});
-	},
+}
 
-	/**
+/**
-	 * Shuffles the elements of the provided array in-place.
+ * Shuffles the elements of the provided array in-place.
-	 *
+ *
-	 * @param {any[]} pArray - The array to shuffle.
+ * @param {any[]} pArray - The array to shuffle.
-	 * @returns {any[]} The shuffled array.
+ * @returns {any[]} The shuffled array.
-	 */
+ */
-	shuffle(pArray) {
+export function shuffle(pArray) {
-		const array = [];
+	const array = [];
 
-		pArray.forEach(element => array.push(element));
+	pArray.forEach(element => array.push(element));
 
-		let currentIndex = array.length,
+	let currentIndex = array.length,
-			temporaryValue,
+		temporaryValue,
-			randomIndex;
+		randomIndex;
 
-		while (currentIndex !== 0) {
+	while (currentIndex !== 0) {
-			randomIndex = Math.floor(Math.random() * currentIndex);
+		randomIndex = Math.floor(Math.random() * currentIndex);
-			currentIndex -= 1;
+		currentIndex -= 1;
+		temporaryValue = array[currentIndex];
+		array[currentIndex] = array[randomIndex];
+		array[randomIndex] = temporaryValue;
+	}
 
-			temporaryValue = array[currentIndex];
+	return array;
-			array[currentIndex] = array[randomIndex];
+}
-			array[randomIndex] = temporaryValue;
-		}
 
-		return array;
+/**
-	},
+ * Generates a random integer between the specified minimum and maximum values (inclusive).
+ *
+ * @param {number} [min=0] - The minimum value (inclusive).
+ * @param {number} [max=100] - The maximum value (inclusive).
+ * @returns {number} A random integer between min and max.
+ */
+export function randomNum(min = 0, max = 100) {
+	min = Math.floor(min);
+	max = Math.floor(max);
 
-	/**
+	return Math.floor(Math.random() * (max - min + 1) + min);
-	 * Generates a random integer between the specified minimum and maximum values (inclusive).
+}
-	 *
+/**
-	 * @param {number} [min=0] - The minimum value (inclusive).
+ * Formats a date for the specified client and locale.
-	 * @param {number} [max=100] - The maximum value (inclusive).
+ *
-	 * @returns {number} A random integer between min and max.
+ * @param {Object} client - The client object containing language data.
-	 */
+ * @param {string} date - The date to format.
-	randomNum(min = 0, max = 100) {
+ * @param {string} [format=null] - The date format to use. If not provided, the default format for the client's language will be used.
-		min = Math.floor(min);
+ * @param {string} [locale=client.defaultLanguage.name] - The locale to use for formatting the date.
-		max = Math.floor(max);
+ * @returns {string} The formatted date.
+ */
+export function printDate(client, date, format = null, locale = client.defaultLanguage.name) {
+	const languageData = client.languages.find(language => language.name === locale);
+	if (format === "" || format === null) format = languageData.defaultMomentFormat;
+	return moment(new Date(date)).locale(languageData.moment).format(format);
+}
+/**
+ * Formats a time value relative to the current time.
+ *
+ * @param {Object} client - The client object containing language data.
+ * @param {string|number|Date} time - The time value to format.
+ * @param {boolean} [type=false] - If true, formats the time as "X time ago", otherwise formats it as "in X time".
+ * @param {boolean} [prefix=true] - If true, includes a prefix like "in" or "ago" in the formatted time.
+ * @param {string} [locale=client.defaultLanguage.name] - The locale to use for formatting the time.
+ * @returns {string} The formatted time value.
+ */
+export function convertTime(client, time, type = false, prefix = true, locale = client.defaultLanguage.name) {
+	const languageData = client.languages.find(language => language.name === locale);
+	const m = moment(time).locale(languageData.moment);
+	return type ? m.toNow(!prefix) : m.fromNow(!prefix);
+}
 
-		return Math.floor(Math.random() * (max - min + 1) + min);
+/**
-	},
+ * Generates the appropriate noun form based on the given number and noun forms.
-
+ *
-	/**
+ * @param {number} number - The number to use for determining the noun form.
-	 * Formats a date for the specified client and locale.
+ * @param {string} one - The noun form for the singular case.
-	 *
+ * @param {string} two - The noun form for the dual case.
-	 * @param {Object} client - The client object containing language data.
+ * @param {string} five - The noun form for the plural case.
-	 * @param {string} date - The date to format.
+ * @returns {string} The appropriate noun form based on the given number.
-	 * @param {string} [format=null] - The date format to use. If not provided, the default format for the client's language will be used.
+ */
-	 * @param {string} [locale=client.defaultLanguage.name] - The locale to use for formatting the date.
+export function getNoun(number, one, two, five) {
-	 * @returns {string} The formatted date.
+	let n = Math.abs(number);
-	 */
+	n %= 100;
-	printDate(client, date, format = null, locale = client.defaultLanguage.name) {
+	if (n >= 5 && n <= 20) return five;
-		const languageData = client.languages.find(language => language.name === locale);
+	n %= 10;
-		if (format === "" || format === null) format = languageData.defaultMomentFormat;
+	if (n === 1) return one;
-
+	if (n >= 2 && n <= 4) return two;
-		return moment(new Date(date)).locale(languageData.moment).format(format);
+	return five;
-	},
+}
-
-	/**
-	 * Formats a time value relative to the current time.
-	 *
-	 * @param {Object} client - The client object containing language data.
-	 * @param {string|number|Date} time - The time value to format.
-	 * @param {boolean} [type=false] - If true, formats the time as "X time ago", otherwise formats it as "in X time".
-	 * @param {boolean} [prefix=true] - If true, includes a prefix like "in" or "ago" in the formatted time.
-	 * @param {string} [locale=client.defaultLanguage.name] - The locale to use for formatting the time.
-	 * @returns {string} The formatted time value.
-	 */
-	convertTime(client, time, type = false, prefix = true, locale = client.defaultLanguage.name) {
-		const languageData = client.languages.find(language => language.name === locale);
-		const m = moment(time).locale(languageData.moment);
-
-		return type ? m.toNow(!prefix) : m.fromNow(!prefix);
-	},
-
-	/**
-	 * Generates the appropriate noun form based on the given number and noun forms.
-	 *
-	 * @param {number} number - The number to use for determining the noun form.
-	 * @param {string} one - The noun form for the singular case.
-	 * @param {string} two - The noun form for the dual case.
-	 * @param {string} five - The noun form for the plural case.
-	 * @returns {string} The appropriate noun form based on the given number.
-	 */
-	getNoun(number, one, two, five) {
-		let n = Math.abs(number);
-		n %= 100;
-		if (n >= 5 && n <= 20) return five;
-		n %= 10;
-
-		if (n === 1) return one;
-		if (n >= 2 && n <= 4) return two;
-
-		return five;
-	},
-
-	/**
-	 * Function to apply text on a canvas with dynamic font size based on the width constraint.
-	 *
-	 * @param {import("@napi-rs/canvas").Canvas} canvas - The canvas object where the text will be applied.
-	 * @param {string} text - The string of text that needs to be applied on the canvas.
-	 * @param {number} defaultFontSize - The initial font size for the text. It is expected to decrease with each iteration.
-	 * @param {number} width - The maximum width that the text can occupy before it has to shrink down.
-	 * @param {string} font - The name of the font used for drawing the text on the canvas.
-	 *
-	 * @return {string} - The final calculated font size in a format '<size>px <family>'.
-	 */
-	applyText(canvas, text, defaultFontSize, width, font) {
-		const ctx = canvas.getContext("2d");
-		do ctx.font = `${(defaultFontSize -= 1)}px ${font}`;
-		while (ctx.measureText(text).width > width);
-
-		return ctx.font;
-	},
-};

helpers/languages.js

@@ -1,19 +1,19 @@
-const i18next = require("i18next"),
+import { use, init, getFixedT } from "i18next";
-	Backend = require("i18next-fs-backend"),
+import Backend from "i18next-fs-backend";
-	path = require("path"),
+import { join, resolve } from "path";
-	fs = require("fs").promises;
+import { promises as fs } from "fs";
 
 async function walkDirectory(dir, namespaces = [], folderName = "") {
 	const files = await fs.readdir(dir);
 
 	const languages = [];
 	for (const file of files) {
-		const stat = await fs.stat(path.join(dir, file));
+		const stat = await fs.stat(join(dir, file));
 		if (stat.isDirectory()) {
 			const isLanguage = file.includes("-");
 			if (isLanguage) languages.push(file);
 
-			const folder = await walkDirectory(path.join(dir, file), namespaces, isLanguage ? "" : `${file}/`);
+			const folder = await walkDirectory(join(dir, file), namespaces, isLanguage ? "" : `${file}/`);
 
 			namespaces = folder.namespaces;
 		} else {
@@ -27,16 +27,16 @@ async function walkDirectory(dir, namespaces = [], folderName = "") {
 	};
 }
 
-module.exports = async () => {
+export default async () => {
 	const options = {
-		loadPath: path.resolve(__dirname, "../languages/{{lng}}/{{ns}}.json"),
+		loadPath: resolve(__dirname, "../languages/{{lng}}/{{ns}}.json"),
 	};
 
-	const { namespaces, languages } = await walkDirectory(path.resolve(__dirname, "../languages/"));
+	const { namespaces, languages } = await walkDirectory(resolve(__dirname, "../languages/"));
 
-	i18next.use(Backend);
+	use(Backend);
 
-	await i18next.init({
+	await init({
 		backend: options,
 		debug: false,
 		fallbackLng: "en-US",
@@ -47,5 +47,5 @@ module.exports = async () => {
 		preload: languages,
 	});
 
-	return new Map(languages.map(item => [item, i18next.getFixedT(item)]));
+	return new Map(languages.map(item => [item, getFixedT(item)]));
 };

helpers/logger.js

@@ -1,52 +1,47 @@
-const { bgBlue, black, green } = require("chalk");
+import chalk from "chalk";
-
-function dateTimePad(value, digits) {
-	let number = value;
-	while (number.toString().length < digits) number = "0" + number;
-
-	return number;
-}
 
 function format(tDate) {
-	return (
+	return new Intl.DateTimeFormat("ru-RU", {
-		dateTimePad(tDate.getDate(), 2) +
+		year: "numeric",
-		"-" +
+		month: "2-digit",
-		dateTimePad(tDate.getMonth() + 1, 2) +
+		day: "2-digit",
-		"-" +
+		hour: "2-digit",
-		dateTimePad(tDate.getFullYear(), 2) +
+		minute: "2-digit",
-		" " +
+		second: "2-digit",
-		dateTimePad(tDate.getHours(), 2) +
+	}).format(tDate);
-		":" +
-		dateTimePad(tDate.getMinutes(), 2) +
-		":" +
-		dateTimePad(tDate.getSeconds(), 2) +
-		"." +
-		dateTimePad(tDate.getMilliseconds(), 3)
-	);
 }
 
-module.exports = class Logger {
+const logLevels = {
-	static log(content) {
+	LOG: chalk.bgBlue("LOG"),
-		return console.log(`[${format(new Date(Date.now()))}]: ${bgBlue("LOG")} ${content}`);
+	WARN: chalk.black.bgYellow("WARN"),
-	}
+	ERROR: chalk.black.bgRed("ERROR"),
-
+	DEBUG: chalk.green("DEBUG"),
-	static warn(content) {
+	CMD: chalk.black.bgWhite("CMD"),
-		return console.log(`[${format(new Date(Date.now()))}]: ${black.bgYellow("WARN")} ${content}`);
+	READY: chalk.black.bgGreen("READY"),
-	}
+};
-
+
-	static error(content) {
+export default {
-		return console.log(`[${format(new Date(Date.now()))}]: ${black.bgRed("ERROR")} ${content}`);
+	log(content) {
-	}
+		return console.log(`[${format(Date.now())}]: ${logLevels.LOG} ${content}`);
-
+	},
-	static debug(content) {
+
-		return console.log(`[${format(new Date(Date.now()))}]: ${green("DEBUG")} ${content}`);
+	warn(content) {
-	}
+		return console.log(`[${format(Date.now())}]: ${logLevels.WARN} ${content}`);
-
+	},
-	static cmd(content) {
+
-		return console.log(`[${format(new Date(Date.now()))}]: ${black.bgWhite("CMD")} ${content}`);
+	error(content) {
-	}
+		return console.log(`[${format(Date.now())}]: ${logLevels.ERROR} ${content}`);
-
+	},
-	static ready(content) {
+
-		return console.log(`[${format(new Date(Date.now()))}]: ${black.bgGreen("READY")} ${content}`);
+	debug(content) {
-	}
+		return console.log(`[${format(Date.now())}]: ${logLevels.DEBUG} ${content}`);
+	},
+
+	cmd(content) {
+		return console.log(`[${format(Date.now())}]: ${logLevels.CMD} ${content}`);
+	},
+
+	ready(content) {
+		return console.log(`[${format(Date.now())}]: ${logLevels.READY} ${content}`);
+	},
 };

helpers/tictactoe.js

@@ -1,7 +1,7 @@
 // Thanks to simply-djs for this =)
 // TODO: Refactor this please...
 
-const { ButtonBuilder, ActionRowBuilder, ButtonStyle, ComponentType } = require("discord.js");
+import { ButtonBuilder, ActionRowBuilder, ButtonStyle, ComponentType } from "discord.js";
 
 /**
  * @param {import("discord.js").ChatInputCommandInteraction} interaction
@@ -15,7 +15,7 @@ const { ButtonBuilder, ActionRowBuilder, ButtonStyle, ComponentType } = require(
  * @param {string}	options.idleEmoji Emoji for "nothing"
  * @returns {Promise<import("discord.js").User>}
  */
-async function tictactoe(interaction, options = {}) {
+export async function tictactoe(interaction, options = {}) {
 	// eslint-disable-next-line no-async-promise-executor
 	return new Promise(async resolve => {
 		try {
@@ -25,41 +25,47 @@ async function tictactoe(interaction, options = {}) {
 			if (interaction.commandId) {
 				opponent = interaction.options.getUser(options.userSlash || "user");
 
-				if (!opponent)
+				if (!opponent) {
 					return interaction.reply({
 						content: interaction.translate("fun/tictactoe:NO_USER"),
 						ephemeral: true,
 					});
+				}
 
-				if (opponent.bot)
+				if (opponent.bot) {
 					return interaction.reply({
 						content: interaction.translate("fun/tictactoe:BOT_USER"),
 						ephemeral: true,
 					});
+				}
 
-				if (opponent.id == (interaction.user ? interaction.user : interaction.author).id)
+				if (opponent.id === (interaction.user ? interaction.user : interaction.author).id) {
 					return interaction.reply({
 						content: interaction.translate("misc:CANT_YOURSELF"),
 						ephemeral: true,
 					});
+				}
 			} else if (!interaction.commandId) {
 				opponent = interaction.mentions.members.first()?.user;
 
-				if (!opponent)
+				if (!opponent) {
 					return interaction.reply({
 						content: interaction.translate("fun/tictactoe:NO_USER"),
 					});
+				}
 
-				if (opponent.bot)
+				if (opponent.bot) {
 					return interaction.reply({
 						content: interaction.translate("fun/tictactoe:BOT_USER"),
 						ephemeral: true,
 					});
+				}
 
-				if (opponent.id === interaction.member.id)
+				if (opponent.id === interaction.member.id) {
 					return interaction.reply({
 						content: interaction.translate("misc:CANT_YOURSELF"),
 					});
+				}
 			}
 
 			const footer = options.embedFooter || client.config.embed.footer,
@@ -97,25 +103,26 @@ async function tictactoe(interaction, options = {}) {
 			});
 
 			collector.on("collect", async button => {
-				if (button.user.id !== opponent.id)
+				if (button.user.id !== opponent.id) {
 					return button.reply({
 						content: interaction.translate("fun/tictactoe:REQUEST_SEND", {
 							opponent: opponent.id,
 						}),
 						ephemeral: true,
 					});
+				}
 
-				if (button.customId == "declinettt") {
+				if (button.customId === "declinettt") {
 					button.deferUpdate();
 					return collector.stop("decline");
-				} else if (button.customId == "acceptttt") {
+				} else if (button.customId === "acceptttt") {
 					button.deferUpdate();
 					collector.stop();
 
 					const fighters = [(interaction.user ? interaction.user : interaction.author).id, opponent.id].sort(() => (Math.random() > 0.5 ? 1 : -1));
 
-					const x_emoji = options.xEmoji || "❌";
+					const xEmoji = options.xEmoji || "❌";
-					const o_emoji = options.oEmoji || "⭕";
+					const oEmoji = options.oEmoji || "⭕";
 
 					const dashmoji = options.idleEmoji || "➖";
 
@@ -175,32 +182,32 @@ async function tictactoe(interaction, options = {}) {
 					});
 
 					let msg;
-					if (interaction.commandId)
+					if (interaction.commandId) {
 						msg = await interaction.editReply({
 							embeds: [
 								epm.setDescription(
 									interaction.translate("fun/tictactoe:WAITING", {
 										user: Args.userid,
-										emoji: client.emojis.cache.get(o_emoji) || "⭕",
+										emoji: client.emojis.cache.get(oEmoji) || "⭕",
 									}),
 								),
 							],
 						});
-					else if (!interaction.commandId)
+					} else if (!interaction.commandId) {
 						msg = await button.message.edit({
 							embeds: [
 								epm.setDescription(
 									interaction.translate("fun/tictactoe:WAITING", {
 										user: Args.userid,
-										emoji: client.emojis.cache.get(o_emoji) || "⭕",
+										emoji: client.emojis.cache.get(oEmoji) || "⭕",
 									}),
 								),
 							],
 						});
+					}
 
 					await ttt(msg);
 
-					// eslint-disable-next-line no-inner-declarations
 					async function ttt(m) {
 						Args.userid = fighters[Args.user];
 						const won = {
@@ -222,214 +229,212 @@ async function tictactoe(interaction, options = {}) {
 						const c = new ActionRowBuilder().addComponents([c1, c2, c3]);
 						const buttons = [a, b, c];
 
-						if (Args.a1.emoji == o_emoji && Args.b1.emoji == o_emoji && Args.c1.emoji == o_emoji) won["<:O_:863314110560993340>"] = true;
+						if (Args.a1.emoji === oEmoji && Args.b1.emoji === oEmoji && Args.c1.emoji === oEmoji) won["<:O_:863314110560993340>"] = true;
 
-						if (Args.a2.emoji == o_emoji && Args.b2.emoji == o_emoji && Args.c2.emoji == o_emoji) won["<:O_:863314110560993340>"] = true;
+						if (Args.a2.emoji === oEmoji && Args.b2.emoji === oEmoji && Args.c2.emoji === oEmoji) won["<:O_:863314110560993340>"] = true;
 
-						if (Args.a3.emoji == o_emoji && Args.b3.emoji == o_emoji && Args.c3.emoji == o_emoji) won["<:O_:863314110560993340>"] = true;
+						if (Args.a3.emoji === oEmoji && Args.b3.emoji === oEmoji && Args.c3.emoji === oEmoji) won["<:O_:863314110560993340>"] = true;
 
-						if (Args.a1.emoji == o_emoji && Args.b2.emoji == o_emoji && Args.c3.emoji == o_emoji) won["<:O_:863314110560993340>"] = true;
+						if (Args.a1.emoji === oEmoji && Args.b2.emoji === oEmoji && Args.c3.emoji === oEmoji) won["<:O_:863314110560993340>"] = true;
 
-						if (Args.a3.emoji == o_emoji && Args.b2.emoji == o_emoji && Args.c1.emoji == o_emoji) won["<:O_:863314110560993340>"] = true;
+						if (Args.a3.emoji === oEmoji && Args.b2.emoji === oEmoji && Args.c1.emoji === oEmoji) won["<:O_:863314110560993340>"] = true;
 
-						if (Args.a1.emoji == o_emoji && Args.a2.emoji == o_emoji && Args.a3.emoji == o_emoji) won["<:O_:863314110560993340>"] = true;
+						if (Args.a1.emoji === oEmoji && Args.a2.emoji === oEmoji && Args.a3.emoji === oEmoji) won["<:O_:863314110560993340>"] = true;
 
-						if (Args.b1.emoji == o_emoji && Args.b2.emoji == o_emoji && Args.b3.emoji == o_emoji) won["<:O_:863314110560993340>"] = true;
+						if (Args.b1.emoji === oEmoji && Args.b2.emoji === oEmoji && Args.b3.emoji === oEmoji) won["<:O_:863314110560993340>"] = true;
 
-						if (Args.c1.emoji == o_emoji && Args.c2.emoji == o_emoji && Args.c3.emoji == o_emoji) won["<:O_:863314110560993340>"] = true;
+						if (Args.c1.emoji === oEmoji && Args.c2.emoji === oEmoji && Args.c3.emoji === oEmoji) won["<:O_:863314110560993340>"] = true;
 
-						if (won["<:O_:863314110560993340>"] != false)
+						if (won["<:O_:863314110560993340>"] !== false) {
-							if (Args.user == 0) {
+							if (Args.user === 0) {
 								const won = await client.users.fetch(fighters[1]).catch(console.error);
 								resolve(won);
 
-								if (options.resultBtn === true)
+								if (options.resultBtn === true) {
-									return m
+									return m.edit({
-										.edit({
+										content: interaction.translate("fun/tictactoe:WON", {
-											content: interaction.translate("fun/tictactoe:WON", {
+											winner: fighters[1],
-												winner: fighters[1],
+											emoji: client.emojis.cache.get(oEmoji) || "⭕",
-												emoji: client.emojis.cache.get(o_emoji) || "⭕",
+										}),
-											}),
+										components: buttons,
-											components: buttons,
 
-											embeds: [
+										embeds: [
-												epm.setDescription(
+											epm.setDescription(
-													interaction.translate("fun/tictactoe:WON", {
+												interaction.translate("fun/tictactoe:WON", {
-														winner: fighters[1],
+													winner: fighters[1],
-														emoji: client.emojis.cache.get(o_emoji) || "⭕",
+													emoji: client.emojis.cache.get(oEmoji) || "⭕",
-													}),
+												}),
-												),
+											),
-											],
+										],
-										});
+									});
-								else if (!options.resultBtn || options.resultBtn === false)
+								} else if (!options.resultBtn || options.resultBtn === false) {
-									return m
+									return m.edit({
-										.edit({
+										content: interaction.translate("fun/tictactoe:WON", {
-											content: interaction.translate("fun/tictactoe:WON", {
+											winner: fighters[1],
-												winner: fighters[1],
+											emoji: client.emojis.cache.get(oEmoji) || "⭕",
-												emoji: client.emojis.cache.get(o_emoji) || "⭕",
+										}),
-											}),
 
-											embeds: [
+										embeds: [
-												epm.setDescription(
+											epm.setDescription(
-													`${interaction.translate("fun/tictactoe:WON", {
+												`${interaction.translate("fun/tictactoe:WON", {
-														winner: fighters[1],
+													winner: fighters[1],
-														emoji: client.emojis.cache.get(o_emoji) || "⭕",
+													emoji: client.emojis.cache.get(oEmoji) || "⭕",
-													})}\n\`\`\`\n${Args.a1.emoji.replace(o_emoji, "⭕").replace(x_emoji, "❌")} | ${Args.a2.emoji.replace(o_emoji, "⭕").replace(x_emoji, "❌")} | ${Args.a3.emoji
+												})}\n\`\`\`\n${Args.a1.emoji.replace(oEmoji, "⭕").replace(xEmoji, "❌")} | ${Args.a2.emoji.replace(oEmoji, "⭕").replace(xEmoji, "❌")} | ${Args.a3.emoji
-														.replace(o_emoji, "⭕")
+													.replace(oEmoji, "⭕")
-														.replace(x_emoji, "❌")}\n${Args.b1.emoji.replace(o_emoji, "⭕").replace(x_emoji, "❌")} | ${Args.b2.emoji.replace(o_emoji, "⭕").replace(x_emoji, "❌")} | ${Args.b3.emoji
+													.replace(xEmoji, "❌")}\n${Args.b1.emoji.replace(oEmoji, "⭕").replace(xEmoji, "❌")} | ${Args.b2.emoji.replace(oEmoji, "⭕").replace(xEmoji, "❌")} | ${Args.b3.emoji
-														.replace(o_emoji, "⭕")
+													.replace(oEmoji, "⭕")
-														.replace(x_emoji, "❌")}\n${Args.c1.emoji.replace(o_emoji, "⭕").replace(x_emoji, "❌")} | ${Args.c2.emoji.replace(o_emoji, "⭕").replace(x_emoji, "❌")} | ${Args.c3.emoji
+													.replace(xEmoji, "❌")}\n${Args.c1.emoji.replace(oEmoji, "⭕").replace(xEmoji, "❌")} | ${Args.c2.emoji.replace(oEmoji, "⭕").replace(xEmoji, "❌")} | ${Args.c3.emoji
-														.replace(o_emoji, "⭕")
+													.replace(oEmoji, "⭕")
-														.replace(x_emoji, "❌")}\n\`\`\``.replaceAll(dashmoji, "➖"),
+													.replace(xEmoji, "❌")}\n\`\`\``.replaceAll(dashmoji, "➖"),
-												),
+											),
-											],
+										],
-											components: [],
+										components: [],
-										});
+									});
-							} else if (Args.user == 1) {
+								}
+							} else if (Args.user === 1) {
 								const won = await client.users.fetch(fighters[0]).catch(console.error);
 								resolve(won);
 
-								if (options.resultBtn === true)
+								if (options.resultBtn === true) {
-									return m
+									return m.edit({
-										.edit({
+										content: interaction.translate("fun/tictactoe:WON", {
-											content: interaction.translate("fun/tictactoe:WON", {
+											winner: fighters[0],
-												winner: fighters[0],
+											emoji: client.emojis.cache.get(oEmoji) || "⭕",
-												emoji: client.emojis.cache.get(o_emoji) || "⭕",
+										}),
-											}),
+										components: buttons,
-											components: buttons,
+										embeds: [
-											embeds: [
+											epm.setDescription(
-												epm.setDescription(
+												interaction.translate("fun/tictactoe:WON", {
-													interaction.translate("fun/tictactoe:WON", {
+													winner: fighters[0],
-														winner: fighters[0],
+													emoji: client.emojis.cache.get(oEmoji) || "⭕",
-														emoji: client.emojis.cache.get(o_emoji) || "⭕",
+												}),
-													}),
+											),
-												),
+										],
-											],
+									});
-										});
+								} else if (!options.resultBtn || options.resultBtn === false) {
-								else if (!options.resultBtn || options.resultBtn === false)
+									return m.edit({
-									return m
+										content: interaction.translate("fun/tictactoe:WON", {
-										.edit({
+											winner: fighters[0],
-											content: interaction.translate("fun/tictactoe:WON", {
+											emoji: client.emojis.cache.get(oEmoji) || "⭕",
-												winner: fighters[0],
+										}),
-												emoji: client.emojis.cache.get(o_emoji) || "⭕",
-											}),
 
-											embeds: [
+										embeds: [
-												epm.setDescription(
+											epm.setDescription(
-													`${interaction.translate("fun/tictactoe:WON", {
+												`${interaction.translate("fun/tictactoe:WON", {
-														winner: fighters[0],
+													winner: fighters[0],
-														emoji: client.emojis.cache.get(o_emoji) || "⭕",
+													emoji: client.emojis.cache.get(oEmoji) || "⭕",
-													})}\n\`\`\`\n${Args.a1.emoji.replace(o_emoji, "⭕").replace(x_emoji, "❌")} | ${Args.a2.emoji.replace(o_emoji, "⭕").replace(x_emoji, "❌")} | ${Args.a3.emoji
+												})}\n\`\`\`\n${Args.a1.emoji.replace(oEmoji, "⭕").replace(xEmoji, "❌")} | ${Args.a2.emoji.replace(oEmoji, "⭕").replace(xEmoji, "❌")} | ${Args.a3.emoji
-														.replace(o_emoji, "⭕")
+													.replace(oEmoji, "⭕")
-														.replace(x_emoji, "❌")}\n${Args.b1.emoji.replace(o_emoji, "⭕").replace(x_emoji, "❌")} | ${Args.b2.emoji.replace(o_emoji, "⭕").replace(x_emoji, "❌")} | ${Args.b3.emoji
+													.replace(xEmoji, "❌")}\n${Args.b1.emoji.replace(oEmoji, "⭕").replace(xEmoji, "❌")} | ${Args.b2.emoji.replace(oEmoji, "⭕").replace(xEmoji, "❌")} | ${Args.b3.emoji
-														.replace(o_emoji, "⭕")
+													.replace(oEmoji, "⭕")
-														.replace(x_emoji, "❌")}\n${Args.c1.emoji.replace(o_emoji, "⭕").replace(x_emoji, "❌")} | ${Args.c2.emoji.replace(o_emoji, "⭕").replace(x_emoji, "❌")} | ${Args.c3.emoji
+													.replace(xEmoji, "❌")}\n${Args.c1.emoji.replace(oEmoji, "⭕").replace(xEmoji, "❌")} | ${Args.c2.emoji.replace(oEmoji, "⭕").replace(xEmoji, "❌")} | ${Args.c3.emoji
-														.replace(o_emoji, "⭕")
+													.replace(oEmoji, "⭕")
-														.replace(x_emoji, "❌")}\n\`\`\``.replaceAll(dashmoji, "➖"),
+													.replace(xEmoji, "❌")}\n\`\`\``.replaceAll(dashmoji, "➖"),
-												),
+											),
-											],
+										],
-											components: [],
+										components: [],
-										});
+									});
+								}
 							}
+						}
 
-						if (Args.a1.emoji == x_emoji && Args.b1.emoji == x_emoji && Args.c1.emoji == x_emoji) won["<:X_:863314044781723668>"] = true;
+						if (Args.a1.emoji === xEmoji && Args.b1.emoji === xEmoji && Args.c1.emoji === xEmoji) won["<:X_:863314044781723668>"] = true;
-						if (Args.a2.emoji == x_emoji && Args.b2.emoji == x_emoji && Args.c2.emoji == x_emoji) won["<:X_:863314044781723668>"] = true;
+						if (Args.a2.emoji === xEmoji && Args.b2.emoji === xEmoji && Args.c2.emoji === xEmoji) won["<:X_:863314044781723668>"] = true;
-						if (Args.a3.emoji == x_emoji && Args.b3.emoji == x_emoji && Args.c3.emoji == x_emoji) won["<:X_:863314044781723668>"] = true;
+						if (Args.a3.emoji === xEmoji && Args.b3.emoji === xEmoji && Args.c3.emoji === xEmoji) won["<:X_:863314044781723668>"] = true;
-						if (Args.a1.emoji == x_emoji && Args.b2.emoji == x_emoji && Args.c3.emoji == x_emoji) won["<:X_:863314044781723668>"] = true;
+						if (Args.a1.emoji === xEmoji && Args.b2.emoji === xEmoji && Args.c3.emoji === xEmoji) won["<:X_:863314044781723668>"] = true;
-						if (Args.a3.emoji == x_emoji && Args.b2.emoji == x_emoji && Args.c1.emoji == x_emoji) won["<:X_:863314044781723668>"] = true;
+						if (Args.a3.emoji === xEmoji && Args.b2.emoji === xEmoji && Args.c1.emoji === xEmoji) won["<:X_:863314044781723668>"] = true;
-						if (Args.a1.emoji == x_emoji && Args.a2.emoji == x_emoji && Args.a3.emoji == x_emoji) won["<:X_:863314044781723668>"] = true;
+						if (Args.a1.emoji === xEmoji && Args.a2.emoji === xEmoji && Args.a3.emoji === xEmoji) won["<:X_:863314044781723668>"] = true;
-						if (Args.b1.emoji == x_emoji && Args.b2.emoji == x_emoji && Args.b3.emoji == x_emoji) won["<:X_:863314044781723668>"] = true;
+						if (Args.b1.emoji === xEmoji && Args.b2.emoji === xEmoji && Args.b3.emoji === xEmoji) won["<:X_:863314044781723668>"] = true;
-						if (Args.c1.emoji == x_emoji && Args.c2.emoji == x_emoji && Args.c3.emoji == x_emoji) won["<:X_:863314044781723668>"] = true;
+						if (Args.c1.emoji === xEmoji && Args.c2.emoji === xEmoji && Args.c3.emoji === xEmoji) won["<:X_:863314044781723668>"] = true;
-						if (won["<:X_:863314044781723668>"] != false)
+						if (won["<:X_:863314044781723668>"] !== false) {
-							if (Args.user == 0) {
+							if (Args.user === 0) {
 								const won = await client.users.fetch(fighters[1]).catch(console.error);
 								resolve(won);
 
-								if (options.resultBtn === true)
+								if (options.resultBtn === true) {
-									return m
+									return m.edit({
-										.edit({
+										content: interaction.translate("fun/tictactoe:WON", {
-											content: interaction.translate("fun/tictactoe:WON", {
+											winner: fighters[1],
-												winner: fighters[1],
+											emoji: client.emojis.cache.get(oEmoji) || "⭕",
-												emoji: client.emojis.cache.get(o_emoji) || "⭕",
+										}),
-											}),
+										components: buttons,
-											components: buttons,
+										embeds: [
-											embeds: [
+											epm.setDescription(
-												epm.setDescription(
+												interaction.translate("fun/tictactoe:WON", {
-													interaction.translate("fun/tictactoe:WON", {
+													winner: fighters[1],
-														winner: fighters[1],
+													emoji: client.emojis.cache.get(oEmoji) || "⭕",
-														emoji: client.emojis.cache.get(o_emoji) || "⭕",
+												}),
-													}),
+											),
-												),
+										],
-											],
+									});
-										});
+								} else if (!options.resultBtn || options.resultBtn === false) {
-								else if (!options.resultBtn || options.resultBtn === false)
+									return m.edit({
-									return m
+										content: interaction.translate("fun/tictactoe:WON", {
-										.edit({
+											winner: fighters[1],
-											content: interaction.translate("fun/tictactoe:WON", {
+											emoji: client.emojis.cache.get(oEmoji) || "⭕",
-												winner: fighters[1],
+										}),
-												emoji: client.emojis.cache.get(o_emoji) || "⭕",
+										embeds: [
-											}),
+											epm.setDescription(
-											embeds: [
+												`${interaction.translate("fun/tictactoe:WON", {
-												epm.setDescription(
+													winner: fighters[1],
-													`${interaction.translate("fun/tictactoe:WON", {
+													emoji: client.emojis.cache.get(oEmoji) || "⭕",
-														winner: fighters[1],
+												})}\n\`\`\`\n${Args.a1.emoji.replace(oEmoji, "⭕").replace(xEmoji, "❌")} | ${Args.a2.emoji.replace(oEmoji, "⭕").replace(xEmoji, "❌")} | ${Args.a3.emoji
-														emoji: client.emojis.cache.get(o_emoji) || "⭕",
+													.replace(oEmoji, "⭕")
-													})}\n\`\`\`\n${Args.a1.emoji.replace(o_emoji, "⭕").replace(x_emoji, "❌")} | ${Args.a2.emoji.replace(o_emoji, "⭕").replace(x_emoji, "❌")} | ${Args.a3.emoji
+													.replace(xEmoji, "❌")}\n${Args.b1.emoji.replace(oEmoji, "⭕").replace(xEmoji, "❌")} | ${Args.b2.emoji.replace(oEmoji, "⭕").replace(xEmoji, "❌")} | ${Args.b3.emoji
-														.replace(o_emoji, "⭕")
+													.replace(oEmoji, "⭕")
-														.replace(x_emoji, "❌")}\n${Args.b1.emoji.replace(o_emoji, "⭕").replace(x_emoji, "❌")} | ${Args.b2.emoji.replace(o_emoji, "⭕").replace(x_emoji, "❌")} | ${Args.b3.emoji
+													.replace(xEmoji, "❌")}\n${Args.c1.emoji.replace(oEmoji, "⭕").replace(xEmoji, "❌")} | ${Args.c2.emoji.replace(oEmoji, "⭕").replace(xEmoji, "❌")} | ${Args.c3.emoji
-														.replace(o_emoji, "⭕")
+													.replace(oEmoji, "⭕")
-														.replace(x_emoji, "❌")}\n${Args.c1.emoji.replace(o_emoji, "⭕").replace(x_emoji, "❌")} | ${Args.c2.emoji.replace(o_emoji, "⭕").replace(x_emoji, "❌")} | ${Args.c3.emoji
+													.replace(xEmoji, "❌")}\n\`\`\``.replaceAll(dashmoji, "➖"),
-														.replace(o_emoji, "⭕")
+											),
-														.replace(x_emoji, "❌")}\n\`\`\``.replaceAll(dashmoji, "➖"),
+										],
-												),
+										components: [],
-											],
+									});
-											components: [],
+								}
-										});
+							} else if (Args.user === 1) {
-							} else if (Args.user == 1) {
 								const won = await client.users.fetch(fighters[0]).catch(console.error);
 								resolve(won);
 
-								if (options.resultBtn === true)
+								if (options.resultBtn === true) {
-									return m
+									return m.edit({
-										.edit({
+										content: interaction.translate("fun/tictactoe:WON", {
-											content: interaction.translate("fun/tictactoe:WON", {
+											winner: fighters[0],
-												winner: fighters[0],
+											emoji: client.emojis.cache.get(oEmoji) || "⭕",
-												emoji: client.emojis.cache.get(o_emoji) || "⭕",
+										}),
-											}),
+										components: buttons,
-											components: buttons,
+										embeds: [
-											embeds: [
+											epm.setDescription(
-												epm.setDescription(
+												interaction.translate("fun/tictactoe:WON", {
-													interaction.translate("fun/tictactoe:WON", {
+													winner: fighters[0],
-														winner: fighters[0],
+													emoji: client.emojis.cache.get(oEmoji) || "⭕",
-														emoji: client.emojis.cache.get(o_emoji) || "⭕",
+												}),
-													}),
+											),
-												),
+										],
-											],
+									});
-										});
+								} else {
-								else
+									return m.edit({
-									return m
+										content: interaction.translate("fun/tictactoe:WON", {
-										.edit({
+											winner: fighters[0],
-											content: interaction.translate("fun/tictactoe:WON", {
+											emoji: client.emojis.cache.get(oEmoji) || "⭕",
-												winner: fighters[0],
+										}),
-												emoji: client.emojis.cache.get(o_emoji) || "⭕",
+										embeds: [
-											}),
+											epm.setDescription(
-											embeds: [
+												`${interaction.translate("fun/tictactoe:WON", {
-												epm.setDescription(
+													winner: fighters[0],
-													`${interaction.translate("fun/tictactoe:WON", {
+													emoji: client.emojis.cache.get(oEmoji) || "⭕",
-														winner: fighters[0],
+												})}\n\`\`\`\n${Args.a1.emoji.replace(oEmoji, "⭕").replace(xEmoji, "❌")} | ${Args.a2.emoji.replace(oEmoji, "⭕").replace(xEmoji, "❌")} | ${Args.a3.emoji
-														emoji: client.emojis.cache.get(o_emoji) || "⭕",
+													.replace(oEmoji, "⭕")
-													})}\n\`\`\`\n${Args.a1.emoji.replace(o_emoji, "⭕").replace(x_emoji, "❌")} | ${Args.a2.emoji.replace(o_emoji, "⭕").replace(x_emoji, "❌")} | ${Args.a3.emoji
+													.replace(xEmoji, "❌")}\n${Args.b1.emoji.replace(oEmoji, "⭕").replace(xEmoji, "❌")} | ${Args.b2.emoji.replace(oEmoji, "⭕").replace(xEmoji, "❌")} | ${Args.b3.emoji
-														.replace(o_emoji, "⭕")
+													.replace(oEmoji, "⭕")
-														.replace(x_emoji, "❌")}\n${Args.b1.emoji.replace(o_emoji, "⭕").replace(x_emoji, "❌")} | ${Args.b2.emoji.replace(o_emoji, "⭕").replace(x_emoji, "❌")} | ${Args.b3.emoji
+													.replace(xEmoji, "❌")}\n${Args.c1.emoji.replace(oEmoji, "⭕").replace(xEmoji, "❌")} | ${Args.c2.emoji.replace(oEmoji, "⭕").replace(xEmoji, "❌")} | ${Args.c3.emoji
-														.replace(o_emoji, "⭕")
+													.replace(oEmoji, "⭕")
-														.replace(x_emoji, "❌")}\n${Args.c1.emoji.replace(o_emoji, "⭕").replace(x_emoji, "❌")} | ${Args.c2.emoji.replace(o_emoji, "⭕").replace(x_emoji, "❌")} | ${Args.c3.emoji
+													.replace(xEmoji, "❌")}\n\`\`\``.replaceAll(dashmoji, "➖"),
-														.replace(o_emoji, "⭕")
+											),
-														.replace(x_emoji, "❌")}\n\`\`\``.replaceAll(dashmoji, "➖"),
+										],
-												),
+										components: [],
-											],
+									});
-											components: [],
+								}
-										});
 							}
+						}
 
 						m.edit({
 							content: `<@${Args.userid}>`,
@@ -437,7 +442,7 @@ async function tictactoe(interaction, options = {}) {
 								epm.setDescription(
 									interaction.translate("fun/tictactoe:WAITING", {
 										user: Args.userid,
-										emoji: Args.user == 0 ? `${client.emojis.cache.get(o_emoji) || "⭕"}` : `${client.emojis.cache.get(x_emoji) || "❌"}`,
+										emoji: Args.user === 0 ? `${client.emojis.cache.get(oEmoji) || "⭕"}` : `${client.emojis.cache.get(xEmoji) || "❌"}`,
 									}),
 								),
 							],
@@ -458,18 +463,18 @@ async function tictactoe(interaction, options = {}) {
 
 								ttt(m);
 							} else {
-								if (Args.user == 0) {
+								if (Args.user === 0) {
 									Args.user = 1;
 									Args[b.customId] = {
 										style: ButtonStyle.Success,
-										emoji: o_emoji,
+										emoji: oEmoji,
 										disabled: true,
 									};
 								} else {
 									Args.user = 0;
 									Args[b.customId] = {
 										style: ButtonStyle.Danger,
-										emoji: x_emoji,
+										emoji: xEmoji,
 										disabled: true,
 									};
 								}
@@ -487,49 +492,49 @@ async function tictactoe(interaction, options = {}) {
 										.filter(key => predicate(obj[key]))
 										.reduce((res, key) => ((res[key] = obj[key]), res), {});
 								const Brgs = objectFilter(
-									map(Args, (_, fruit) => fruit.emoji == dashmoji),
+									map(Args, (_, fruit) => fruit.emoji === dashmoji),
-									num => num == true,
+									num => num === true,
 								);
 
-								if (Object.keys(Brgs).length == 0) {
+								if (Object.keys(Brgs).length === 0) {
-									if (Args.a1.emoji == o_emoji && Args.b1.emoji == o_emoji && Args.c1.emoji == o_emoji) won["<:O_:863314110560993340>"] = true;
+									if (Args.a1.emoji === oEmoji && Args.b1.emoji === oEmoji && Args.c1.emoji === oEmoji) won["<:O_:863314110560993340>"] = true;
-									if (Args.a2.emoji == o_emoji && Args.b2.emoji == o_emoji && Args.c2.emoji == o_emoji) won["<:O_:863314110560993340>"] = true;
+									if (Args.a2.emoji === oEmoji && Args.b2.emoji === oEmoji && Args.c2.emoji === oEmoji) won["<:O_:863314110560993340>"] = true;
-									if (Args.a3.emoji == o_emoji && Args.b3.emoji == o_emoji && Args.c3.emoji == o_emoji) won["<:O_:863314110560993340>"] = true;
+									if (Args.a3.emoji === oEmoji && Args.b3.emoji === oEmoji && Args.c3.emoji === oEmoji) won["<:O_:863314110560993340>"] = true;
-									if (Args.a1.emoji == o_emoji && Args.b2.emoji == o_emoji && Args.c3.emoji == o_emoji) won["<:O_:863314110560993340>"] = true;
+									if (Args.a1.emoji === oEmoji && Args.b2.emoji === oEmoji && Args.c3.emoji === oEmoji) won["<:O_:863314110560993340>"] = true;
-									if (Args.a3.emoji == o_emoji && Args.b2.emoji == o_emoji && Args.c1.emoji == o_emoji) won["<:O_:863314110560993340>"] = true;
+									if (Args.a3.emoji === oEmoji && Args.b2.emoji === oEmoji && Args.c1.emoji === oEmoji) won["<:O_:863314110560993340>"] = true;
-									if (Args.a1.emoji == o_emoji && Args.a2.emoji == o_emoji && Args.a3.emoji == o_emoji) won["<:O_:863314110560993340>"] = true;
+									if (Args.a1.emoji === oEmoji && Args.a2.emoji === oEmoji && Args.a3.emoji === oEmoji) won["<:O_:863314110560993340>"] = true;
-									if (Args.b1.emoji == o_emoji && Args.b2.emoji == o_emoji && Args.b3.emoji == o_emoji) won["<:O_:863314110560993340>"] = true;
+									if (Args.b1.emoji === oEmoji && Args.b2.emoji === oEmoji && Args.b3.emoji === oEmoji) won["<:O_:863314110560993340>"] = true;
-									if (Args.c1.emoji == o_emoji && Args.c2.emoji == o_emoji && Args.c3.emoji == o_emoji) won["<:O_:863314110560993340>"] = true;
+									if (Args.c1.emoji === oEmoji && Args.c2.emoji === oEmoji && Args.c3.emoji === oEmoji) won["<:O_:863314110560993340>"] = true;
 
-									if (won["<:O_:863314110560993340>"] == true) return ttt(m);
+									if (won["<:O_:863314110560993340>"] === true) return ttt(m);
-									else if (won["<:X_:863314044781723668>"] == true) return;
+									else if (won["<:X_:863314044781723668>"] === true) return;
 									else {
 										ttt(m);
 
-										if (options.resultBtn === true)
+										if (options.resultBtn === true) {
-											return m
+											return m.edit({
-												.edit({
+												content: interaction.translate("fun/tictactoe:TIE"),
-													content: interaction.translate("fun/tictactoe:TIE"),
+												embeds: [epm.setDescription(interaction.translate("fun/tictactoe:TIE_DESC"))],
-													embeds: [epm.setDescription(interaction.translate("fun/tictactoe:TIE_DESC"))],
+											});
-												});
+										} else {
-										else
 											return m
 												.edit({
 													content: interaction.translate("fun/tictactoe:TIE"),
 													embeds: [
 														epm.setDescription(
-															`${interaction.translate("fun/tictactoe:TIE_DESC")}!\n\`\`\`\n${Args.a1.emoji.replace(o_emoji, "⭕").replace(x_emoji, "❌")} | ${Args.a2.emoji
+															`${interaction.translate("fun/tictactoe:TIE_DESC")}!\n\`\`\`\n${Args.a1.emoji.replace(oEmoji, "⭕").replace(xEmoji, "❌")} | ${Args.a2.emoji
-																.replace(o_emoji, "⭕")
+																.replace(oEmoji, "⭕")
-																.replace(x_emoji, "❌")} | ${Args.a3.emoji.replace(o_emoji, "⭕").replace(x_emoji, "❌")}\n${Args.b1.emoji.replace(o_emoji, "⭕").replace(x_emoji, "❌")} | ${Args.b2.emoji
+																.replace(xEmoji, "❌")} | ${Args.a3.emoji.replace(oEmoji, "⭕").replace(xEmoji, "❌")}\n${Args.b1.emoji.replace(oEmoji, "⭕").replace(xEmoji, "❌")} | ${Args.b2.emoji
-																.replace(o_emoji, "⭕")
+																.replace(oEmoji, "⭕")
-																.replace(x_emoji, "❌")} | ${Args.b3.emoji.replace(o_emoji, "⭕").replace(x_emoji, "❌")}\n${Args.c1.emoji.replace(o_emoji, "⭕").replace(x_emoji, "❌")} | ${Args.c2.emoji
+																.replace(xEmoji, "❌")} | ${Args.b3.emoji.replace(oEmoji, "⭕").replace(xEmoji, "❌")}\n${Args.c1.emoji.replace(oEmoji, "⭕").replace(xEmoji, "❌")} | ${Args.c2.emoji
-																.replace(o_emoji, "⭕")
+																.replace(oEmoji, "⭕")
-																.replace(x_emoji, "❌")} | ${Args.c3.emoji.replace(o_emoji, "⭕").replace(x_emoji, "❌")}\n\`\`\``.replaceAll(dashmoji, "➖"),
+																.replace(xEmoji, "❌")} | ${Args.c3.emoji.replace(oEmoji, "⭕").replace(xEmoji, "❌")}\n\`\`\``.replaceAll(dashmoji, "➖"),
 														),
 													],
 													components: [],
 												})
 												.catch(() => {});
+										}
 									}
 								}
 
@@ -537,20 +542,21 @@ async function tictactoe(interaction, options = {}) {
 							}
 						});
 						collector.on("end", (collected, reason) => {
-							if (collected.size === 0 && reason == "time")
+							if (collected.size === 0 && reason === "time") {
 								m.edit({
 									content: interaction.translate("fun/tictactoe:NO_ANSWER", {
 										user: Args.userid,
 									}),
 									components: [],
 								});
+							}
 						});
 					}
 				}
 			});
 
 			collector.on("end", (_, reason) => {
-				if (reason == "time") {
+				if (reason === "time") {
 					const embed = client.embed({
 						author: {
 							name: user.getUsername(),
@@ -570,7 +576,7 @@ async function tictactoe(interaction, options = {}) {
 						components: [],
 					});
 				}
-				if (reason == "decline") {
+				if (reason === "decline") {
 					const embed = client.embed({
 						author: {
 							name: user.getUsername(),
@@ -594,6 +600,4 @@ async function tictactoe(interaction, options = {}) {
 			console.log("TicTacToe errored:", e);
 		}
 	});
-}
+};
-
-module.exports = tictactoe;

index.js

@@ -1,29 +1,70 @@
-require("./helpers/extenders");
+// import "./helpers/extenders.js";
 
-const { GatewayIntentBits } = require("discord.js"),
+// import { GatewayIntentBits } from "discord.js";
-	Client = require("./base/Client");
+// import JaBaClient from "./base/Client.js";
+// import languages from "./helpers/languages.js";
 
-const client = new Client({
+import { GatewayIntentBits } from "discord.js";
-	intents: [ GatewayIntentBits.Guilds, GatewayIntentBits.GuildMembers, GatewayIntentBits.GuildModeration, GatewayIntentBits.GuildEmojisAndStickers, GatewayIntentBits.GuildIntegrations, GatewayIntentBits.GuildInvites, GatewayIntentBits.GuildVoiceStates, GatewayIntentBits.GuildPresences, GatewayIntentBits.GuildMessages, GatewayIntentBits.GuildMessageReactions, GatewayIntentBits.GuildMessageTyping, GatewayIntentBits.MessageContent, GatewayIntentBits.DirectMessageTyping, GatewayIntentBits.DirectMessages, GatewayIntentBits.DirectMessageReactions ],
+import { ExtendedClient } from "./base/newClient.js";
+
+export const client = new ExtendedClient({
+	intents: [
+		GatewayIntentBits.Guilds,
+		GatewayIntentBits.GuildMembers,
+		GatewayIntentBits.GuildModeration,
+		GatewayIntentBits.GuildEmojisAndStickers,
+		GatewayIntentBits.GuildIntegrations,
+		GatewayIntentBits.GuildInvites,
+		GatewayIntentBits.GuildVoiceStates,
+		GatewayIntentBits.GuildPresences,
+		GatewayIntentBits.GuildMessages,
+		GatewayIntentBits.GuildMessageReactions,
+		GatewayIntentBits.GuildMessageTyping,
+		GatewayIntentBits.MessageContent,
+		GatewayIntentBits.DirectMessageTyping,
+		GatewayIntentBits.DirectMessages,
+		GatewayIntentBits.DirectMessageReactions,
+	],
 	allowedMentions: { parse: ["everyone", "roles", "users"] },
 });
 
-(async () => {
+client.init();
-	console.time("botReady");
 
-	client.translations = await require("./helpers/languages")();
+// const client = new JaBaClient({
+// 	intents: [
+// 		GatewayIntentBits.Guilds,
+// 		GatewayIntentBits.GuildMembers,
+// 		GatewayIntentBits.GuildModeration,
+// 		GatewayIntentBits.GuildEmojisAndStickers,
+// 		GatewayIntentBits.GuildIntegrations,
+// 		GatewayIntentBits.GuildInvites,
+// 		GatewayIntentBits.GuildVoiceStates,
+// 		GatewayIntentBits.GuildPresences,
+// 		GatewayIntentBits.GuildMessages,
+// 		GatewayIntentBits.GuildMessageReactions,
+// 		GatewayIntentBits.GuildMessageTyping,
+// 		GatewayIntentBits.MessageContent,
+// 		GatewayIntentBits.DirectMessageTyping,
+// 		GatewayIntentBits.DirectMessages,
+// 		GatewayIntentBits.DirectMessageReactions,
+// 	],
+// 	allowedMentions: { parse: ["everyone", "roles", "users"] },
+// });
 
-	await client.loadEvents("../events");
+// (async () => {
-	await client.loadCommands("../commands");
+// 	console.time("botReady");
-	await client.init();
-})();
 
-client
+// 	client.translations = await languages();
-	.on("disconnect", () => client.logger.warn("Bot disconnected."))
-	.on("reconnecting", () => client.logger.warn("Bot reconnecting..."))
-	.on("warn", console.log)
-	.on("error", console.log);
 
-process
+// 	await client.loadEvents("../events");
-	.on("unhandledRejection", e => console.log(e))
+// 	await client.loadCommands("../commands");
-	.on("uncaughtException", e => console.log(e));
+// 	await client.init();
+// })();
+
+// client
+// 	.on("disconnect", () => client.logger.warn("Bot disconnected."))
+// 	.on("reconnecting", () => client.logger.warn("Bot reconnecting..."))
+// 	.on("warn", console.log)
+// 	.on("error", console.log);
+
+// process.on("unhandledRejection", e => console.log(e)).on("uncaughtException", e => console.log(e));

languages/en-US/administration/config.json

@@ -23,8 +23,6 @@
 	"AUTO_SANCTIONS": "Automatic Sanctions",
 	"BAN_CONTENT": "Ban: After **{{count}}** warnings",
 	"BAN_NOT_DEFINED": "Ban: Not set",
-	"DASHBOARD_TITLE": "Modify Settings",
-	"DASHBOARD_CONTENT": "Click here to go to the dashboard",
 	"GOODBYE_TITLE": "Farewell",
 	"GOODBYE_CONTENT": "Channel: {{channel}}\nCard: {{withImage}}",
 	"KICK_CONTENT": "Kick: After **{{count}}** warnings",

languages/en-US/dashboard.json

@@ -1,102 +0,0 @@
-{
-	"name": "English",
-	"index": {
-		"feeds": [ "Current User", "Playing music in this much servers", "Users Count", "Servers Count" ],
-		"card": {
-			"category": "JaBa Bot",
-			"title": "Simple bot made by <a href=\"https://github.com/JonnyBro\">Jonny_Bro</a>",
-			"description": "Upper Text",
-			"image": "",
-			"footer": "Bottom Text"
-		},
-		"feedsTitle": "Feeds",
-		"graphTitle": "Graphs"
-	},
-	"manage": {
-		"settings": {
-			"memberCount": "Members",
-			"info": {
-				"info": "Info",
-				"server": "Server Information"
-			}
-		}
-	},
-	"privacyPolicy": {
-		"title": "Privacy Policy",
-		"description": "Privacy Policy and Terms of Service",
-		"pp": "Complete Privacy Policy"
-	},
-	"partials": {
-		"sidebar": {
-			"dash": "Dashboard",
-			"manage": "Manage Guilds",
-			"commands": "Commands",
-			"pp": "Privacy Policy",
-			"admin": "Admin",
-			"account": "Account Pages",
-			"login": "Sign In",
-			"logout": "Sign Out"
-		},
-		"navbar": {
-			"home": "Home",
-			"pages": {
-				"manage": "Manage Guilds",
-				"settings": "Manage Guilds",
-				"commands": "Commands",
-				"pp": "Privacy Policy",
-				"admin": "Admin Panel",
-				"error": "Error",
-				"credits": "Credits",
-				"debug": "Debug",
-				"leaderboard": "Leaderboard",
-				"profile": "Profile",
-				"maintenance": "Under Maintenance"
-			}
-		},
-		"title": {
-			"pages": {
-				"manage": "Manage Guilds",
-				"settings": "Manage Guilds",
-				"commands": "Commands",
-				"pp": "Privacy Policy",
-				"admin": "Admin Panel",
-				"error": "Error",
-				"credits": "Credits",
-				"debug": "Debug",
-				"leaderboard": "Leaderboard",
-				"profile": "Profile",
-				"maintenance": "Under Maintenance"
-			}
-		},
-		"notify": {
-			"errors": {
-				"settingsSave": "Failed to save setttings"
-			},
-			"success": {
-				"settingsSave": "Successfully saved setttings.",
-				"login": "Successfully logged in.",
-				"logout": "Successfully logged out."
-			}
-		},
-		"preloader": {
-			"text": "Page is loading..."
-		},
-		"premium": {
-			"title": "Want more from JaBa?",
-			"description": "Check out premium features below!",
-			"buttonText": "Become Premium"
-		},
-		"settings": {
-			"title": "Site Configuration",
-			"description": "Configurable Viewing Options",
-			"theme": {
-				"title": "Site Theme",
-				"description": "Make the site more appealing for your eyes!"
-			},
-			"language": {
-				"title": "Site Language",
-				"description": "Select your preffered language!"
-			}
-		}
-	}
-}

languages/en-US/misc.json

@@ -15,7 +15,7 @@
 	"OPTION_NAN_ALL": "Please specify an integer greater than 0 or `all`.",
 	"OWNER_ONLY": "Only the bot owner can use this command.",
 	"SELECT_CANCELED": "Selection canceled.",
-	"STATS_FOOTER": "● [Dashboard]({{dashboardLink}})\n● [Support Server]({{supportLink}})\n● [Invite JaBa to Your Server]({{inviteLink}})",
+	"STATS_FOOTER": "● [Support Server]({{supportLink}})\n● [Invite JaBa to Your Server]({{inviteLink}})",
 	"TIMED_OUT": "Time out.",
 	"JUMP_TO_PAGE": "Specify the page you want to jump to (maximum **{{length}}**):",
 	"QUOTE_TITLE": "Message from {{user}}",

languages/language-meta.js

@@ -0,0 +1,23 @@
+export default [
+	{
+		name: "en-US",
+		nativeName: "English",
+		moment: "en",
+		defaultMomentFormat: "HH:mm:ss, MMMM Do YYYY",
+		default: true,
+	},
+	{
+		name: "ru-RU",
+		nativeName: "Русский",
+		moment: "ru",
+		defaultMomentFormat: "HH:mm:ss, Do MMMM YYYY",
+		default: false,
+	},
+	{
+		name: "uk-UA",
+		nativeName: "Українська",
+		moment: "uk",
+		defaultMomentFormat: "HH:mm:ss, Do MMMM YYYY",
+		default: false,
+	},
+];

languages/language-meta.json

@@ -1,23 +0,0 @@
-[
-	{
-		"name": "en-US",
-		"nativeName": "English",
-		"moment": "en",
-		"defaultMomentFormat": "HH:mm:ss, MMMM Do YYYY",
-		"default": true
-	},
-	{
-		"name": "ru-RU",
-		"nativeName": "Русский",
-		"moment": "ru",
-		"defaultMomentFormat": "HH:mm:ss, Do MMMM YYYY",
-		"default": false
-	},
-	{
-		"name": "uk-UA",
-		"nativeName": "Українська",
-		"moment": "uk",
-		"defaultMomentFormat": "HH:mm:ss, Do MMMM YYYY",
-		"default": false
-	}
-]

languages/ru-RU/administration/config.json

@@ -23,8 +23,6 @@
 	"AUTO_SANCTIONS": "Автоматические наказания",
 	"BAN_CONTENT": "Бан: После **{{count}}** предупреждений",
 	"BAN_NOT_DEFINED": "Бан: Не назначено",
-	"DASHBOARD_TITLE": "Изменить настройки",
-	"DASHBOARD_CONTENT": "Нажмите сюда, чтобы перейти в панель управления",
 	"GOODBYE_TITLE": "Прощание",
 	"GOODBYE_CONTENT": "Канал: {{channel}}\nКарточка: {{withImage}}",
 	"KICK_CONTENT": "Кик: После **{{count}}** предупреждений",

languages/ru-RU/dashboard.json

@@ -1,102 +0,0 @@
-{
-	"name": "Русский",
-	"index": {
-		"feeds": [ "Текущий пользователь", "Играю музыку в стольких серверах", "Кол-во пользователей", "Кол-во серверов" ],
-		"card": {
-			"category": "JaBa Bot",
-			"title": "Простой бот, созданный <a href=\"https://github.com/JonnyBro\">Jonny_Bro</a>",
-			"description": "Верхний текст",
-			"image": "",
-			"footer": "Нижний текст"
-		},
-		"feedsTitle": "Новости",
-		"graphTitle": "Графики"
-	},
-	"manage": {
-		"settings": {
-			"memberCount": "Участники",
-			"info": {
-				"info": "Информация",
-				"server": "Информация о сервере"
-			}
-		}
-	},
-	"privacyPolicy": {
-		"title": "Политика конф.",
-		"description": "Политика конфиденциальности и Условия использования",
-		"pp": "Полная политика конфиденциальности"
-	},
-	"partials": {
-		"sidebar": {
-			"dash": "Панель управления",
-			"manage": "Сервера",
-			"commands": "Команды",
-			"pp": "Политика конф.",
-			"admin": "Админ панель",
-			"account": "Аккаунт",
-			"login": "Войти",
-			"logout": "Выйти"
-		},
-		"navbar": {
-			"home": "Главная",
-			"pages": {
-				"manage": "Настройки серверов",
-				"settings": "Настройки",
-				"commands": "Команды",
-				"pp": "Политика конфиденциальности",
-				"admin": "Админ панель",
-				"error": "Ошибка",
-				"credits": "Разработчики панели",
-				"debug": "Отладка",
-				"leaderboard": "Таблица лидеров",
-				"profile": "Профиль",
-				"maintenance": "Техобслуживание"
-			}
-		},
-		"title": {
-			"pages": {
-				"manage": "Настройки серверов",
-				"settings": "Настройки",
-				"commands": "Команды",
-				"pp": "Политика конфиденциальности",
-				"admin": "Админ панель",
-				"error": "Ошибка",
-				"credits": "Разработчики панели",
-				"debug": "Отладка",
-				"leaderboard": "Таблица лидеров",
-				"profile": "Профиль",
-				"maintenance": "Техобслуживание"
-			}
-		},
-		"notify": {
-			"errors": {
-				"settingsSave": "Произошла ошибка при сохранении настроек."
-			},
-			"success": {
-				"settingsSave": "Настройки успешно сохранены.",
-				"login": "Вход успешно выполнен.",
-				"logout": "Выход успешно выполнен."
-			}
-		},
-		"preloader": {
-			"text": "Загрузка..."
-		},
-		"premium": {
-			"title": "Хотите большего JaBa?",
-			"description": "Проверьте Премиум функции!",
-			"buttonText": "Стать Премиум"
-		},
-		"settings": {
-			"title": "Настройки сайта",
-			"description": "Настройте параметры панели управления",
-			"theme": {
-				"title": "Тема",
-				"description": "У нас есть тёмная и светлая!"
-			},
-			"language": {
-				"title": "Язык",
-				"description": "Выберите предпочитаемый язык!"
-			}
-		}
-	}
-}

languages/ru-RU/misc.json

@@ -15,7 +15,7 @@
 	"OPTION_NAN_ALL": "Укажите целое число больше 0 или `all`",
 	"OWNER_ONLY": "Данную команду может использовать только владелец бота",
 	"SELECT_CANCELED": "Выбор отменён",
-	"STATS_FOOTER": "● [Панель управления]({{dashboardLink}})\n● [Сервер поддержки]({{supportLink}})\n● [Пригласить JaBa на свой сервер]({{inviteLink}})",
+	"STATS_FOOTER": "● [Сервер поддержки]({{supportLink}})\n● [Пригласить JaBa на свой сервер]({{inviteLink}})",
 	"TIMED_OUT": "Время вышло",
 	"JUMP_TO_PAGE": "Укажите страницу к которой хотите перейти (максимум **{{length}}**):",
 	"QUOTE_TITLE": "Сообщение от {{user}}",

languages/uk-UA/administration/config.json

@@ -23,8 +23,6 @@
 	"AUTO_SANCTIONS": "Автоматичні покарання",
 	"BAN_CONTENT": "Бан: Після **{{count}}** попереджень",
 	"BAN_NOT_DEFINED": "Бан: Не призначено",
-	"DASHBOARD_TITLE": "Змінити налаштування",
-	"DASHBOARD_CONTENT": "Натисніть сюди, щоб перейти до панелі керування",
 	"GOODBYE_TITLE": "Прощання",
 	"GOODBYE_CONTENT": "Канал: {{channel}}\nКартка: {{withImage}}",
 	"KICK_CONTENT": "Кік: Після **{{count}}** попереджень",

languages/uk-UA/dashboard.json

@@ -1,102 +0,0 @@
-{
-	"name": "Українська",
-	"index": {
-		"feeds": [ "Поточний Користувач", "Играю музыку в стольких серверах", "Кількість користувачів", "Кількість серверів" ],
-		"card": {
-			"category": "JaBa Бот",
-			"title": "Простий бот, створений <a href=\"https://github.com/JonnyBro\">Jonny_Bro</a>",
-			"description": "Верхній Текст",
-			"image": "",
-			"footer": "Нижній Текст"
-		},
-		"feedsTitle": "Канали",
-		"graphTitle": "Графіки"
-	},
-	"manage": {
-		"settings": {
-			"memberCount": "Учасники",
-			"info": {
-				"info": "Інформація",
-				"server": "Інформація про Сервер"
-			}
-		}
-	},
-	"privacyPolicy": {
-		"title": "Політика Конфіденційності",
-		"description": "Політика Конфіденційності та Умови Сервісу",
-		"pp": "Повна Політика Конфіденційності"
-	},
-	"partials": {
-		"sidebar": {
-			"dash": "Панель Керування",
-			"manage": "Налаштування серверів",
-			"commands": "Команди",
-			"pp": "Політика Конфіденційності",
-			"admin": "Адмін",
-			"account": "Сторінки Аккаунта",
-			"login": "Увійти",
-			"logout": "Вийти"
-		},
-		"navbar": {
-			"home": "Головна",
-			"pages": {
-				"manage": "Налаштування серверів",
-				"settings": "Керувати",
-				"commands": "Команди",
-				"pp": "Політика Конфіденційності",
-				"admin": "Панель Адміністратора",
-				"error": "Помилка",
-				"credits": "Автори",
-				"debug": "Налагодження",
-				"leaderboard": "Таблиця Лідерів",
-				"profile": "Профіль",
-				"maintenance": "Технічне Обслуговування"
-			}
-		},
-		"title": {
-			"pages": {
-				"manage": "Керувати Гілдіями",
-				"settings": "Керувати",
-				"commands": "Команди",
-				"pp": "Політика Конфіденційності",
-				"admin": "Панель Адміністратора",
-				"error": "Помилка",
-				"credits": "Автори",
-				"debug": "Налагодження",
-				"leaderboard": "Таблиця Лідерів",
-				"profile": "Профіль",
-				"maintenance": "Технічне Обслуговування"
-			}
-		},
-		"notify": {
-			"errors": {
-				"settingsSave": "Сталася помилка при збереженні налаштувань."
-			},
-			"success": {
-				"settingsSave": "Налаштування успішно збережені.",
-				"login": "Успішний вхід.",
-				"logout": "Успішний вихід."
-			}
-		},
-		"preloader": {
-			"text": "Завантаження..."
-		},
-		"premium": {
-			"title": "Бажаєте більше від JaBa?",
-			"description": "Ознайомтесь з преміум-функціями нижче!",
-			"buttonText": "Стати Преміум"
-		},
-		"settings": {
-			"title": "Налаштування Сайту",
-			"description": "Налаштовувані параметри перегляду",
-			"theme": {
-				"title": "Тема",
-				"description": "Зробіть сайт більш привабливим для своїх очей!"
-			},
-			"language": {
-				"title": "Мова",
-				"description": "Виберіть бажану мову!"
-			}
-		}
-	}
-}

languages/uk-UA/misc.json

@@ -15,7 +15,7 @@
 	"OPTION_NAN_ALL": "Вкажіть ціле число більше 0 або `all`",
 	"OWNER_ONLY": "Цю команду може використовувати тільки власник бота",
 	"SELECT_CANCELED": "Вибір скасовано",
-	"STATS_FOOTER": "● [Панель керування]({{dashboardLink}})\n● [Сервер підтримки]({{supportLink}})\n● [Запросити JaBa на свій сервер]({{inviteLink}})",
+	"STATS_FOOTER": "● [Сервер підтримки]({{supportLink}})\n● [Запросити JaBa на свій сервер]({{inviteLink}})",
 	"TIMED_OUT": "Час вийшов",
 	"JUMP_TO_PAGE": "Вкажіть сторінку, до якої хочете перейти (максимум **{{length}}**):",
 	"QUOTE_TITLE": "Повідомлення від {{user}}",

newCommands/Fun/8ball.js

@@ -0,0 +1,8 @@
+export const data = {
+	name: "8ball",
+	description: "8ball",
+};
+
+export const run = () => {
+	console.log("8ball");
+};

newEvents/ready.js

@@ -0,0 +1,14 @@
+import logger from "../helpers/logger.js";
+
+export const data = {
+	name: "ready",
+	once: true,
+};
+
+/**
+ *
+ * @param {import("../base/Client.JaBaClient")} client
+ */
+export async function run(client) {
+	logger.log(client.user.tag + " is online!");
+}

package.json

@@ -3,6 +3,7 @@
     "version": "4.6.7",
     "description": "My Discord Bot",
     "main": "index.js",
+    "type": "module",
     "scripts": {
         "start": "node ."
     },
@@ -30,93 +31,11 @@
         "node-fetch": "^2.7.0"
     },
     "devDependencies": {
-        "eslint": "^8.57.1"
+        "@eslint/js": "^9.16.0",
-    },
+        "@stylistic/eslint-plugin-js": "^2.11.0",
-    "eslintConfig": {
+        "eslint": "^9.16.0",
-        "extends": "eslint:recommended",
+        "globals": "^15.13.0",
-        "env": {
+        "prettier": "^3.4.2",
-            "commonjs": true,
+        "prettier-eslint": "^16.3.0"
-            "es6": true,
-            "es2020": true,
-            "node": true
-        },
-        "globals": {
-            "Atomics": "readonly",
-            "SharedArrayBuffer": "readonly"
-        },
-        "parserOptions": {
-            "ecmaVersion": 2020
-        },
-        "rules": {
-            "arrow-spacing": [
-                "warn",
-                {
-                    "before": true,
-                    "after": true
-                }
-            ],
-            "comma-dangle": [
-                "error",
-                "always-multiline"
-            ],
-            "comma-spacing": "error",
-            "comma-style": "error",
-            "dot-location": [
-                "error",
-                "property"
-            ],
-            "handle-callback-err": "off",
-            "indent": [
-                "error",
-                "tab",
-                {
-                    "SwitchCase": 1
-                }
-            ],
-            "keyword-spacing": "error",
-            "max-nested-callbacks": [
-                "error",
-                {
-                    "max": 4
-                }
-            ],
-            "max-statements-per-line": [
-                "error",
-                {
-                    "max": 2
-                }
-            ],
-            "no-console": "off",
-            "no-multi-spaces": "error",
-            "no-multiple-empty-lines": [
-                "error",
-                {
-                    "max": 2,
-                    "maxEOF": 1,
-                    "maxBOF": 0
-                }
-            ],
-            "no-trailing-spaces": [
-                "error"
-            ],
-            "no-var": "error",
-            "object-curly-spacing": [
-                "error",
-                "always"
-            ],
-            "prefer-const": "error",
-            "quotes": [
-                "error",
-                "double"
-            ],
-            "semi": [
-                "error",
-                "always"
-            ],
-            "space-in-parens": "error",
-            "space-infix-ops": "error",
-            "space-unary-ops": "error",
-            "yoda": "error"
-        }
     }
 }

utils/get-path.js

@@ -0,0 +1,24 @@
+import fs from "node:fs/promises";
+import path from "node:path";
+
+export const getFilePaths = async (directory, nesting) => {
+	let filePaths = [];
+
+	if (!directory) return;
+
+	const files = await fs.readdir(directory, { withFileTypes: true });
+
+	for (const file of files) {
+		const filePath = path.join(directory, file.name);
+
+		if (file.isFile()) {
+			filePaths.push(filePath);
+		}
+
+		if (nesting && file.isDirectory()) {
+			filePaths = [...filePaths, ...(await getFilePaths(filePath, true))];
+		}
+	}
+
+	return filePaths;
+};

utils/resolve-file.js

@@ -0,0 +1,11 @@
+import path from "node:path";
+
+/**
+ * Convert a local file path to a file URL.
+ * @param {string} filePath - local file's path.
+ * @returns {string} file URL
+ */
+export const toFileURL = filePath => {
+	const resolvedPath = path.resolve(filePath);
+	return "file://" + resolvedPath.replace(/\\\\|\\/g, "/");
+};