simply-xp 1.3.5-beta-5 → 1.3.5-beta-7

package/.eslintrc.json

@@ -0,0 +1,29 @@
+{
+    "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"
+        ]
+    }
+}

package/.idea/discord.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DiscordProjectSettings">
+    <option name="show" value="ASK" />
+    <option name="description" value="" />
+  </component>
+</project>

package/.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

package/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/simply-xp.iml" filepath="$PROJECT_DIR$/.idea/simply-xp.iml" />
+    </modules>
+  </component>
+</project>

package/.idea/simply-xp.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

package/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

package/index.d.ts

@@ -43,7 +43,7 @@ export declare function fetch(userID: string, guildID: string): Promise<any>
 export declare function leaderboard(
   userID: string,
   guildID: string,
-  limit: number
+  limit?: number
 ): Promise<any>
 
 export declare function lvlRole(

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "simply-xp",
-  "version": "1.3.5-beta-5",
+  "version": "1.3.5-beta-7",
   "description": "A Simple, Easy and Beginner Friendly XP System",
   "main": "simplyxp.js",
   "typings": "index.d.ts",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "beta": "npm publish --tag beta"
+    "beta": "eslint . --fix && npm update && npm publish --tag beta"
   },
   "author": "Rahuletto",
   "keywords": [
@@ -40,11 +40,14 @@
     "url": "https://github.com/Rahuletto/simply-xp"
   },
   "dependencies": {
-    "@napi-rs/canvas": "^0.1.30",
+    "@napi-rs/canvas": "^0.1.41",
     "chart.js": "^3.9.1",
-    "mongoose": "^6.8.1"
+    "mongoose": "^6.11.2"
   },
   "peerDependencies": {
     "discord.js": ">=13.12.0"
+  },
+  "devDependencies": {
+    "eslint": "^8.43.0"
   }
 }

package/simplyxp.js

@@ -1,31 +1,31 @@
-try {
-  require('discord.js')
-} catch (e) {
-  console.warn('[XP] Discord.js is recommended for this package.')
-}
-
-module.exports.roleSetup = require('./src/roleSetup')
-
-module.exports.addLevel = require('./src/addLevel')
-
-module.exports.addXP = require('./src/addXP')
-
-module.exports.charts = require('./src/charts')
-
-module.exports.connect = require('./src/connect')
-
-module.exports.create = require('./src/create')
-
-module.exports.fetch = require('./src/fetch')
-
-module.exports.leaderboard = require('./src/leaderboard')
-
-module.exports.lvlRole = require('./src/lvlRole')
-
-module.exports.rank = require('./src/rank')
-
-module.exports.setLevel = require('./src/setLevel')
-
-module.exports.setXP = require('./src/setXP')
-
-module.exports.reset = require('./src/reset')
+try {
+	require('discord.js');
+} catch (e) {
+	console.warn('[XP] Discord.js is recommended for this package.');
+}
+
+module.exports.roleSetup = require('./src/roleSetup');
+
+module.exports.addLevel = require('./src/addLevel');
+
+module.exports.addXP = require('./src/addXP');
+
+module.exports.charts = require('./src/charts');
+
+module.exports.connect = require('./src/connect');
+
+module.exports.create = require('./src/create');
+
+module.exports.fetch = require('./src/fetch');
+
+module.exports.leaderboard = require('./src/leaderboard');
+
+module.exports.lvlRole = require('./src/lvlRole');
+
+module.exports.rank = require('./src/rank');
+
+module.exports.setLevel = require('./src/setLevel');
+
+module.exports.setXP = require('./src/setXP');
+
+module.exports.reset = require('./src/reset');

package/src/addLevel.js

@@ -1,70 +1,66 @@
-const levels = require('../src/models/level.js')
-let { roleSetup } = require('../simplyxp')
-
-/**
- * @param {Discord.Message} message
- * @param {string} userID
- * @param {string} guildID
- * @param {number} level
- */
-async function addLevel(message, userID, guildID, level) {
-  if (!userID) throw new Error('[XP] User ID was not provided.')
-
-  if (!guildID) throw new Error('[XP] Guild ID was not provided.')
-
-  if (!level) throw new Error('[XP] Level amount is not provided.')
-
-  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((e) => 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.level += parseFloat(level)
-  user.xp = (user.level * 10) ** 2
-
-  await user
-    .save()
-    .catch((e) =>
-      console.log(`[XP] Failed to add Level | User: ${userID} | Err: ${e}`)
-    )
-
-  if (level1 !== level) {
-    let data = {
-      xp: user.xp,
-      level: user.level,
-      userID,
-      guildID
-    }
-
-    let role = await roleSetup.find(client, guildID, level)
-
-    client.emit('levelUp', message, data, role)
-  }
-
-  return {
-    level: user.level,
-    xp: user.xp
-  }
-}
-
-module.exports = addLevel
+const levels = require('../src/models/level.js');
+let {roleSetup} = require('../simplyxp');
+
+/**
+ * @param {Discord.Message} message
+ * @param {string} userID
+ * @param {string} guildID
+ * @param {number} level
+ */
+async function addLevel(message, userID, guildID, level) {
+	if (!userID) throw new Error('[XP] User ID was not provided.');
+
+	if (!guildID) throw new Error('[XP] Guild ID was not provided.');
+
+	if (!level) throw new Error('[XP] Level amount is not provided.');
+
+	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.level += parseFloat(level);
+	user.xp = (user.level * 10) ** 2;
+
+	await user.save().catch((e) =>
+		console.log(`[XP] Failed to add Level | User: ${userID} | Err: ${e}`)
+	);
+
+	if (level1 !== level) {
+		let data = {
+			xp: user.xp,
+			level: user.level,
+			userID,
+			guildID
+		};
+
+		let role = await roleSetup.find(client, guildID, level);
+
+		client.emit('levelUp', message, data, role);
+	}
+
+	return {
+		level: user.level,
+		xp: user.xp
+	};
+}
+
+module.exports = addLevel;

package/src/addXP.js

@@ -1,111 +1,104 @@
-const levels = require('../src/models/level.js')
-let { roleSetup } = require('../simplyxp')
-
-/**
- * @param {Discord.Message} message
- * @param {string} userID
- * @param {string} guildID
- * @param {number} xp
- */
-
-async function addXP(message, 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.')
-
-  let { client } = message
-
-  let min
-  let max
-  if (xp.min) {
-    if (!xp.max)
-      throw new Error(
-        '[XP] XP min amount is provided but max amount is not provided.'
-      )
-
-    min = Number(xp.min)
-
-    if (Number(xp.min).toString() === 'NaN')
-      throw new Error('[XP] XP amount (min) is not a number.')
-  }
-
-  if (xp.max) {
-    if (!xp.min)
-      throw new Error(
-        '[XP] XP max amount is provided but min amount is not provided.'
-      )
-
-    max = Number(xp.max)
-
-    if (Number(xp.max).toString() === 'NaN')
-      throw new Error('[XP] XP amount (max) is not a number.')
-  }
-
-  if (xp.min && xp.max) {
-    let randomNumber = Math.floor(Math.random() * (max - min) + min)
-
-    xp = randomNumber
-  }
-
-  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((e) => console.log(`[XP] Failed to save new user to database`))
-
-    return {
-      level: 0,
-      exp: 0
-    }
-  }
-  let level1 = user.level
-
-  user.xp += parseInt(xp, 10)
-  user.level = Math.floor(0.1 * Math.sqrt(user.xp))
-
-  await user
-    .save()
-    .catch((e) =>
-      console.log(`[XP] Failed to add XP | User: ${userID} | Err: ${e}`)
-    )
-
-  let level = user.level
-
-  xp = user.xp
-
-  if (user.xp === 0 || Math.sign(user.xp) === -1) {
-    xp = 0
-  }
-
-  if (level1 !== level) {
-    let data = {
-      xp,
-      level,
-      userID,
-      guildID
-    }
-
-    let role = await roleSetup.find(client, guildID, level)
-
-    client.emit('levelUp', message, data, role)
-  }
-
-  return {
-    level,
-    xp
-  }
-}
-
-module.exports = addXP
+const levels = require('../src/models/level.js');
+let {roleSetup} = require('../simplyxp');
+
+/**
+ * @param {Discord.Message} message
+ * @param {string} userID
+ * @param {string} guildID
+ * @param {number} xp
+ */
+
+async function addXP(message, 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.');
+
+	let {client} = message;
+
+	let min;
+	let max;
+	if (xp.min) {
+		if (!xp.max)
+			throw new Error(
+				'[XP] XP min amount is provided but max amount is not provided.'
+			);
+
+		min = Number(xp.min);
+
+		if (Number(xp.min).toString() === 'NaN')
+			throw new Error('[XP] XP amount (min) is not a number.');
+	}
+
+	if (xp.max) {
+		if (!xp.min)
+			throw new Error(
+				'[XP] XP max amount is provided but min amount is not provided.'
+			);
+
+		max = Number(xp.max);
+
+		if (Number(xp.max).toString() === 'NaN')
+			throw new Error('[XP] XP amount (max) is not a number.');
+	}
+
+	if (xp.min && xp.max) {
+		xp = Math.floor(Math.random() * (max - min) + min);
+	}
+
+	const user = await levels.findOne({user: userID, guild: guildID});
+
+	let lvl = Math.floor(0.1 * Math.sqrt(xp));
+
+	// TODO: FIX THIS xp = xp & level = lvl
+	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 user to database'));
+
+		return {
+			level: 0,
+			exp: 0
+		};
+	}
+	let level1 = user.level;
+
+	user.xp += parseInt(xp, 10);
+	user.level = Math.floor(0.1 * Math.sqrt(user.xp));
+
+	await user.save().catch((e) => console.log(`[XP] Failed to add XP | User: ${userID} | Err: ${e}`));
+
+	let level = user.level;
+
+	xp = user.xp;
+
+	if (user.xp === 0 || Math.sign(user.xp) === -1) {
+		xp = 0;
+	}
+
+	if (level1 !== level) {
+		let data = {
+			xp,
+			level,
+			userID,
+			guildID
+		};
+
+		let role = await roleSetup.find(client, guildID, level);
+
+		client.emit('levelUp', message, data, role);
+	}
+
+	return {
+		level,
+		xp
+	};
+}
+
+module.exports = addXP;