simply-xp 1.2.0-test-2 → 1.3.0-dev-2

package/README.md

@@ -1,55 +1,55 @@
-<p align="center"><img align="center" style="margin-bottom:-6px" src="https://i.imgur.com/BiaHJA7.png?maxwidth=128&fidelity=grand"></p>
-
-<h2 style="font-size:2.5rem;" align="center">Simply-XP</h2>
-
-<h2 align="center">A Simple, Easy and Beginner friendly XP System. <br>Uses Discord.js v13<br><br>Developed by Rahuletto#0243 & Maintained by Abadima#6356</h2>
-
-<br>
-<p align="center">
-   <a href="https://www.npmjs.com/package/simply-xp"><img src="https://img.shields.io/npm/v/simply-xp.svg?style=flat-square" /></a>
- <a href="https://www.npmjs.com/package/simply-xp"><img src="https://img.shields.io/npm/dt/simply-xp?style=flat-square" /></a><br>
-   <a href="https://www.npmjs.com/package/simply-xp"><img src="https://nodei.co/npm/simply-xp.png?downloadRank=true&downloads=true&downloadRank=true&stars=true" /></a><br>
-   <a href="https://discord.gg/3JzDV9T5Fn"><img src="https://invidget.switchblade.xyz/3JzDV9T5Fn" /></a>
-</p>
-
-<br>
-
-## 🖥️ <b>How to install ?
-
-```
-npm install simply-xp
-```
-
-(or)
-
-```
-yarn add simply-xp
-```
-
-<br>
-
-# 🎉 What's New 🎉
-
-- We have patched known issues, and we continue to monitor changes!
-- Our rank card has a new font applied
-
-# But Why ?
-
-- Easiest XP System in Discord.js
-- Fastest Support ever
-- Rank Card Maker
-- Beginner Friendly
-- Easier than other XP Systems
-- Inbuilt Auto Roles system
-- Flexible and simple at the same time
-
-<br>
-
-## **Need Help ? Join the [Discord Server](https://discord.gg/3JzDV9T5Fn)**
-
-<br>
-   
- <h1>👥 Contact us | Support</h1>
- <p>
-<a href="https://discord.gg/3JzDV9T5Fn"><img src="https://invidget.switchblade.xyz/3JzDV9T5Fn" /></a>
-</p>
+<p align="center"><img align="center" style="margin-bottom:-6px" src="https://i.imgur.com/BiaHJA7.png?maxwidth=128&fidelity=grand"></p>
+
+<h2 style="font-size:2.5rem;" align="center">Simply-XP</h2>
+
+<h2 align="center">A Simple, Easy and Beginner friendly XP System. <br>Uses Discord.js v13<br><br>Developed by Rahuletto#0243 & Maintained by Abadima#6356</h2>
+
+<br>
+<p align="center">
+   <a href="https://www.npmjs.com/package/simply-xp"><img src="https://img.shields.io/npm/v/simply-xp.svg?style=flat-square" /></a>
+ <a href="https://www.npmjs.com/package/simply-xp"><img src="https://img.shields.io/npm/dt/simply-xp?style=flat-square" /></a><br>
+   <a href="https://www.npmjs.com/package/simply-xp"><img src="https://nodei.co/npm/simply-xp.png?downloadRank=true&downloads=true&downloadRank=true&stars=true" /></a><br>
+   <a href="https://discord.gg/3JzDV9T5Fn"><img src="https://invidget.switchblade.xyz/3JzDV9T5Fn" /></a>
+</p>
+
+<br>
+
+## 🖥️ <b>How to install ?
+
+```
+npm install simply-xp
+```
+
+(or)
+
+```
+yarn add simply-xp
+```
+
+<br>
+
+# 🎉 What's New 🎉
+
+- We have patched known issues, and we continue to monitor changes!
+- Our rank card has a new font applied
+
+# But Why ?
+
+- Easiest XP System in Discord.js
+- Fastest Support ever
+- Rank Card Maker
+- Beginner Friendly
+- Easier than other XP Systems
+- Inbuilt Auto Roles system
+- Flexible and simple at the same time
+
+<br>
+
+## **Need Help ? Join the [Discord Server](https://discord.gg/3JzDV9T5Fn)**
+
+<br>
+   
+ <h1>👥 Contact us | Support</h1>
+ <p>
+<a href="https://discord.gg/3JzDV9T5Fn"><img src="https://invidget.switchblade.xyz/3JzDV9T5Fn" /></a>
+</p>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "simply-xp",
-  "version": "1.2.0-test-2",
+  "version": "1.3.0-dev-2",
   "description": "A Simple, Easy and Beginner Friendly XP System",
   "main": "simplyxp.js",
   "typings": "index.d.ts",
@@ -41,7 +41,7 @@
   },
   "dependencies": {
     "canvas": "^2.9.3",
-    "chart.js-image": "^6.0.3",
+    "chart.js": "^3.8.0",
     "mongoose": "^6.0.15"
   },
   "devDependencies": {
@@ -49,6 +49,6 @@
     "pretty-quick": "^3.1.1"
   },
   "peerDependencies": {
-    "discord.js": "^13.x.x"
+    "discord.js": "*"
   }
 }

package/simplyxp.js

@@ -1,7 +1,7 @@
 try {
   require('discord.js')
 } catch (e) {
-  throw new Error('Discord.js v13 is required for this package to run')
+  console.warn('[XP] Discord.js is recommended for this package.')
 }
 
 module.exports.roleSetup = require('./src/roleSetup')

package/src/addLevel.js

@@ -1,71 +1,70 @@
-let Discord = require('discord.js')
-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.xp += (level * 10) ** 2
-  user.level += Math.floor(0.1 * Math.sqrt(user.xp))
-
-  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((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.xp += (level * 10) ** 2
+  user.level += Math.floor(0.1 * Math.sqrt(user.xp))
+
+  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,112 +1,111 @@
-let Discord = require('discord.js')
-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) {
+    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