simply-xp 1.1.6 → 1.2.0-test-1

package/src/leaderboard.js

@@ -1,70 +1,70 @@
-let Discord = require('discord.js')
-const levels = require('../src/models/level.js')
-
-/**
- * @param {Discord.Client} client
- * @param {string} guildID
- * @param {number} limit
- */
-
-async function leaderboard(client, guildID, limit) {
-  if (!guildID) throw new Error('[XP] Guild ID was not provided.')
-
-  let g = client.guilds.cache.get(guildID)
-
-  let leaderboard = await levels
-    .find({
-      guild: guildID
-    })
-    .sort([['xp', 'descending']])
-    .exec()
-
-  let led = []
-
-  function shortener(count) {
-    const COUNT_ABBRS = ['', 'k', 'M', 'T']
-
-    const i = 0 === count ? count : Math.floor(Math.log(count) / Math.log(1000))
-    let result = parseFloat((count / Math.pow(1000, i)).toFixed(2))
-    result += `${COUNT_ABBRS[i]}`
-    return result
-  }
-
-  leaderboard.map((key) => {
-    let user = g.members.cache.get(key.user)
-    if (key.xp === 0) return
-
-    let pos =
-      leaderboard.findIndex(
-        (i) => i.guild === key.guild && i.user === key.user
-      ) + 1
-
-    if (limit) {
-      if (pos > Number(limit)) return
-    }
-
-    let shortXP = shortener(key.xp)
-
-    if (!user) return
-
-    led.push({
-      guildID: key.guild,
-      userID: key.user,
-      xp: key.xp,
-      shortxp: shortXP,
-      level: key.level,
-      position: pos,
-      username: user.user.username,
-      tag: user.user.tag
-    })
-  })
-
-  led = led.filter(
-    (thing, index, self) =>
-      index === self.findIndex((t) => t.userID === thing.userID)
-  )
-
-  return led
-}
-
-module.exports = leaderboard
+let Discord = require('discord.js')
+const levels = require('../src/models/level.js')
+
+/**
+ * @param {Discord.Client} client
+ * @param {string} guildID
+ * @param {number} limit
+ */
+
+async function leaderboard(client, guildID, limit) {
+  if (!guildID) throw new Error('[XP] Guild ID was not provided.')
+
+  let g = client.guilds.cache.get(guildID)
+
+  let leaderboard = await levels
+    .find({
+      guild: guildID
+    })
+    .sort([['xp', 'descending']])
+    .exec()
+
+  let led = []
+
+  function shortener(count) {
+    const COUNT_ABBRS = ['', 'k', 'M', 'T']
+
+    const i = 0 === count ? count : Math.floor(Math.log(count) / Math.log(1000))
+    let result = parseFloat((count / Math.pow(1000, i)).toFixed(2))
+    result += `${COUNT_ABBRS[i]}`
+    return result
+  }
+
+  leaderboard.map((key) => {
+    let user = g.members.cache.get(key.user)
+    if (key.xp === 0) return
+
+    let pos =
+      leaderboard.findIndex(
+        (i) => i.guild === key.guild && i.user === key.user
+      ) + 1
+
+    if (limit) {
+      if (pos > Number(limit)) return
+    }
+
+    let shortXP = shortener(key.xp)
+
+    if (!user) return
+
+    led.push({
+      guildID: key.guild,
+      userID: key.user,
+      xp: key.xp,
+      shortxp: shortXP,
+      level: key.level,
+      position: pos,
+      username: user.user.username,
+      tag: user.user.tag
+    })
+  })
+
+  led = led.filter(
+    (thing, index, self) =>
+      index === self.findIndex((t) => t.userID === thing.userID)
+  )
+
+  return led
+}
+
+module.exports = leaderboard

package/src/lvlRole.js

@@ -1,54 +1,54 @@
-let Discord = require('discord.js')
-const levels = require('../src/models/level.js')
-const lrole = require('../src/models/lvlrole.js')
-
-/**
- * @param {Discord.Message} message
- * @param {string} userID
- * @param {string} guildID
- */
-
-async function lvlRole(message, userID, guildID) {
-  let e = await lrole.find({
-    gid: guildID
-  })
-
-  if (!e) return
-
-  let user = await levels.findOne({
-    user: userID,
-    guild: guildID
-  })
-  if (!user) {
-    const newuser = new levels({
-      user: userID,
-      guild: guildID
-    })
-
-    await newuser
-      .save()
-      .catch((e) => console.log(`[XP] Failed to save new user to database`))
-  }
-
-  e.forEach((ee) => {
-    ee = ee.lvlrole
-
-    ee.forEach((xd) => {
-      if (user && user.level >= Number(xd.lvl)) {
-        let u = message.guild.members.cache.get(userID)
-
-        let real = message.guild.roles.cache.find((r) => r.id === xd.role)
-        if (!real) return
-        else {
-          u.roles.add(real).catch((err) => {
-            message.channel.send(
-              '[XP] ERROR: Role is higher than me. `MISSING_PERMISSIONS`'
-            )
-          })
-        }
-      }
-    })
-  })
-}
-
-module.exports = lvlRole
+let Discord = require('discord.js')
+const levels = require('../src/models/level.js')
+const lrole = require('../src/models/lvlrole.js')
+
+/**
+ * @param {Discord.Message} message
+ * @param {string} userID
+ * @param {string} guildID
+ */
+
+async function lvlRole(message, userID, guildID) {
+  let e = await lrole.find({
+    gid: guildID
+  })
+
+  if (!e) return
+
+  let user = await levels.findOne({
+    user: userID,
+    guild: guildID
+  })
+  if (!user) {
+    const newuser = new levels({
+      user: userID,
+      guild: guildID
+    })
+
+    await newuser
+      .save()
+      .catch((e) => console.log(`[XP] Failed to save new user to database`))
+  }
+
+  e.forEach((ee) => {
+    ee = ee.lvlrole
+
+    ee.forEach((xd) => {
+      if (user && user.level >= Number(xd.lvl)) {
+        let u = message.guild.members.cache.get(userID)
+
+        let real = message.guild.roles.cache.find((r) => r.id === xd.role)
+        if (!real) return
+        else {
+          u.roles.add(real).catch((err) => {
+            message.channel.send(
+              '[XP] ERROR: Role is higher than me. `MISSING_PERMISSIONS`'
+            )
+          })
+        }
+      }
+    })
+  })
+}
+
+module.exports = lvlRole

package/src/models/level.js

@@ -1,10 +1,10 @@
-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 }
-})
-
-module.exports = mongoose.model('Simply-XP', Levelz)
+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 }
+})
+
+module.exports = mongoose.model('Simply-XP', Levelz)

package/src/models/lvlrole.js

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

package/src/rank.js

@@ -18,7 +18,7 @@ async function rank(message, userID, guildID, options = []) {
     user: userID,
     guild: guildID
   })
-  if (!user) console.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({
@@ -49,15 +49,10 @@ async function rank(message, userID, guildID, options = []) {
     try {
       const Canvas = require('canvas')
       const { registerFont } = require('canvas')
-      registerFont(join(__dirname, 'Fonts', 'Poppins-SemiBold.ttf'), {
-        family: 'Poppins-Regular'
-      })
-      registerFont(join(__dirname, 'Fonts', 'Poppins-SemiBold.ttf'), {
-        family: 'Poppins-Bold'
-      })
+      registerFont(join(__dirname, 'Fonts', 'Baloo-Regular.ttf'), { family: 'Sans Serif' })
 
       function shortener(count) {
-        const COUNT_ABBRS = ['', 'k', 'M', 'T']
+        const COUNT_ABBRS = ['', '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))
@@ -88,7 +83,7 @@ async function rank(message, userID, guildID, options = []) {
       let BackgroundRadius = '20',
         BackGroundImg =
           options.background ||
-          'https://media.discordapp.net/attachments/868506665102762034/876750913866461185/photo-1579546929518-9e396f3cc809.png?width=640&height=427',
+          'https://pinebanana.files.wordpress.com/2011/04/rainbow.jpg',
         AttachmentName = 'rank.png',
         Username = noSymbols(name),
         AvatarRoundRadius = '50',
@@ -98,7 +93,7 @@ async function rank(message, userID, guildID, options = []) {
         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}',
@@ -176,7 +171,7 @@ async function rank(message, userID, guildID, options = []) {
       ctx.fillRect(40 + 30, 30 + 180 + 30 + 50 + 30, 180, 50)
       ctx.globalAlpha = 1
       ctx.fillStyle = '#ffffff'
-      ctx.font = '32px "Poppins-Bold"'
+      ctx.font = '32px "Sans Serif"'
       ctx.textAlign = 'center'
       ctx.fillText(TextEXP, 40 + 30 + 180 / 2, 30 + 180 + 30 + 30 + 50 + 38)
       ctx.restore()
@@ -191,7 +186,7 @@ async function rank(message, userID, guildID, options = []) {
       ctx.fillRect(40 + 30, 30 + 180 + 30, 180, 50, 50)
       ctx.globalAlpha = 1
       ctx.fillStyle = '#ffffff'
-      ctx.font = '32px "Poppins-Bold"'
+      ctx.font = '32px "Sans Serif"'
       ctx.textAlign = 'center'
       ctx.fillText(LvlText, 40 + 30 + 180 / 2, 30 + 180 + 30 + 38)
       ctx.restore()
@@ -203,7 +198,7 @@ async function rank(message, userID, guildID, options = []) {
       ctx.shadowBlur = 15
       ctx.shadowOffsetX = 1
       ctx.shadowOffsetY = 1
-      ctx.font = '39px "Poppins-Bold"'
+      ctx.font = '39px "Sans Serif"'
       ctx.fillText(Username, 390, 80)
       ctx.restore()
 
@@ -214,7 +209,7 @@ async function rank(message, userID, guildID, options = []) {
       ctx.shadowBlur = 15
       ctx.shadowOffsetX = 1
       ctx.shadowOffsetY = 1
-      ctx.font = '55px "Poppins-Bold"'
+      ctx.font = '55px "Sans Serif"'
       ctx.fillText('#' + Rank, canvas.width - 50 - 5, 80)
       ctx.restore()
 
@@ -224,7 +219,7 @@ async function rank(message, userID, guildID, options = []) {
       ctx.stroke()
       ctx.clip()
       ctx.fillStyle = '#ffffff'
-      ctx.font = `${fsiz} "Poppins-Bold"`
+      ctx.font = `${fsiz} "Sans Serif"`
       ctx.textAlign = 'center'
       ctx.fillText(message.guild.name, 60 + 660, 355)
       ctx.globalAlpha = '0.2'
@@ -258,8 +253,8 @@ async function rank(message, userID, guildID, options = []) {
       ctx.textAlign = 'left'
       ctx.fillStyle = '#ffffff'
       ctx.globalAlpha = '0.8'
-      ctx.font = '30px "Poppins-Bold"'
-      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)
@@ -269,7 +264,7 @@ async function rank(message, userID, guildID, options = []) {
       ctx.textAlign = 'center'
       ctx.fillStyle = '#474747'
       ctx.globalAlpha = 1
-      ctx.font = '30px "Poppins-Bold"'
+      ctx.font = '30px "Sans Serif"'
       ctx.fillText(textXPEdited, 730, 180)
 
       const attachment = new Discord.MessageAttachment(

package/src/reset.js

@@ -1,28 +1,22 @@
-const levels = require('../src/models/level.js')
-
-/**
- * @param {string} userID
- * @param {string} guildID
- */
-
-async function reset(userID, guildID) {
-  if (!userID) throw new Error('[XP] User ID was not provided.')
-
-  if (!guildID) throw new Error('[XP] User ID was not provided.')
-
-  let uzer = await levels.findOne({ user: userID, guild: guildID })
-
-  uzer = new levels({
-    user: userID,
-    guild: guildID,
-    xp: 0,
-    lvl: 0
-  })
-  await uzer
-    .save()
-    .catch((e) => console.log(`[XP] Failed to save new use to database`))
-
-  return true
-}
-
-module.exports = reset
+const levels = require('../src/models/level.js')
+
+/**
+ * @param {string} userID
+ * @param {string} guildID
+ */
+
+async function reset(userID, guildID) {
+  if (!userID) 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 })
+    .catch((err) => {
+      throw new Error(err)
+    })
+
+    return { user: userID, guild: guildID, xp: 0, level: 0 }
+}
+
+module.exports = reset