simply-xp 1.3.5-beta-7 → 1.3.5

package/src/lvlRole.js

@@ -1,5 +1,5 @@
-const levels = require('../src/models/level.js');
-const lrole = require('../src/models/lvlrole.js');
+const levels = require("../src/models/level.js");
+const lrole = require("../src/models/lvlrole.js");
 
 /**
  * @param {Discord.Message} message
@@ -26,7 +26,7 @@ async function lvlRole(message, userID, guildID) {
 
 		await newuser
 			.save()
-			.catch(() => console.log('[XP] Failed to save new user to database'));
+			.catch(() => console.log("[XP] Failed to save new user to database"));
 	}
 
 	e.forEach((ee) => {
@@ -41,7 +41,7 @@ async function lvlRole(message, userID, guildID) {
 				else {
 					u.roles.add(real).catch(() => {
 						message.channel.send(
-							'[XP] ERROR: Role is higher than me. `MISSING_PERMISSIONS`'
+							"[XP] ERROR: Role is higher than me. `MISSING_PERMISSIONS`"
 						);
 					});
 				}

package/src/models/level.js

@@ -1,10 +1,10 @@
-const mongoose = require('mongoose');
+const mongoose = require("mongoose");
 
 const Levelz = new mongoose.Schema({
-	user: { type: String, unique: true },
-	guild: { type: String },
-	xp: { type: Number, default: 0 },
-	level: { type: Number, default: 0 }
+	user: {type: String, unique: true},
+	guild: {type: String},
+	xp: {type: Number, default: 0},
+	level: {type: Number, default: 0}
 });
 
-module.exports = mongoose.model('Simply-XP', Levelz);
+module.exports = mongoose.model("Simply-XP", Levelz);

package/src/models/lvlrole.js

@@ -1,8 +1,8 @@
-const mongoose = require('mongoose');
+const mongoose = require("mongoose");
 
 const rol = new mongoose.Schema({
-	gid: { type: String },
-	lvlrole: { type: Array }
+	gid: {type: String},
+	lvlrole: {type: Array}
 });
 
-module.exports = mongoose.model('Simply-XP-LevelRole', rol);
+module.exports = mongoose.model("Simply-XP-LevelRole", rol);

package/src/rank.js

@@ -1,29 +1,29 @@
-const levels = require('../src/models/level.js');
-const {join} = require('path');
+const levels = require("../src/models/level.js");
+const {join} = require("path");
 
 /**
  * @param {Discord.Message} message
  * @param {string} userID
  * @param {string} guildID
- * @param {import('../index').rankOptions} options
+ * @param {import("../index").rankOptions} options
  */
 
 async function rank(message, userID, guildID, options = []) {
-	if (!userID) throw new Error('[XP] User ID was not provided.');
+	if (!userID) throw new Error("[XP] User ID was not provided.");
 
-	if (!guildID) throw new Error('[XP] Guild ID was not provided.');
+	if (!guildID) throw new Error("[XP] Guild ID was not provided.");
 
 	const user = await levels.findOne({
 		user: userID,
 		guild: guildID
 	});
-	if (!user) throw new Error('[XP] NO_DATA | User has no XP data.');
+	if (!user) throw new Error("[XP] NO_DATA | User has no XP data.");
 
 	const leaderboard = await levels
 		.find({
 			guild: guildID
 		})
-		.sort([['xp', 'descending']])
+		.sort([["xp", "descending"]])
 		.exec();
 
 	user.position = leaderboard.findIndex((i) => i.user === userID) + 1;
@@ -46,49 +46,49 @@ async function rank(message, userID, guildID, options = []) {
 
 	async function rankCard(message, options = []) {
 		try {
-			const Canvas = require('@napi-rs/canvas');
+			const Canvas = require("@napi-rs/canvas");
 			Canvas.GlobalFonts.registerFromPath(
-				join(__dirname, 'Fonts', 'Baloo-Regular.ttf'),
-				'Sans Serif'
+				join(__dirname, "Fonts", "Baloo-Regular.ttf"),
+				"Sans Serif"
 			);
 
 			const member = options.member;
 
 			const canvas = Canvas.createCanvas(1080, 400),
-				ctx = canvas.getContext('2d');
+				ctx = canvas.getContext("2d");
 
 			const name = member.tag;
-			const noSymbols = (string) => string.replace(/[\u007f-\uffff]/g, '');
+			const noSymbols = (string) => string.replace(/[\u007f-\uffff]/g, "");
 
-			let fsiz = '45px';
+			let fsiz = "45px";
 			if (message.guild.name.length >= 23) {
-				fsiz = '38px';
+				fsiz = "38px";
 			}
 			if (message.guild.name.length >= 40) {
-				fsiz = '28px';
+				fsiz = "28px";
 			}
 			if (message.guild.name.length >= 63) {
-				fsiz = '22px';
+				fsiz = "22px";
 			}
 
-			let BackgroundRadius = '20',
+			let BackgroundRadius = "20",
 				BackGroundImg =
-                    options.background ||
-                    'https://i.ibb.co/QQvMqf7/gradient.jpg',
-				AttachmentName = 'rank.png',
-				AttachmentDesc = 'Rank Card',
+					options.background ||
+					"https://i.ibb.co/QQvMqf7/gradient.jpg",
+				AttachmentName = "rank.png",
+				AttachmentDesc = "Rank Card",
 				Username = noSymbols(name),
-				AvatarRoundRadius = '50',
-				DrawLayerColor = '#000000',
+				AvatarRoundRadius = "50",
+				DrawLayerColor = "#000000",
 				DrawLayerOpacity = 0.4,
-				BoxColor = options.color || '#096DD1',
-				LevelBarFill = options.lvlbar || '#ffffff',
-				LevelBarBackground = options.lvlbarBg || '#ffffff',
+				BoxColor = options.color || "#096DD1",
+				LevelBarFill = options.lvlbar || "#ffffff",
+				LevelBarBackground = options.lvlbarBg || "#ffffff",
 				Rank = options.rank,
-				TextEXP = shortener(options.currentXP) + ' XP',
+				TextEXP = shortener(options.currentXP) + " XP",
 				LvlText = `Level ${shortener(options.level)}`,
-				BarRadius = '20',
-				TextXpNeded = '{current}/{needed}',
+				BarRadius = "20",
+				TextXpNeded = "{current}/{needed}",
 				CurrentXP = options.currentXP,
 				NeededXP = options.neededXP;
 
@@ -110,7 +110,7 @@ async function rank(message, userID, guildID, options = []) {
 			ctx.quadraticCurveTo(0, 0, Number(BackgroundRadius), 0);
 			ctx.closePath();
 			ctx.clip();
-			ctx.fillStyle = '#000000';
+			ctx.fillStyle = "#000000";
 			ctx.fillRect(0, 0, 1080, 400);
 			let background = await Canvas.loadImage(BackGroundImg);
 			ctx.globalAlpha = 0.7;
@@ -134,64 +134,64 @@ async function rank(message, userID, guildID, options = []) {
 
 			ctx.save();
 			RoundedBox(ctx, 70, 240 + 50 + 30, 180, 50, 20);
-			ctx.strokeStyle = '#BFC85A22';
+			ctx.strokeStyle = "#BFC85A22";
 			ctx.stroke();
 			ctx.clip();
 			ctx.fillStyle = BoxColor;
 			ctx.globalAlpha = 1;
 			ctx.fillRect(70, 320, 180, 50);
 			ctx.globalAlpha = 1;
-			ctx.fillStyle = '#ffffff';
-			ctx.font = '32px "Sans Serif"';
-			ctx.textAlign = 'center';
+			ctx.fillStyle = "#ffffff";
+			ctx.font = "32px \"Sans Serif\"";
+			ctx.textAlign = "center";
 			ctx.fillText(TextEXP, 160, 358);
 			ctx.restore();
 
 			ctx.save();
 			RoundedBox(ctx, 70, 240, 180, 50, 20);
-			ctx.strokeStyle = '#BFC85A22';
+			ctx.strokeStyle = "#BFC85A22";
 			ctx.stroke();
 			ctx.clip();
 			ctx.fillStyle = BoxColor;
 			ctx.globalAlpha = 1;
 			ctx.fillRect(70, 240, 180, 50, 50);
 			ctx.globalAlpha = 1;
-			ctx.fillStyle = '#ffffff';
-			ctx.font = '32px "Sans Serif"';
-			ctx.textAlign = 'center';
+			ctx.fillStyle = "#ffffff";
+			ctx.font = "32px \"Sans Serif\"";
+			ctx.textAlign = "center";
 			ctx.fillText(LvlText, 70 + 180 / 2, 278);
 			ctx.restore();
 
 			ctx.save();
-			ctx.textAlign = 'left';
-			ctx.fillStyle = '#ffffff';
-			ctx.shadowColor = '#000000';
+			ctx.textAlign = "left";
+			ctx.fillStyle = "#ffffff";
+			ctx.shadowColor = "#000000";
 			ctx.shadowBlur = 15;
 			ctx.shadowOffsetX = 1;
 			ctx.shadowOffsetY = 1;
-			ctx.font = '39px "Sans Serif"';
+			ctx.font = "39px \"Sans Serif\"";
 			ctx.fillText(Username, 390, 80);
 			ctx.restore();
 
 			ctx.save();
-			ctx.textAlign = 'right';
-			ctx.fillStyle = '#ffffff';
-			ctx.shadowColor = '#000000';
+			ctx.textAlign = "right";
+			ctx.fillStyle = "#ffffff";
+			ctx.shadowColor = "#000000";
 			ctx.shadowBlur = 15;
 			ctx.shadowOffsetX = 1;
 			ctx.shadowOffsetY = 1;
-			ctx.font = '55px "Sans Serif"';
-			ctx.fillText('#' + Rank, canvas.width - 55, 80);
+			ctx.font = "55px \"Sans Serif\"";
+			ctx.fillText("#" + Rank, canvas.width - 55, 80);
 			ctx.restore();
 
 			ctx.save();
 			RoundedBox(ctx, 390, 305, 660, 70, Number(20));
-			ctx.strokeStyle = '#BFC85A22';
+			ctx.strokeStyle = "#BFC85A22";
 			ctx.stroke();
 			ctx.clip();
-			ctx.fillStyle = '#ffffff';
+			ctx.fillStyle = "#ffffff";
 			ctx.font = `${fsiz} "Sans Serif"`;
-			ctx.textAlign = 'center';
+			ctx.textAlign = "center";
 			ctx.fillText(message.guild.name, 720, 355);
 			ctx.globalAlpha = 0.2;
 			ctx.fillRect(390, 305, 660, 70);
@@ -199,7 +199,7 @@ async function rank(message, userID, guildID, options = []) {
 
 			ctx.save();
 			RoundedBox(ctx, 390, 145, 660, 50, Number(BarRadius));
-			ctx.strokeStyle = '#BFC85A22';
+			ctx.strokeStyle = "#BFC85A22";
 			ctx.stroke();
 			ctx.clip();
 			ctx.fillStyle = LevelBarBackground;
@@ -212,7 +212,7 @@ async function rank(message, userID, guildID, options = []) {
 
 			ctx.save();
 			RoundedBox(ctx, 390, 145, progress, 50, Number(BarRadius));
-			ctx.strokeStyle = '#BFC85A22';
+			ctx.strokeStyle = "#BFC85A22";
 			ctx.stroke();
 			ctx.clip();
 			ctx.fillStyle = LevelBarFill;
@@ -221,25 +221,25 @@ async function rank(message, userID, guildID, options = []) {
 			ctx.restore();
 
 			ctx.save();
-			ctx.textAlign = 'left';
-			ctx.fillStyle = '#ffffff';
+			ctx.textAlign = "left";
+			ctx.fillStyle = "#ffffff";
 			ctx.globalAlpha = 0.8;
-			ctx.font = '30px "Sans Serif"';
-			ctx.fillText('Next Level: ' + shortener(NeededXP) + ' XP', 390, 230);
+			ctx.font = "30px \"Sans Serif\"";
+			ctx.fillText("Next Level: " + shortener(NeededXP) + " XP", 390, 230);
 			ctx.restore();
 
 			const latestXP = Number(CurrentXP) - Number(NeededXP);
 			const textXPEdited = TextXpNeded.replace(/{needed}/g, shortener(NeededXP).toString())
 				.replace(/{current}/g, shortener(CurrentXP).toString())
 				.replace(/{latest}/g, latestXP.toString());
-			ctx.textAlign = 'center';
-			ctx.fillStyle = '#474747';
+			ctx.textAlign = "center";
+			ctx.fillStyle = "#474747";
 			ctx.globalAlpha = 1;
-			ctx.font = '30px "Sans Serif"';
+			ctx.font = "30px \"Sans Serif\"";
 			ctx.fillText(textXPEdited, 730, 180);
 
 			return {
-				attachment: canvas.toBuffer('image/webp'),
+				attachment: canvas.toBuffer("image/webp"),
 				description: AttachmentDesc,
 				name: AttachmentName
 			};
@@ -270,19 +270,19 @@ function RoundedBox(ctx, x, y, width, height, radius) {
 
 function shortener(count) {
 	const COUNT_ABBRS = [
-		'',
-		'k',
-		'M',
-		'B',
-		'T',
-		'Q',
-		'Q+',
-		'S',
-		'S+',
-		'O',
-		'N',
-		'D',
-		'U'
+		"",
+		"k",
+		"M",
+		"B",
+		"T",
+		"Q",
+		"Q+",
+		"S",
+		"S+",
+		"O",
+		"N",
+		"D",
+		"U"
 	];
 
 	const i = 0 === count ? count : Math.floor(Math.log(count) / Math.log(1000));

package/src/reset.js

@@ -1,4 +1,4 @@
-const levels = require('../src/models/level.js');
+const levels = require("../src/models/level.js");
 
 /**
  * @param {string} userID
@@ -6,17 +6,17 @@ const levels = require('../src/models/level.js');
  */
 
 async function reset(userID, guildID) {
-	if (!userID) throw new Error('[XP] User ID was not provided.');
+	if (!userID) throw new Error("[XP] User ID was not provided.");
 
-	if (!guildID) throw new Error('[XP] User ID was not provided.');
+	if (!guildID) throw new Error("[XP] User ID was not provided.");
 
 	await levels
-		.findOneAndUpdate({ user: userID, guild: guildID }, { xp: 0, level: 0 })
+		.findOneAndUpdate({user: userID, guild: guildID}, {xp: 0, level: 0})
 		.catch((err) => {
 			throw new Error(err);
 		});
 
-	return { user: userID, guild: guildID, xp: 0, level: 0 };
+	return {user: userID, guild: guildID, xp: 0, level: 0};
 }
 
 module.exports = reset;

package/src/roleSetup.js

@@ -1,11 +1,11 @@
-const lrole = require('../src/models/lvlrole.js');
+const lrole = require("../src/models/lvlrole.js");
 
 class roleSetup {
 	/**
-   * @param {Discord.Client} client
-   * @param {string} guildID
-   * @param {import('../index').lvladdOptions} options
-   */
+	 * @param {Discord.Client} client
+	 * @param {string} guildID
+	 * @param {import("../index").lvladdOptions} options
+	 */
 
 	static async add(client, guildID, options = []) {
 		let rol = await lrole.findOne({
@@ -21,7 +21,7 @@ class roleSetup {
 		let roll = g.roles.cache.find((r) => r.id === options.role);
 
 		if (roll) {
-			if (rol) throw new Error('Level Already Exist. Use delete');
+			if (rol) throw new Error("Level Already Exist. Use delete");
 			else if (!rol) {
 				let newrol = await lrole.findOne({
 					gid: guildID
@@ -36,7 +36,7 @@ class roleSetup {
 					await newrol.save();
 				}
 
-				newrol.lvlrole.push({ lvl: options.level, role: options.role });
+				newrol.lvlrole.push({lvl: options.level, role: options.role});
 
 				await newrol
 					.save()
@@ -48,17 +48,17 @@ class roleSetup {
 			}
 		} else {
 			throw new Error(
-				'Role ID is invalid. | ' +
-          `Guild ID: ${guildID} | Role ID: ${options.role}`
+				"Role ID is invalid. | " +
+				`Guild ID: ${guildID} | Role ID: ${options.role}`
 			);
 		}
 	}
 
 	/**
-   * @param {Discord.Client} client
-   * @param {string} guildID
-   * @param {import('../index').lvlremoveOptions} options
-   */
+	 * @param {Discord.Client} client
+	 * @param {string} guildID
+	 * @param {import("../index").lvlremoveOptions} options
+	 */
 
 	static async remove(client, guildID, options = []) {
 		let rol = await lrole.find({
@@ -66,7 +66,7 @@ class roleSetup {
 		});
 
 		if (!rol || rol.length === 0)
-			throw new Error('Level role with this level does not exist');
+			throw new Error("Level role with this level does not exist");
 		rol = rol[0].lvlrole.find((item) => item.lvl === options.level) || undefined;
 
 		if (rol) {
@@ -75,18 +75,18 @@ class roleSetup {
 					gid: guildID
 				},
 				{
-					$pull: { lvlrole: { lvl: options.level } }
+					$pull: {lvlrole: {lvl: options.level}}
 				}
 			);
 
 			return true;
-		} else throw new Error('Level role with this level does not exist');
+		} else throw new Error("Level role with this level does not exist");
 	}
 
 	/**
-   * @param {Discord.Client} client
-   * @param {string} guildID
-   */
+	 * @param {Discord.Client} client
+	 * @param {string} guildID
+	 */
 
 	static async fetch(client, guildID) {
 		let rol = await lrole.find({
@@ -99,10 +99,10 @@ class roleSetup {
 	}
 
 	/**
-   * @param {Discord.Client} client
-   * @param {string} guildID
-   * @param {string} level
-   */
+	 * @param {Discord.Client} client
+	 * @param {string} guildID
+	 * @param {string} level
+	 */
 
 	static async find(client, guildID, level) {
 		let rol = await lrole.find({

package/src/setLevel.js

@@ -1,5 +1,5 @@
-const levels = require('../src/models/level.js');
-let { roleSetup } = require('../simplyxp');
+const levels = require("../src/models/level.js");
+const {roleSetup} = require("../simplyxp");
 
 /**
  * @param {Discord.Message} message
@@ -8,47 +8,19 @@ let { roleSetup } = require('../simplyxp');
  * @param {string} level
  */
 async function setLevel(message, userID, guildID, level) {
-	if (!userID) throw new Error('[XP] User ID was not provided.');
+	if (!userID) throw new Error("[XP] User ID was not provided.");
+	if (!guildID) throw new Error("[XP] Guild ID was not provided.");
+	if (!level || isNaN(Number(level))) throw new Error("[XP] Invalid level amount.");
 
-	if (!guildID) throw new Error('[XP] Guild ID was not provided.');
+	const {client} = message;
 
-	if (!level) throw new Error('[XP] Level amount is not provided.');
+	const user = await levels.findOneAndUpdate(
+		{user: userID, guild: guildID},
+		{xp: (level * 10) ** 2, level: Math.floor(0.1 * Math.sqrt((level * 10) ** 2))},
+		{upsert: true, new: true}
+	);
 
-	let { client } = message;
-
-	const user = await levels.findOne({ user: userID, guild: guildID });
-
-	if (!user) {
-		const newUser = new levels({
-			user: userID,
-			guild: guildID,
-			xp: 0,
-			level: 0
-		});
-
-		await newUser
-			.save()
-			.catch(() => console.log('[XP] Failed to save new user to database'));
-
-		let xp = (level * 10) ** 2;
-
-		return {
-			level: level,
-			exp: xp
-		};
-	}
-	let level1 = user.level;
-
-	user.xp = (level * 10) ** 2;
-	user.level = Math.floor(0.1 * Math.sqrt(user.xp));
-
-	await user
-		.save()
-		.catch((e) =>
-			console.log(`[XP] Failed to set Level | User: ${userID} | Err: ${e}`)
-		);
-
-	if (level1 !== level) {
+	if (user.level !== level) {
 		let data = {
 			xp: user.xp,
 			level: user.level,
@@ -58,7 +30,7 @@ async function setLevel(message, userID, guildID, level) {
 
 		let role = await roleSetup.find(client, guildID, level);
 
-		client.emit('levelUp', message, data, role);
+		client.emit("levelUp", message, data, role);
 	}
 
 	return {
@@ -67,4 +39,4 @@ async function setLevel(message, userID, guildID, level) {
 	};
 }
 
-module.exports = setLevel;
+module.exports = setLevel;

package/src/setXP.js

@@ -1,51 +1,23 @@
-const levels = require('../src/models/level.js');
-
-/**
- * @param {string} userID
- * @param {string} guildID
- * @param {string} xp
- */
+const levels = require("../src/models/level.js");
 
 async function setXP(userID, guildID, xp) {
-	if (!userID) throw new Error('[XP] User ID was not provided.');
-
-	if (!guildID) throw new Error('[XP] Guild ID was not provided.');
-
-	if (!xp) throw new Error('[XP] XP amount is not provided.');
-
-	if (Number(xp).toString() === 'NaN')
-		throw new Error('[XP] XP amount is not a number.');
-
-	const user = await levels.findOne({ user: userID, guild: guildID });
-
-	let lvl = Math.floor(0.1 * Math.sqrt(xp));
-
-	if (!user) {
-		const newUser = new levels({
-			user: userID,
-			guild: guildID,
-			xp: xp,
-			level: lvl
-		});
-
-		await newUser
-			.save()
-			.catch(() => console.log('[XP] Failed to save new use to database'));
-
-		return {
-			xp: 0
-		};
+	if (!userID) throw new Error("[XP] User ID was not provided.");
+	if (!guildID) throw new Error("[XP] Guild ID was not provided.");
+	if (!xp || isNaN(Number(xp))) throw new Error("[XP] Invalid XP amount.");
+
+	const user = await levels.findOneAndUpdate(
+		{user: userID, guild: guildID},
+		{xp: xp},
+		{upsert: true}
+	);
+
+	const lvl = Math.floor(0.1 * Math.sqrt(xp));
+	if (user.level !== lvl) {
+		user.level = lvl;
+		await user.save().catch((e) => console.log(`[XP] Failed to set XP | User: ${userID} | Err: ${e}`));
 	}
-	user.xp = xp;
-	user.level = Math.floor(0.1 * Math.sqrt(user.xp));
-
-	await user
-		.save()
-		.catch((e) =>
-			console.log(`[XP] Failed to set XP | User: ${userID} | Err: ${e}`)
-		);
 
-	return { xp };
+	return {xp};
 }
 
-module.exports = setXP;
+module.exports = setXP;

package/.eslintrc.json

@@ -1,29 +0,0 @@
-{
-    "env": {
-        "commonjs": true,
-        "es2021": true,
-        "node": true
-    },
-    "extends": "eslint:recommended",
-    "parserOptions": {
-        "ecmaVersion": "latest"
-    },
-    "rules": {
-        "indent": [
-            "error",
-            "tab"
-        ],
-        "linebreak-style": [
-            "error",
-            "unix"
-        ],
-        "quotes": [
-            "error",
-            "single"
-        ],
-        "semi": [
-            "error",
-            "always"
-        ]
-    }
-}