simply-xp 1.3.5-beta-6 → 1.3.5

package/src/reset.js

@@ -1,22 +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.')
-
-  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
+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;

package/src/roleSetup.js

@@ -1,121 +1,121 @@
-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) return
-    rol = rol[0].lvlrole.filter((i) => i.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) {
+			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) return;
+		rol = rol[0].lvlrole.filter((i) => i.lvl == level) || undefined;
+
+		if (rol) {
+			return rol;
+		}
+	}
+}
+
+module.exports = roleSetup;

package/src/setLevel.js

@@ -1,70 +1,42 @@
-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");
+const {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 || isNaN(Number(level))) throw new Error("[XP] Invalid level amount.");
+
+	const {client} = message;
+
+	const user = await levels.findOneAndUpdate(
+		{user: userID, guild: guildID},
+		{xp: (level * 10) ** 2, level: Math.floor(0.1 * Math.sqrt((level * 10) ** 2))},
+		{upsert: true, new: true}
+	);
+
+	if (user.level !== 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;

package/src/setXP.js

@@ -1,51 +1,23 @@
-const levels = require('../src/models/level.js')
-
-/**
- * @param {string} userID
- * @param {string} guildID
- * @param {string} xp
- */
-
-async function setXP(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.')
-
-  if (Number(xp).toString() === 'NaN')
-    throw new Error('[XP] XP amount is not a number.')
-
-  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 use to database`))
-
-    return {
-      xp: 0
-    }
-  }
-  user.xp = xp
-  user.level = Math.floor(0.1 * Math.sqrt(user.xp))
-
-  await user
-    .save()
-    .catch((e) =>
-      console.log(`[XP] Failed to set XP | User: ${userID} | Err: ${e}`)
-    )
-
-  return { xp }
-}
-
-module.exports = setXP
+const levels = require("../src/models/level.js");
+
+async function setXP(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 || isNaN(Number(xp))) throw new Error("[XP] Invalid XP amount.");
+
+	const user = await levels.findOneAndUpdate(
+		{user: userID, guild: guildID},
+		{xp: xp},
+		{upsert: true}
+	);
+
+	const lvl = Math.floor(0.1 * Math.sqrt(xp));
+	if (user.level !== lvl) {
+		user.level = lvl;
+		await user.save().catch((e) => console.log(`[XP] Failed to set XP | User: ${userID} | Err: ${e}`));
+	}
+
+	return {xp};
+}
+
+module.exports = setXP;

package/.github/CODE_OF_CONDUCT.md

@@ -1,128 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-We as members, contributors, and leaders pledge to make participation in our
-community a harassment-free experience for everyone, regardless of age, body
-size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, religion, or sexual identity
-and orientation.
-
-We pledge to act and interact in ways that contribute to an open, welcoming,
-diverse, inclusive, and healthy community.
-
-## Our Standards
-
-Examples of behavior that contributes to a positive environment for our
-community include:
-
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes,
-  and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the
-  overall community
-
-Examples of unacceptable behavior include:
-
-* The use of sexualized language or imagery, and sexual attention or
-  advances of any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or email
-  address, without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Enforcement Responsibilities
-
-Community leaders are responsible for clarifying and enforcing our standards of
-acceptable behavior and will take appropriate and fair corrective action in
-response to any behavior that they deem inappropriate, threatening, offensive,
-or harmful.
-
-Community leaders have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions that are
-not aligned to this Code of Conduct, and will communicate reasons for moderation
-decisions when appropriate.
-
-## Scope
-
-This Code of Conduct applies within all community spaces, and also applies when
-an individual is officially representing the community in public spaces.
-Examples of representing our community include using an official e-mail address,
-posting via an official social media account, or acting as an appointed
-representative at an online or offline event.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement at
-Email.
-All complaints will be reviewed and investigated promptly and fairly.
-
-All community leaders are obligated to respect the privacy and security of the
-reporter of any incident.
-
-## Enforcement Guidelines
-
-Community leaders will follow these Community Impact Guidelines in determining
-the consequences for any action they deem in violation of this Code of Conduct:
-
-### 1. Correction
-
-**Community Impact**: Use of inappropriate language or other behavior deemed
-unprofessional or unwelcome in the community.
-
-**Consequence**: A private, written warning from community leaders, providing
-clarity around the nature of the violation and an explanation of why the
-behavior was inappropriate. A public apology may be requested.
-
-### 2. Warning
-
-**Community Impact**: A violation through a single incident or series
-of actions.
-
-**Consequence**: A warning with consequences for continued behavior. No
-interaction with the people involved, including unsolicited interaction with
-those enforcing the Code of Conduct, for a specified period of time. This
-includes avoiding interactions in community spaces as well as external channels
-like social media. Violating these terms may lead to a temporary or
-permanent ban.
-
-### 3. Temporary Ban
-
-**Community Impact**: A serious violation of community standards, including
-sustained inappropriate behavior.
-
-**Consequence**: A temporary ban from any sort of interaction or public
-communication with the community for a specified period of time. No public or
-private interaction with the people involved, including unsolicited interaction
-with those enforcing the Code of Conduct, is allowed during this period.
-Violating these terms may lead to a permanent ban.
-
-### 4. Permanent Ban
-
-**Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior,  harassment of an
-individual, or aggression toward or disparagement of classes of individuals.
-
-**Consequence**: A permanent ban from any sort of public interaction within
-the community.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 2.0, available at
-https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
-
-Community Impact Guidelines were inspired by [Mozilla's code of conduct
-enforcement ladder](https://github.com/mozilla/diversity).
-
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see the FAQ at
-https://www.contributor-covenant.org/faq. Translations are available at
-https://www.contributor-covenant.org/translations.

package/.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,31 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: 'bug'
-assignees: ''
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-
-1. Run the bot
-2. Try the function
-3. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Versions (please complete the following information):**
-
-- Discord.js Version [e.g. v13]
-- simply-xp Version [e.g. v2.0.0]
-
-**Additional context**
-Add any other context about the problem here.

package/.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: 'feature'
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.