simply-xp 1.3.5-beta-6 → 1.3.5-beta-7

package/src/connect.js

@@ -1,22 +1,22 @@
-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.set('strictQuery', true);
-  
-  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.set('strictQuery', true);
+  
+	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(() => 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;

package/src/leaderboard.js

@@ -1,52 +1,52 @@
-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)
-    if (!g) throw new Error('[XP] Guild was not found.')
-
-    let leaderboard = await levels.find({guild: guildID}).sort([['xp', 'descending']])
-
-    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
-    }
-
-    const led2 = leaderboard.map(async (key) => {
-        const user = await g.members.fetch(key.user).catch(() => null)
-        if (!user) return levels.deleteOne({user: key.user, guild: guildID})
-        if (key.xp === 0) return;
-        let pos = leaderboard.indexOf(key) + 1
-
-        if (limit) {
-            if (pos > Number(limit)) return
-        }
-
-        led.push({
-            guildID: key.guild,
-            userID: key.user,
-            xp: key.xp,
-            shortxp: shortener(key.xp),
-            level: key.level,
-            position: pos,
-            username: user.user.username,
-            tag: user.user.tag
-        })
-    })
-    return Promise.all(led2).then(() => 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);
+	if (!g) throw new Error('[XP] Guild was not found.');
+
+	let leaderboard = await levels.find({guild: guildID}).sort([['xp', 'descending']]);
+
+	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;
+	}
+
+	const led2 = leaderboard.map(async (key) => {
+		const user = await g.members.fetch(key.user).catch(() => null);
+		if (!user) return levels.deleteOne({user: key.user, guild: guildID});
+		if (key.xp === 0) return;
+		let pos = leaderboard.indexOf(key) + 1;
+
+		if (limit) {
+			if (pos > Number(limit)) return;
+		}
+
+		led.push({
+			guildID: key.guild,
+			userID: key.user,
+			xp: key.xp,
+			shortxp: shortener(key.xp),
+			level: key.level,
+			position: pos,
+			username: user.user.username,
+			tag: user.user.tag
+		});
+	});
+	return Promise.all(led2).then(() => led);
+}
+
+module.exports = leaderboard;

package/src/lvlRole.js

@@ -1,53 +1,53 @@
-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(() => 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(() => {
+						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);