hypixel-api-reborn 11.1.0 → 11.2.1

package/src/structures/Guild/Guild.js

@@ -1,40 +1,55 @@
+const { getGuildLevel, ranks, calculateExpHistory } = require('../../utils/Guild');
 const GuildMember = require('./GuildMember');
 const GuildRank = require('./GuildRank');
 const Color = require('../Color');
 const Game = require('../Game');
-const { getGuildLevel, parseHistory } = require('../../utils/guildExp');
+
+// eslint-disable-next-line jsdoc/require-jsdoc
+function members(data) {
+  return data.members.length ? data.members.map((m) => new GuildMember(m)) : [];
+}
+
+// eslint-disable-next-line jsdoc/require-jsdoc
+function totalWeeklyGexp(data) {
+  return members(data)
+    .map((m) => m.weeklyExperience)
+    .reduce((acc, cur) => acc + cur);
+}
+
 /**
  * Guild class
  */
 class Guild {
   /**
    * @param {data} data Guild data
-   * @param {string} [me] Player uuid used to search for this guild
+   * @param {string} [me] Player uuid u#sed to search for this guild
    */
   constructor(data, me = '') {
     /**
      * Guild ID
      * @type {string}
      */
+
+    // eslint-disable-next-line no-underscore-dangle
     this.id = data._id;
     /**
      * Guild name
-     * @type {String}
+     * @type {string}
      */
     this.name = data.name;
     /**
      * Guild description
-     * @type {String}
+     * @type {string}
      */
-    this.description = data.description ? data.description : null;
+    this.description = data.description ?? '';
     /**
      * Guild experience
-     * @type {Number}
+     * @type {number}
      */
     this.experience = data.exp || 0;
     /**
      * Guild level
-     * @type {Number}
+     * @type {number}
      */
     this.level = getGuildLevel(this.experience);
     /**
@@ -64,7 +79,9 @@ class Guild {
      * @return {Array<GuildRank>}
      */
     this.getRanksByNewest = function () {
-      return this.ranks.length ? this.ranks.map((r) => new GuildRank(r)).sort((a, b) => b.createdAt - a.createdAt) : null;
+      return this.ranks.length
+        ? this.ranks.map((r) => new GuildRank(r)).sort((a, b) => b.createdAt - a.createdAt)
+        : null;
     };
     /**
      * A map containing all guild members, keyed by their uuids
@@ -86,7 +103,7 @@ class Guild {
     };
     /**
      * Date of guild creation as timestamp
-     * @type {String}
+     * @type {string}
      */
     this.createdAtTimestamp = data.created;
     /**
@@ -98,17 +115,17 @@ class Guild {
      * Whether this guild can be joined using /g join
      * @type {boolean}
      */
-    this.joinable = data.joinable ? data.joinable : false;
+    this.joinable = data.joinable ?? false;
     /**
      * Whether this guild is listed in the Guild Finder
      * @type {boolean}
      */
-    this.publiclyListed = !!data.publiclyListed;
+    this.publiclyListed = Boolean(data.publiclyListed);
     /**
      * Timestamp guild chat will be unmuted at.
      * @type {number|null}
      */
-    this.chatMuteUntilTimestamp = data.chatMute ? data.chatMute : null;
+    this.chatMuteUntilTimestamp = data.chatMute ?? null;
     /**
      * Timestamp guild chat will be unmuted at as Date.
      * @type {Date|null}
@@ -118,12 +135,12 @@ class Guild {
      * Timestamp guild chat will be unmuted at.
      * @type {Array<{ Pattern: string, Color: string }>}
      */
-    this.banner = data.banner ? data.banner : null;
+    this.banner = data.banner ?? null;
     /**
      * Guild tag
      * @type {string}
      */
-    this.tag = data.tag ? data.tag : null;
+    this.tag = data.tag ?? null;
     /**
      * Guild tag color
      * @type {Color}
@@ -145,9 +162,9 @@ class Guild {
      * @type {{winners: number, experienceKings: number, onlinePlayers: number}}
      */
     this.achievements = {
-      winners: data.achievements ? data.achievements.WINNERS : 0,
-      experienceKings: data.achievements ? data.achievements.EXPERIENCE_KINGS : 0,
-      onlinePlayers: data.achievements ? data.achievements.ONLINE_PLAYERS : 0
+      winners: data.achievements.WINNERS ?? 0,
+      experienceKings: data.achievements.EXPERIENCE_KINGS ?? 0,
+      onlinePlayers: data.achievements.ONLINE_PLAYERS ?? 0
     };
     /**
      * Guild preferred games
@@ -167,38 +184,8 @@ class Guild {
    * @type {GuildMember}
    */
   get guildMaster() {
-    return this.members.find((member) => member.rank === 'Guild Master' || member.rank === 'GUILDMASTER');
-  }
-}
-// eslint-disable-next-line require-jsdoc
-function members(data) {
-  return data.members.length ? data.members.map((m) => new GuildMember(m)) : [];
-}
-// eslint-disable-next-line require-jsdoc
-function ranks(data) {
-  return data.ranks && data.ranks.length ? data.ranks.map((r) => new GuildRank(r)).sort((a, b) => a.priority - b.priority) : [];
-}
-// eslint-disable-next-line require-jsdoc
-function totalWeeklyGexp(data) {
-  return members(data)
-    .map((m) => m.weeklyExperience)
-    .reduce((acc, cur) => acc + cur);
-}
-// eslint-disable-next-line require-jsdoc
-function calculateExpHistory(data) {
-  const finalObj = {};
-  for (const day of Object.keys(data.members[0].expHistory)) {
-    let gexp = 0;
-    for (const member of data.members) {
-      gexp += member.expHistory[day] || 0;
-    }
-    finalObj[day] = expLimit(gexp);
+    return this.members.find((member) => 'Guild Master' === member.rank || 'GUILDMASTER' === member.rank);
   }
-  return parseHistory(finalObj);
-}
-// eslint-disable-next-line require-jsdoc
-function expLimit(exp) {
-  return exp > 2e5 ? (exp > 7e5 ? 2.5e5 + Math.round(exp * 0.03) : 2e5 + Math.round((exp - 2e5) / 10)) : exp;
 }
 
 module.exports = Guild;

package/src/structures/Guild/GuildMember.js

@@ -1,4 +1,4 @@
-const { parseHistory } = require('../../utils/guildExp');
+const { parseHistory } = require('../../utils/Guild');
 /**
  * GuildMember class
  */
@@ -9,12 +9,12 @@ class GuildMember {
   constructor(data) {
     /**
      * Guild member UUID
-     * @type {String}
+     * @type {string}
      */
     this.uuid = data.uuid;
     /**
      * Timestamp this member joined at
-     * @type {Number}
+     * @type {number}
      */
     this.joinedAtTimestamp = data.joined;
     /**
@@ -24,25 +24,25 @@ class GuildMember {
     this.joinedAt = new Date(data.joined);
     /**
      * The number of challenges completed that count towards the current quest
-     * @type {Number}
+     * @type {number}
      */
     this.questParticipation = data.questParticipation || 0;
     /**
      * Member's rank
-     * @type {String}
+     * @type {string}
      */
     this.rank = data.rank;
     /**
      * Timestamp this member will be unmuted at ( if muted )
      * @type {Number|null}
      */
-    this.mutedUntilTimestamp = data.mutedTill ? data.mutedTill : null;
+    this.mutedUntilTimestamp = data.mutedTill ?? null;
     /**
      * Timestamp this member will be unmuted at as Date ( if muted )
      * @type {Date|null}
      */
     this.mutedUntil = data.mutedTill ? new Date(data.mutedTill) : null;
-    const xpCheck = data.expHistory && typeof Object.values(data.expHistory)[0] === 'number';
+    const xpCheck = data.expHistory && 'number' === typeof Object.values(data.expHistory)[0];
     /**
      * Experience history per day, resets at 5 am UTC
      * @type {Array<ExpHistory>}
@@ -50,7 +50,7 @@ class GuildMember {
     this.expHistory = parseHistory(data.expHistory);
     /**
      * Experience per week, resets every Monday at 5 am UTC
-     * @type {Number}
+     * @type {number}
      */
     this.weeklyExperience = xpCheck ? Object.values(data.expHistory).reduce((pV, cV) => pV + cV, 0) : null;
   }

package/src/structures/Guild/GuildRank.js

@@ -8,7 +8,7 @@ class GuildRank {
   constructor(data) {
     /**
      * Guild rank name
-     * @type {String}
+     * @type {string}
      */
     this.name = data.name;
     /**
@@ -20,7 +20,7 @@ class GuildRank {
      * Guild rank tag that appears in guild chat. null if none
      * @type {string|null}
      */
-    this.tag = data.tag ? data.tag : null;
+    this.tag = data.tag ?? null;
     /**
      * Timestamp this rank was created at
      * @type {number}