simply-xp 1.1.5-beta → 1.1.7

package/src/addXP.js

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

package/src/charts.js

@@ -1,83 +1,83 @@
-let Discord = require('discord.js')
-let leaderboard = require('./leaderboard')
-
-/**
- * @param {Discord.Message} message
- * @param {import('../index').chartsOptions} options
- */
-
-async function charts(message, options = []) {
-  let { client } = message
-  const ChartJSImage = require('chart.js-image')
-
-  let data = []
-  let uzern = []
-
-  await leaderboard(client, message.guild.id).then((e) => {
-    e.forEach((m) => {
-      if (m.position <= 5) {
-        data.push(m.xp)
-        uzern.push(m.tag)
-      }
-    })
-  })
-
-  const line_chart = ChartJSImage()
-    .chart({
-      type: options.type || 'bar',
-      data: {
-        labels: uzern,
-        datasets: [
-          {
-            label: 'Leaderboards',
-            data: data,
-            backgroundColor: [
-              'rgba(255, 99, 132, 0.5)',
-              'rgba(255, 159, 64, 0.5)',
-              'rgba(255, 205, 86, 0.5)',
-              'rgba(75, 192, 192, 0.5)',
-              'rgba(54, 162, 235, 0.5)',
-              'rgba(153, 102, 255, 0.5)',
-              'rgb(201, 203, 207, 0.5)'
-            ],
-            borderColor: [
-              'rgb(255, 99, 132)',
-              'rgb(255, 159, 64)',
-              'rgb(255, 205, 86)',
-              'rgb(75, 192, 192)',
-              'rgb(54, 162, 235)',
-              'rgb(153, 102, 255)',
-              'rgb(201, 203, 207)'
-            ],
-            borderWidth: 2
-          }
-        ]
-      },
-      options: {
-        plugins: {
-          legend: {
-            labels: {
-              font: {
-                family: 'Courier New'
-              }
-            }
-          }
-        },
-        title: {
-          display: true,
-          text: 'XP Datasheet'
-        }
-      }
-    })
-    .backgroundColor(options.background || '#2F3136')
-    .width(940) // 500px
-    .height(520) // 300px
-
-  const attachment = new Discord.MessageAttachment(
-    line_chart.toURL(),
-    `chart.png`
-  )
-  return attachment
-}
-
-module.exports = charts
+let Discord = require('discord.js')
+let leaderboard = require('./leaderboard')
+
+/**
+ * @param {Discord.Message} message
+ * @param {import('../index').chartsOptions} options
+ */
+
+async function charts(message, options = []) {
+  let { client } = message
+  const ChartJSImage = require('chart.js-image')
+
+  let data = []
+  let uzern = []
+
+  await leaderboard(client, message.guild.id).then((e) => {
+    e.forEach((m) => {
+      if (m.position <= 5) {
+        data.push(m.xp)
+        uzern.push(m.tag)
+      }
+    })
+  })
+
+  const line_chart = ChartJSImage()
+    .chart({
+      type: options.type || 'bar',
+      data: {
+        labels: uzern,
+        datasets: [
+          {
+            label: 'Leaderboards',
+            data: data,
+            backgroundColor: [
+              'rgba(255, 99, 132, 0.5)',
+              'rgba(255, 159, 64, 0.5)',
+              'rgba(255, 205, 86, 0.5)',
+              'rgba(75, 192, 192, 0.5)',
+              'rgba(54, 162, 235, 0.5)',
+              'rgba(153, 102, 255, 0.5)',
+              'rgb(201, 203, 207, 0.5)'
+            ],
+            borderColor: [
+              'rgb(255, 99, 132)',
+              'rgb(255, 159, 64)',
+              'rgb(255, 205, 86)',
+              'rgb(75, 192, 192)',
+              'rgb(54, 162, 235)',
+              'rgb(153, 102, 255)',
+              'rgb(201, 203, 207)'
+            ],
+            borderWidth: 2
+          }
+        ]
+      },
+      options: {
+        plugins: {
+          legend: {
+            labels: {
+              font: {
+                family: 'Courier New'
+              }
+            }
+          }
+        },
+        title: {
+          display: true,
+          text: 'XP Datasheet'
+        }
+      }
+    })
+    .backgroundColor(options.background || '#2F3136')
+    .width(940) // 500px
+    .height(520) // 300px
+
+  const attachment = new Discord.MessageAttachment(
+    line_chart.toURL(),
+    `chart.png`
+  )
+  return attachment
+}
+
+module.exports = charts

package/src/connect.js

@@ -1,20 +1,20 @@
-const mongoose = require('mongoose')
-
-/**
- * @param {string} db
- * @param {import('../index').connectOptions} options
- */
-
-async function connect(db, options = []) {
-  if (!db) throw new Error('[XP] Database URL was not provided')
-
-  mongoose.connect(db, {
-    useNewUrlParser: true,
-    useUnifiedTopology: true
-  })
-
-  if (options.notify === false) return
-  else return console.log('{ XP } Database Connected')
-}
-
-module.exports = connect
+const mongoose = require('mongoose')
+
+/**
+ * @param {string} db
+ * @param {import('../index').connectOptions} options
+ */
+
+async function connect(db, options = []) {
+  if (!db) throw new Error('[XP] Database URL was not provided')
+
+  mongoose.connect(db, {
+    useNewUrlParser: true,
+    useUnifiedTopology: true
+  })
+
+  if (options.notify === false) return
+  else return console.log('{ XP } Database Connected')
+}
+
+module.exports = connect

package/src/create.js

@@ -1,28 +1,28 @@
-const levels = require('../src/models/level.js')
-
-/**
- * @param {string} userID
- * @param {string} guildID
- */
-
-async function create(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 })
-
-  if (uzer) return
-
-  const newuser = new levels({
-    user: userID,
-    guild: guildID
-  })
-  await newuser
-    .save()
-    .catch((e) => console.log(`[XP] Failed to save new use to database`))
-
-  return true
-}
-
-module.exports = create
+const levels = require('../src/models/level.js')
+
+/**
+ * @param {string} userID
+ * @param {string} guildID
+ */
+
+async function create(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 })
+
+  if (uzer) return
+
+  const newuser = new levels({
+    user: userID,
+    guild: guildID
+  })
+  await newuser
+    .save()
+    .catch((e) => console.log(`[XP] Failed to save new use to database`))
+
+  return true
+}
+
+module.exports = create

package/src/fetch.js

@@ -1,74 +1,74 @@
-const levels = require('../src/models/level.js')
-
-/**
- * @param {string} userID
- * @param {string} guildID
- */
-
-async function fetch(userID, guildID) {
-  if (!userID) throw new Error('[XP] User ID was not provided.')
-
-  if (!guildID) throw new Error('[XP] Guild ID was not provided.')
-
-  let user = await levels.findOne({
-    user: userID,
-    guild: guildID
-  })
-  if (!user) {
-    user = new levels({
-      user: userID,
-      guild: guildID,
-      xp: 0,
-      level: 0
-    })
-
-    await user.save()
-  }
-
-  const leaderboard = await levels
-    .find({
-      guild: guildID
-    })
-    .sort([['xp', 'descending']])
-    .exec()
-
-  if (user === null)
-    return {
-      level: 0,
-      xp: 0,
-      reqxp: 100,
-      rank: leaderboard.findIndex((i) => i.user === userID) + 1,
-      shortxp: 0,
-      shortreq: 100
-    }
-
-  user.position = leaderboard.findIndex((i) => i.user === userID) + 1
-
-  let targetxp = user.level + 1
-
-  let target = targetxp * targetxp * 100
-
-  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
-  }
-
-  let shortXP = shortener(user.xp)
-
-  let shortReqXP = shortener(target)
-
-  return {
-    level: user.level,
-    xp: user.xp,
-    reqxp: target,
-    rank: user.position,
-    shortxp: shortXP,
-    shortreq: shortReqXP
-  }
-}
-
-module.exports = fetch
+const levels = require('../src/models/level.js')
+
+/**
+ * @param {string} userID
+ * @param {string} guildID
+ */
+
+async function fetch(userID, guildID) {
+  if (!userID) throw new Error('[XP] User ID was not provided.')
+
+  if (!guildID) throw new Error('[XP] Guild ID was not provided.')
+
+  let user = await levels.findOne({
+    user: userID,
+    guild: guildID
+  })
+  if (!user) {
+    user = new levels({
+      user: userID,
+      guild: guildID,
+      xp: 0,
+      level: 0
+    })
+
+    await user.save()
+  }
+
+  const leaderboard = await levels
+    .find({
+      guild: guildID
+    })
+    .sort([['xp', 'descending']])
+    .exec()
+
+  if (user === null)
+    return {
+      level: 0,
+      xp: 0,
+      reqxp: 100,
+      rank: leaderboard.findIndex((i) => i.user === userID) + 1,
+      shortxp: 0,
+      shortreq: 100
+    }
+
+  user.position = leaderboard.findIndex((i) => i.user === userID) + 1
+
+  let targetxp = user.level + 1
+
+  let target = targetxp * targetxp * 100
+
+  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
+  }
+
+  let shortXP = shortener(user.xp)
+
+  let shortReqXP = shortener(target)
+
+  return {
+    level: user.level,
+    xp: user.xp,
+    reqxp: target,
+    rank: user.position,
+    shortxp: shortXP,
+    shortreq: shortReqXP
+  }
+}
+
+module.exports = fetch