simply-xp 1.2.0 → 1.3.0-dev-1

package/src/leaderboard.js

@@ -1,70 +1,69 @@
-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
+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,53 @@
-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
+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/rank.js

@@ -1,4 +1,3 @@
-let Discord = require('discord.js')
 const levels = require('../src/models/level.js')
 const { join } = require('path')
 
@@ -283,11 +282,10 @@ async function rank(message, userID, guildID, options = []) {
       ctx.font = '30px "Sans Serif"'
       ctx.fillText(textXPEdited, 730, 180)
 
-      const attachment = new Discord.MessageAttachment(
-        canvas.toBuffer(),
-        AttachmentName
-      )
-
+      const attachment = {
+        attachment: canvas.toBuffer(),
+        name: AttachmentName
+      }
       return attachment
     } catch (err) {
       console.log(`[XP] Error Occured. | rankCard | Error: ${err.stack}`)

package/src/roleSetup.js

@@ -1,122 +1,121 @@
-let Discord = require('discord.js')
-const lrole = require('../src/models/lvlrole.js')
-
-class roleSetup {
-  /**
-   * @param {Discord.Client} client
-   * @param {string} guildID
-   * @param {import('../index').lvladdOptions} options
-   */
-
-  static async add(client, guildID, options = []) {
-    let rol = await lrole.findOne({
-      gid: guildID,
-      lvlrole: {
-        lvl: options.level,
-        role: options.role
-      }
-    })
-
-    let g = client.guilds.cache.get(guildID)
-
-    let roll = g.roles.cache.find((r) => r.id === options.role)
-
-    if (roll) {
-      if (rol) throw new Error('Level Already Exist. Use delete')
-      else if (!rol) {
-        let newrol = await lrole.findOne({
-          gid: guildID
-        })
-
-        if (!newrol) {
-          newrol = new lrole({
-            gid: guildID,
-            lvlrole: []
-          })
-
-          await newrol.save()
-        }
-
-        newrol.lvlrole.push({ lvl: options.level, role: options.role })
-
-        await newrol
-          .save()
-          .catch((e) =>
-            console.log(`[XP] Failed to add lvlrole to database | ${e}`)
-          )
-
-        return true
-      }
-    } else {
-      throw new Error(
-        'Role ID is invalid. | ' +
-        `Guild ID: ${guildID} | Role ID: ${options.role}`
-      )
-    }
-  }
-
-  /**
-   * @param {Discord.Client} client
-   * @param {string} guildID
-   * @param {import('../index').lvlremoveOptions} options
-   */
-
-  static async remove(client, guildID, options = []) {
-    let rol = await lrole.find({
-      gid: guildID
-    })
-
-    if (!rol || rol.length === 0)
-      throw new Error('Level role with this level does not exist')
-    rol = rol[0].lvlrole.find((item) => item.lvl === options.level) || undefined
-
-    if (rol) {
-      let newrol = await lrole.findOneAndUpdate(
-        {
-          gid: guildID
-        },
-        {
-          $pull: { lvlrole: { lvl: options.level } }
-        }
-      )
-
-      return true
-    } else throw new Error('Level role with this level does not exist')
-  }
-
-  /**
-   * @param {Discord.Client} client
-   * @param {string} guildID
-   */
-
-  static async fetch(client, guildID) {
-    let rol = await lrole.find({
-      gid: guildID
-    })
-
-    if (!rol || rol.length === 0) return
-
-    return rol[0].lvlrole
-  }
-
-  /**
-   * @param {Discord.Client} client
-   * @param {string} guildID
-   * @param {string} level
-   */
-
-  static async find(client, guildID, level) {
-    let rol = await lrole.find({
-      gid: guildID
-    })
-
-    if (!rol || rol.length === 0) return
-    rol = rol[0].lvlrole.find((item) => item.lvl === level) || undefined
-
-    if (rol) {
-      return rol
-    }
-  }
-}
-
-module.exports = roleSetup
+const lrole = require('../src/models/lvlrole.js')
+
+class roleSetup {
+  /**
+   * @param {Discord.Client} client
+   * @param {string} guildID
+   * @param {import('../index').lvladdOptions} options
+   */
+
+  static async add(client, guildID, options = []) {
+    let rol = await lrole.findOne({
+      gid: guildID,
+      lvlrole: {
+        lvl: options.level,
+        role: options.role
+      }
+    })
+
+    let g = client.guilds.cache.get(guildID)
+
+    let roll = g.roles.cache.find((r) => r.id === options.role)
+
+    if (roll) {
+      if (rol) throw new Error('Level Already Exist. Use delete')
+      else if (!rol) {
+        let newrol = await lrole.findOne({
+          gid: guildID
+        })
+
+        if (!newrol) {
+          newrol = new lrole({
+            gid: guildID,
+            lvlrole: []
+          })
+
+          await newrol.save()
+        }
+
+        newrol.lvlrole.push({ lvl: options.level, role: options.role })
+
+        await newrol
+          .save()
+          .catch((e) =>
+            console.log(`[XP] Failed to add lvlrole to database | ${e}`)
+          )
+
+        return true
+      }
+    } else {
+      throw new Error(
+        'Role ID is invalid. | ' +
+          `Guild ID: ${guildID} | Role ID: ${options.role}`
+      )
+    }
+  }
+
+  /**
+   * @param {Discord.Client} client
+   * @param {string} guildID
+   * @param {import('../index').lvlremoveOptions} options
+   */
+
+  static async remove(client, guildID, options = []) {
+    let rol = await lrole.find({
+      gid: guildID
+    })
+
+    if (!rol || rol.length === 0)
+      throw new Error('Level role with this level does not exist')
+    rol = rol[0].lvlrole.find((item) => item.lvl === options.level) || undefined
+
+    if (rol) {
+      let newrol = await lrole.findOneAndUpdate(
+        {
+          gid: guildID
+        },
+        {
+          $pull: { lvlrole: { lvl: options.level } }
+        }
+      )
+
+      return true
+    } else throw new Error('Level role with this level does not exist')
+  }
+
+  /**
+   * @param {Discord.Client} client
+   * @param {string} guildID
+   */
+
+  static async fetch(client, guildID) {
+    let rol = await lrole.find({
+      gid: guildID
+    })
+
+    if (!rol || rol.length === 0) return
+
+    return rol[0].lvlrole
+  }
+
+  /**
+   * @param {Discord.Client} client
+   * @param {string} guildID
+   * @param {string} level
+   */
+
+  static async find(client, guildID, level) {
+    let rol = await lrole.find({
+      gid: guildID
+    })
+
+    if (!rol || rol.length === 0) return
+    rol = rol[0].lvlrole.find((item) => item.lvl === level) || undefined
+
+    if (rol) {
+      return rol
+    }
+  }
+}
+
+module.exports = roleSetup

package/src/setLevel.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 {string} level
- */
-async function setLevel(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 set 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 = setLevel
+const levels = require('../src/models/level.js')
+let { roleSetup } = require('../simplyxp')
+
+/**
+ * @param {Discord.Message} message
+ * @param {string} userID
+ * @param {string} guildID
+ * @param {string} level
+ */
+async function setLevel(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 set 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 = setLevel