simply-xp 1.3.3 → 1.3.5-beta-1

package/README.md

@@ -2,7 +2,7 @@
 
 <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>
+<h2 align="center">A Simple, Easy and Beginner friendly XP System. <br>Supports Discord.JS<br><br>Developed by Rahuletto#0243 & Maintained by Abadima#6356</h2>
 
 <br>
 <p align="center">
@@ -28,13 +28,12 @@ yarn add simply-xp
 
 <br>
 
-# 🎉 What's New 🎉
+# 🎉 Recent Updates 🎉
+
+- Fixed Various Bugs
+- Updated `Chart.js`
+- D.JS v14 Support
 
-- We have patched various issues
-- Switched to the true **Chart.js** package!
-- You no longer require to use D.JS for this package, alternatives can work!
-- We have also updated our website guide! We hope you find it useful 😊
-- Updated Various Packages to work universally with DJS V14 & More!
 
 # But Why ?
 
@@ -55,4 +54,4 @@ yarn add simply-xp
  <h1>👥 Contact us | Support</h1>
  <p>
 <a href="https://discord.gg/3JzDV9T5Fn"><img src="https://invidget.switchblade.xyz/3JzDV9T5Fn" /></a>
-</p>
+</p>

package/package.json

@@ -1,54 +1,49 @@
-{
-  "name": "simply-xp",
-  "version": "1.3.3",
-  "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",
-    "prepare": "husky install"
-  },
-  "author": "Rahuletto",
-  "keywords": [
-    "xp",
-    "simply",
-    "easy",
-    "xp-system",
-    "system",
-    "mongoose",
-    "discord",
-    "discord xp",
-    "discord-xp",
-    "simply-djs",
-    "discord.js",
-    "simplydjs",
-    "weky",
-    "nuggies",
-    "experience",
-    "level role",
-    "amari",
-    "package",
-    "leaderboard",
-    "mee6",
-    "charts",
-    "ChartJS",
-    "level up"
-  ],
-  "license": "Apache-2.0",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/Rahuletto/simply-xp"
-  },
-  "dependencies": {
-    "@napi-rs/canvas": "^0.1.26",
-    "chart.js": "^3.9.1",
-    "mongoose": "^6.2.11"
-  },
-  "devDependencies": {
-    "husky": "^8.0.1",
-    "pretty-quick": "^3.1.3"
-  },
-  "peerDependencies": {
-    "discord.js": "*"
-  }
-}
+{
+  "name": "simply-xp",
+  "version": "1.3.5-beta-1",
+  "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"
+  },
+  "author": "Rahuletto",
+  "keywords": [
+    "xp",
+    "simply",
+    "easy",
+    "xp-system",
+    "system",
+    "mongoose",
+    "discord",
+    "discord xp",
+    "discord-xp",
+    "simply-djs",
+    "discord.js",
+    "simplydjs",
+    "weky",
+    "nuggies",
+    "experience",
+    "level role",
+    "amari",
+    "package",
+    "leaderboard",
+    "mee6",
+    "charts",
+    "ChartJS",
+    "level up"
+  ],
+  "license": "Apache-2.0",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/Rahuletto/simply-xp"
+  },
+  "dependencies": {
+    "@napi-rs/canvas": "^0.1.30",
+    "chart.js": "^3.9.1",
+    "mongoose": "^6.6.5"
+  },
+  "peerDependencies": {
+    "discord.js": ">=13.12.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,70 @@
-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 += 1
-  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((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

package/src/addXP.js

@@ -1,111 +1,111 @@
-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