simply-xp 1.3.0 → 1.3.4

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,12 +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 need to use D.JS for this package, alternatives can work!
-- We have also updated our website guide! We hope you find it useful 😊
 
 # But Why ?
 
@@ -54,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,12 +1,11 @@
 {
   "name": "simply-xp",
-  "version": "1.3.0",
+  "version": "1.3.4",
   "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"
+    "test": "echo \"Error: no test specified\" && exit 1"
   },
   "author": "Rahuletto",
   "keywords": [
@@ -40,13 +39,9 @@
     "url": "https://github.com/Rahuletto/simply-xp"
   },
   "dependencies": {
-    "canvas": "^2.9.3",
-    "chart.js": "^3.8.0",
-    "mongoose": "^6.0.15"
-  },
-  "devDependencies": {
-    "husky": "^7.0.4",
-    "pretty-quick": "^3.1.1"
+    "@napi-rs/canvas": "^0.1.28",
+    "chart.js": "^3.9.1",
+    "mongoose": "^6.2.11"
   },
   "peerDependencies": {
     "discord.js": "*"

package/src/addLevel.js

@@ -39,7 +39,7 @@ async function addLevel(message, userID, guildID, level) {
   }
   let level1 = user.level
 
-  user.level += 1
+  user.level += parseFloat(level)
   user.xp = (user.level * 10) ** 2
 
   await user

package/src/rank.js

@@ -46,11 +46,11 @@ async function rank(message, userID, guildID, options = []) {
 
   async function rankCard(message, options = []) {
     try {
-      const Canvas = require('canvas')
-      const { registerFont } = require('canvas')
-      registerFont(join(__dirname, 'Fonts', 'Baloo-Regular.ttf'), {
-        family: 'Sans Serif'
-      })
+      const Canvas = require('@napi-rs/canvas')
+      Canvas.GlobalFonts.registerFromPath(
+        join(__dirname, 'Fonts', 'Baloo-Regular.ttf'),
+        'Sans Serif'
+      )
 
       function shortener(count) {
         const COUNT_ABBRS = [
@@ -98,12 +98,13 @@ async function rank(message, userID, guildID, options = []) {
       let BackgroundRadius = '20',
         BackGroundImg =
           options.background ||
-          'https://pinebanana.files.wordpress.com/2011/04/rainbow.jpg',
+          'https://i.ibb.co/QQvMqf7/gradient.jpg',
         AttachmentName = 'rank.png',
+        AttachmentDesc = 'Rank Card',
         Username = noSymbols(name),
         AvatarRoundRadius = '50',
         DrawLayerColor = '#000000',
-        DrawLayerOpacity = '0.4',
+        DrawLayerOpacity = 0.4,
         BoxColor = options.color || '#096DD1',
         LevelBarFill = options.lvlbar || '#ffffff',
         LevelBarBackground = options.lvlbarBg || '#ffffff',
@@ -164,46 +165,44 @@ async function rank(message, userID, guildID, options = []) {
         ctx.closePath()
       }
 
-      let avatar = await Canvas.loadImage(
-        member.displayAvatarURL({ dynamic: true, format: 'png' })
-      )
+      let avatar = await Canvas.loadImage(member.displayAvatarURL())
       ctx.save()
-      RoundedBox(ctx, 40 + 30, 30, 180, 180, Number(AvatarRoundRadius))
+      RoundedBox(ctx, 70, 30, 180, 180, Number(AvatarRoundRadius))
       ctx.strokeStyle = BoxColor
-      ctx.lineWidth = '10'
+      ctx.lineWidth = 15
       ctx.stroke()
       ctx.clip()
-      ctx.drawImage(avatar, 40 + 30, 30, 180, 180)
+      ctx.drawImage(avatar, 70, 30, 180, 180)
       ctx.restore()
 
       ctx.save()
-      RoundedBox(ctx, 40 + 30, 30 + 180 + 30 + 50 + 30, 180, 50, 20)
+      RoundedBox(ctx, 70, 240 + 50 + 30, 180, 50, 20)
       ctx.strokeStyle = '#BFC85A22'
       ctx.stroke()
       ctx.clip()
       ctx.fillStyle = BoxColor
-      ctx.globalAlpha = '1'
-      ctx.fillRect(40 + 30, 30 + 180 + 30 + 50 + 30, 180, 50)
+      ctx.globalAlpha = 1
+      ctx.fillRect(70, 320, 180, 50)
       ctx.globalAlpha = 1
       ctx.fillStyle = '#ffffff'
       ctx.font = '32px "Sans Serif"'
       ctx.textAlign = 'center'
-      ctx.fillText(TextEXP, 40 + 30 + 180 / 2, 30 + 180 + 30 + 30 + 50 + 38)
+      ctx.fillText(TextEXP, 160, 358)
       ctx.restore()
 
       ctx.save()
-      RoundedBox(ctx, 40 + 30, 30 + 180 + 30, 180, 50, 20)
+      RoundedBox(ctx, 70, 240, 180, 50, 20)
       ctx.strokeStyle = '#BFC85A22'
       ctx.stroke()
       ctx.clip()
       ctx.fillStyle = BoxColor
-      ctx.globalAlpha = '1'
-      ctx.fillRect(40 + 30, 30 + 180 + 30, 180, 50, 50)
+      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.fillText(LvlText, 40 + 30 + 180 / 2, 30 + 180 + 30 + 38)
+      ctx.fillText(LvlText, 70 + 180 / 2, 278)
       ctx.restore()
 
       ctx.save()
@@ -225,7 +224,7 @@ async function rank(message, userID, guildID, options = []) {
       ctx.shadowOffsetX = 1
       ctx.shadowOffsetY = 1
       ctx.font = '55px "Sans Serif"'
-      ctx.fillText('#' + Rank, canvas.width - 50 - 5, 80)
+      ctx.fillText('#' + Rank, canvas.width - 55, 80)
       ctx.restore()
 
       ctx.save()
@@ -236,8 +235,8 @@ async function rank(message, userID, guildID, options = []) {
       ctx.fillStyle = '#ffffff'
       ctx.font = `${fsiz} "Sans Serif"`
       ctx.textAlign = 'center'
-      ctx.fillText(message.guild.name, 60 + 660, 355)
-      ctx.globalAlpha = '0.2'
+      ctx.fillText(message.guild.name, 720, 355)
+      ctx.globalAlpha = 0.2
       ctx.fillRect(390, 305, 660, 70)
       ctx.restore()
 
@@ -247,7 +246,7 @@ async function rank(message, userID, guildID, options = []) {
       ctx.stroke()
       ctx.clip()
       ctx.fillStyle = LevelBarBackground
-      ctx.globalAlpha = '0.2'
+      ctx.globalAlpha = 0.2
       ctx.fillRect(390, 145, 660, 50, 50)
       ctx.restore()
 
@@ -260,14 +259,14 @@ async function rank(message, userID, guildID, options = []) {
       ctx.stroke()
       ctx.clip()
       ctx.fillStyle = LevelBarFill
-      ctx.globalAlpha = '0.5'
+      ctx.globalAlpha = 0.5
       ctx.fillRect(390, 145, progress, 50, 50)
       ctx.restore()
 
       ctx.save()
       ctx.textAlign = 'left'
       ctx.fillStyle = '#ffffff'
-      ctx.globalAlpha = '0.8'
+      ctx.globalAlpha = 0.8
       ctx.font = '30px "Sans Serif"'
       ctx.fillText('Next Level: ' + shortener(NeededXP) + ' XP', 390, 230)
       ctx.restore()
@@ -284,6 +283,7 @@ async function rank(message, userID, guildID, options = []) {
 
       const attachment = {
         attachment: canvas.toBuffer(),
+        description: AttachmentDesc,
         name: AttachmentName
       }
       return attachment
@@ -293,4 +293,4 @@ async function rank(message, userID, guildID, options = []) {
   }
 }
 
-module.exports = rank
+module.exports = rank

package/src/roleSetup.js

@@ -109,8 +109,8 @@ class roleSetup {
       gid: guildID
     })
 
-    if (!rol || rol.length === 0) return
-    rol = rol[0].lvlrole.find((item) => item.lvl === level) || undefined
+    if (!rol || !rol.length) return
+    rol = rol[0].lvlrole.filter((i) => i.lvl == level) || undefined
 
     if (rol) {
       return rol