simply-xp 1.2.0-test-2 → 1.3.0-dev-2

package/src/charts.js

@@ -1,83 +1,88 @@
-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 leaderboard = require('./leaderboard')
+
+/**
+ * @param {Discord.Message} message
+ * @param {import('../index').chartsOptions} options
+ */
+
+async function charts(message, options = []) {
+  let { client } = message
+  const ChartJS = require('chart.js')
+  const Canvas = require('canvas')
+
+  let data = []
+  let pos = options?.position || 5
+  let uzern = []
+
+  let ctx = Canvas.createCanvas(950, 526)
+  await leaderboard(client, message.guild.id).then((e) => {
+    e.forEach((m) => {
+      if (m.position <= pos) {
+        data.push(m.xp)
+        uzern.push(m.tag)
+      }
+    })
+  })
+
+  new ChartJS(ctx, {
+    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: {
+      animation: false,
+      plugins: {
+        title: {
+          display: true,
+          text: 'XP Datasheet'
+        }
+      }
+    },
+    plugins: [
+      {
+        id: 'simply-xp',
+        beforeDraw: (chart) => {
+          const ctx = chart.canvas.getContext('2d')
+          ctx.save()
+          ctx.globalCompositeOperation = 'destination-over'
+          ctx.fillStyle = options.background || '#2F3136'
+          ctx.fillRect(0, 0, chart.width, chart.height)
+          ctx.restore()
+        }
+      }
+    ]
+  }).update()
+
+  const attachment = {
+    attachment: ctx.toBuffer(),
+    name: 'chart.png'
+  }
+  return attachment
+}
+
+module.exports = charts

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}`)