@opfr/services 1.3.0 → 1.5.0

package/dist/index.es.js

@@ -1,35 +1,35 @@
-import { Schema as u, models as l, model as p, connect as ct, Types as ot } from "mongoose";
-import { randomBetween as Y, hasExpire as L, sameDay as fe, yesterday as k, capitalizeAllWords as dt, filterNullAndUndefined as N, pickFrom as lt, shuffle as Te, recordToArray as R, arrayToRecord as Ae, mergeObjects as F, exclude as q, groupBy as pt, sortBy as Oe, seededRandom as yt, range as ft } from "@opfr/utils-lang";
-import mt from "node-cache";
-import { CREW_DEFAULT_DISINTEGRATION as Be, CREW_DEFAULT_MEMBER_LIMIT as ht, QuestStatus as T, CREW_DEFAULT_XP_PERCENT as wt, DEFAULT_FACTION as gt, RANK_IDS_WITHOUT_BASIC as Ce, EQUIPMENT_SLOT as _e, EQUIPMENT_FROM_SLOT_TO_TYPE as St, EFFECT_KEYS as bt, CHARACTERISTICS as $t, getComputedCharacteristicValue as Et, getCurrentLevel as It, HP_PER_VITALITY as Ut, DEFAULT_MAX_HP as Dt, transformToDBBuff as Tt, SHOP_DEFAULT_AVAILABLE_ENTITY_AMOUNT as Ot } from "@opfr/definitions";
-import * as me from "events";
-const Q = "___ALL_ENTITIES___";
+import { Schema as u, models as l, model as p, connect as ot, Types as dt } from "mongoose";
+import { randomBetween as X, hasExpire as Q, sameDay as me, yesterday as N, capitalizeAllWords as lt, filterNullAndUndefined as F, pickFrom as pt, shuffle as Te, recordToArray as C, arrayToRecord as Be, mergeObjects as j, exclude as _, groupBy as yt, sortBy as Re, seededRandom as ft, range as mt } from "@opfr/utils-lang";
+import ht from "node-cache";
+import { CREW_DEFAULT_DISINTEGRATION as xe, CREW_DEFAULT_MEMBER_LIMIT as wt, QuestStatus as D, CREW_DEFAULT_XP_PERCENT as gt, DEFAULT_FACTION as St, GAME_TYPES as bt, RANK_IDS_WITHOUT_BASIC as Ce, EQUIPMENT_SLOT as qe, EFFECT_KEYS as $t, CHARACTERISTICS as Et, getComputedCharacteristicValue as Ut, getCurrentLevel as It, HP_PER_VITALITY as Dt, DEFAULT_MAX_HP as Ot, transformToDBBuff as Tt, SHOP_DEFAULT_AVAILABLE_ENTITY_AMOUNT as Rt } from "@opfr/definitions";
+import * as he from "events";
+const W = "___ALL_ENTITIES___";
 class f {
   cache;
   constructor(e) {
-    this.cache = new mt({
+    this.cache = new ht({
       stdTTL: e,
       checkperiod: e * 0.2,
       useClones: !1
     });
   }
-  async get(e) {
-    const t = this.normalizeKey(e), r = this.cache.get(t);
-    if (r)
-      return r;
-    const a = await this.fetchFromDb(e);
-    return a && this.cache.set(t, a), a;
+  async get(e, t) {
+    const r = this.normalizeKey(e), a = this.cache.get(r);
+    if (a)
+      return a;
+    const s = await this.fetchFromDb(e, t ?? {});
+    return s && this.cache.set(r, s), s;
   }
   async update(e, t, r) {
     const a = await this.updateInDb(e, t, r);
     if (a) {
       const s = this.getKey(a);
-      this.cache.del(Q), this.cache.set(this.normalizeKey(s), a);
+      this.cache.del(W), this.cache.set(this.normalizeKey(s), a);
     }
     return a;
   }
   invalidate(e) {
-    this.cache.del(Q), e && this.cache.del(this.normalizeKey(e));
+    this.cache.del(W), e && this.cache.del(this.normalizeKey(e));
   }
   clearAll() {
     this.cache.flushAll();
@@ -37,26 +37,26 @@ class f {
 }
 class b extends f {
   async getAll() {
-    const e = this.cache.get(Q);
+    const e = this.cache.get(W);
     if (e)
       return e;
-    const t = await this.fetchManyFromDb({});
-    return this.cache.set(Q, t), t.forEach((r) => {
+    const t = await this.fetchManyFromDb({}, {});
+    return this.cache.set(W, t), t.forEach((r) => {
       this.cache.set(this.normalizeKey(this.getKey(r)), r);
     }), t;
   }
-  async getMany(e) {
-    const t = await this.fetchManyFromDb(e);
-    return t.forEach((r) => {
-      this.cache.set(this.normalizeKey(this.getKey(r)), r);
-    }), t;
+  async getMany(e, t = {}) {
+    const r = await this.fetchManyFromDb(e, t);
+    return r.forEach((a) => {
+      this.cache.set(this.normalizeKey(this.getKey(a)), a);
+    }), r;
   }
 }
-const xe = new me.EventEmitter(), m = (n, e, t) => {
-  xe.emit(n, e, t);
-}, Ls = (n) => {
+const ke = new he.EventEmitter(), m = (n, e, t) => {
+  ke.emit(n, e, t);
+}, Js = (n) => {
   for (const [e, t] of Object.entries(n))
-    xe.on(e, (r, a) => {
+    ke.on(e, (r, a) => {
       t(r, a);
     });
 }, h = {
@@ -79,36 +79,36 @@ const xe = new me.EventEmitter(), m = (n, e, t) => {
   USER_STATS_FLAGS: "middleware/quest/USER_STATS_FLAGS",
   USER_STATS_FREQUENCY: "middleware/quest/USER_STATS_FREQUENCY",
   USER_STATS_INVENTORY: "middleware/quest/USER_STATS_INVENTORY"
-}, qe = new me.EventEmitter(), he = (n, e, t) => {
-  qe.emit(n, e, t);
-}, Qs = (n) => {
+}, _e = new he.EventEmitter(), we = (n, e, t) => {
+  _e.emit(n, e, t);
+}, Zs = (n) => {
   for (const [e, t] of Object.entries(n))
-    qe.on(e, (r, a) => {
+    _e.on(e, (r, a) => {
       t(r, a);
     });
-}, we = {
+}, ge = {
   USER_INVENTORY: "middleware/raid/USER_INVENTORY",
   USER_QUEST: "middleware/raid/USER_QUEST",
   USER_RAID: "middleware/raid/USER_RAID"
-}, ke = new u(
+}, Ne = new u(
   {
     createdBy: u.Types.ObjectId,
     name: String,
     description: String,
     channelId: String,
-    memberLimit: { type: Number, default: ht },
-    disintegration: { type: Number, default: Be },
+    memberLimit: { type: Number, default: wt },
+    disintegration: { type: Number, default: xe },
     faction: String
   },
   { timestamps: !0, minimize: !1 }
 );
-ke.post("findOneAndUpdate", async function(n) {
+Ne.post("findOneAndUpdate", async function(n) {
   m(h.CREW, n._id, n);
 });
-const W = l?.Crew || p("Crew", ke);
+const G = l?.Crew || p("Crew", Ne);
 class Ct extends f {
   async getCrewRank(e) {
-    return (await W.aggregate([
+    return (await G.aggregate([
       {
         $lookup: {
           from: "crewmetas",
@@ -134,7 +134,7 @@ class Ct extends f {
     ]))[0];
   }
   getCrewRanking() {
-    return W.aggregate([
+    return G.aggregate([
       {
         $lookup: {
           from: "crewmetas",
@@ -179,7 +179,7 @@ class Ct extends f {
         $set: {
           disintegration: {
             $max: [
-              { $add: ["$disintegration", -1 * Y(a, s)] },
+              { $add: ["$disintegration", -1 * X(a, s)] },
               0
             ]
           }
@@ -188,10 +188,10 @@ class Ct extends f {
     ]);
   }
 }
-const Rt = async (n) => {
-  const e = await W.findById(n).lean();
+const vt = async (n) => {
+  const e = await G.findById(n).lean();
   return e || null;
-}, vt = (n, e) => W.findOneAndUpdate({ _id: n }, e, {
+}, At = (n, e) => G.findOneAndUpdate({ _id: n }, e, {
   returnDocument: "after"
 }).lean();
 class Mt extends Ct {
@@ -205,23 +205,23 @@ class Mt extends Ct {
     return e;
   }
   fetchFromDb(e) {
-    return Rt(e);
+    return vt(e);
   }
   updateInDb(e, t) {
-    return vt(e, t);
+    return At(e, t);
   }
 }
-const At = new Mt();
-class Bt extends f {
+const Bt = new Mt();
+class xt extends f {
   async hasXpBuff(e) {
     const t = await this.get(e);
-    if (!L(t.buffs.xp.expireAt))
+    if (!Q(t.buffs.xp.expireAt))
       return t.buffs.xp;
   }
   async calcXp(e, t) {
-    const r = await At.get(e);
+    const r = await Bt.get(e);
     return r ? Math.ceil(
-      t * (r.disintegration / Be) * ((await this.hasXpBuff(e))?.boost ?? 1)
+      t * (r.disintegration / xe) * ((await this.hasXpBuff(e))?.boost ?? 1)
     ) : 0;
   }
   async addXp(e, t) {
@@ -272,7 +272,7 @@ class Bt extends f {
     ]);
   }
 }
-const y = (n) => n.toObject({ flattenMaps: !0, flattenObjectIds: !1 }), Ne = new u({
+const y = (n) => n.toObject({ flattenMaps: !0, flattenObjectIds: !1 }), Fe = new u({
   crew: {
     type: u.Types.ObjectId,
     required: !0,
@@ -288,25 +288,25 @@ const y = (n) => n.toObject({ flattenMaps: !0, flattenObjectIds: !1 }), Ne = new
     }
   }
 });
-Ne.post("findOneAndUpdate", async function(n) {
+Fe.post("findOneAndUpdate", async function(n) {
   m(
     h.CREW_META,
     n.crew._id,
     n
   );
 });
-const ge = l?.CrewMeta || p("CrewMeta", Ne), _t = async (n) => await ge.create({
+const Se = l?.CrewMeta || p("CrewMeta", Fe), qt = async (n) => await Se.create({
   crew: n
 });
-async function xt(n) {
-  const e = await ge.findOne({ crew: n }).lean();
-  return e || y(await _t(n));
+async function kt(n) {
+  const e = await Se.findOne({ crew: n }).lean();
+  return e || y(await qt(n));
 }
-const qt = (n, e) => ge.findOneAndUpdate({ crew: n }, e, {
+const _t = (n, e) => Se.findOneAndUpdate({ crew: n }, e, {
   returnDocument: "after",
   upsert: !0
 }).lean();
-class kt extends Bt {
+class Nt extends xt {
   constructor() {
     super(300);
   }
@@ -317,14 +317,14 @@ class kt extends Bt {
     return e;
   }
   fetchFromDb(e) {
-    return xt(e);
+    return kt(e);
   }
   updateInDb(e, t) {
-    return qt(e, t);
+    return _t(e, t);
   }
 }
-const Re = new kt();
-class Nt extends f {
+const ve = new Nt();
+class Ft extends f {
   async unlockBadge(e, t, r) {
     t.isProgressive ? await this.update(e, {
       $addToSet: { unlockedBadges: `${t.id}_${r}` }
@@ -333,7 +333,7 @@ class Nt extends f {
     });
   }
 }
-const Fe = new u({
+const je = new u({
   crew: {
     type: u.Types.ObjectId,
     required: !0,
@@ -342,25 +342,25 @@ const Fe = new u({
   },
   unlockedBadges: { type: [String], default: [] }
 });
-Fe.post("findOneAndUpdate", async function(n) {
+je.post("findOneAndUpdate", async function(n) {
   m(
     h.CREW_ORNAMENTS,
     n.crew._id,
     n
   );
 });
-const Se = l?.CrewOrnaments || p("CrewOrnaments", Fe), Ft = (n) => Se.create({
+const be = l?.CrewOrnaments || p("CrewOrnaments", je), jt = (n) => be.create({
   crew: n
 });
-async function jt(n) {
-  const e = await Se.findOne({ crew: n }).lean();
-  return e || y(await Ft(n));
+async function zt(n) {
+  const e = await be.findOne({ crew: n }).lean();
+  return e || y(await jt(n));
 }
-const zt = (n, e) => Se.findOneAndUpdate({ crew: n }, e, {
+const Kt = (n, e) => be.findOneAndUpdate({ crew: n }, e, {
   upsert: !0,
   returnDocument: "after"
 }).lean();
-class Kt extends Nt {
+class Pt extends Ft {
   constructor() {
     super(300);
   }
@@ -371,14 +371,14 @@ class Kt extends Nt {
     return e;
   }
   fetchFromDb(e) {
-    return jt(e);
+    return zt(e);
   }
   updateInDb(e, t) {
-    return zt(e, t);
+    return Kt(e, t);
   }
 }
-const Ws = new Kt();
-class Pt extends b {
+const ei = new Pt();
+class Ht extends b {
   async getStatus(e, t) {
     return (await this.get({ crew: e, questId: t })).status;
   }
@@ -387,7 +387,7 @@ class Pt extends b {
   }
   async isStreaking(e, t) {
     const { lastCompletionDate: r } = await this.get({ crew: e, questId: t });
-    return !!r && fe(k(), r);
+    return !!r && me(N(), r);
   }
   async completeQuest(e) {
     return this.update(
@@ -396,7 +396,7 @@ class Pt extends b {
         {
           $set: {
             lastCompletionDate: /* @__PURE__ */ new Date(),
-            status: T.COMPLETED
+            status: D.COMPLETED
           }
         }
       ],
@@ -404,7 +404,7 @@ class Pt extends b {
     );
   }
 }
-const je = new u(
+const ze = new u(
   {
     crew: {
       type: u.Types.ObjectId,
@@ -417,37 +417,37 @@ const je = new u(
       required: !0,
       index: !0
     },
-    status: { type: String, default: T.IN_PROGRESS, index: !0 },
+    status: { type: String, default: D.IN_PROGRESS, index: !0 },
     lastCompletionDate: Date
   },
   { minimize: !1 }
 );
-je.post("findOneAndUpdate", function(n) {
+ze.post("findOneAndUpdate", function(n) {
   m(
     h.CREW_QUEST,
     n.crew._id,
     n
   );
 });
-const X = l?.CrewQuest || p("CrewQuest", je);
-function Ht(n) {
-  return X.find(n).lean();
+const V = l?.CrewQuest || p("CrewQuest", ze);
+function Lt(n) {
+  return V.find(n).lean();
 }
-const Lt = async (n) => await X.create({
+const Qt = async (n) => await V.create({
   ...n
 });
-async function Qt(n) {
-  const e = await X.findOne(n).lean();
-  return e || y(await Lt(n));
+async function Wt(n) {
+  const e = await V.findOne(n).lean();
+  return e || y(await Qt(n));
 }
-function Wt(n, e, t) {
-  return X.findOneAndUpdate(n, e, {
+function Gt(n, e, t) {
+  return V.findOneAndUpdate(n, e, {
     upsert: !0,
     ...t,
     returnDocument: "after"
   }).lean();
 }
-class Gt extends Pt {
+class Yt extends Ht {
   constructor() {
     super(300);
   }
@@ -461,17 +461,17 @@ class Gt extends Pt {
     return { crew: e, questId: t };
   }
   fetchFromDb(e) {
-    return Qt(e);
+    return Wt(e);
   }
   fetchManyFromDb(e) {
-    return Ht(e);
+    return Lt(e);
   }
   updateInDb(e, t, r) {
-    return Wt(e, t, r);
+    return Gt(e, t, r);
   }
 }
-const Gs = new Gt();
-class Yt extends f {
+const ti = new Yt();
+class Xt extends f {
   async setActualVoiceMembers(e, t) {
     await this.update(e, {
       $set: {
@@ -488,7 +488,7 @@ class Yt extends f {
     });
   }
 }
-const ze = new u({
+const Ke = new u({
   crew: {
     type: u.Types.ObjectId,
     required: !0,
@@ -501,28 +501,28 @@ const ze = new u({
     connectedAt: { type: Date, default: /* @__PURE__ */ new Date(0) }
   }
 });
-ze.post("findOneAndUpdate", function(n) {
+Ke.post("findOneAndUpdate", function(n) {
   m(
     h.CREW_STATS_ENGAGEMENT,
     n.crew._id,
     n
   );
 });
-const be = l?.CrewStatsEngagement || p(
+const $e = l?.CrewStatsEngagement || p(
   "CrewStatsEngagement",
-  ze
-), Xt = (n) => be.create({
+  Ke
+), Vt = (n) => $e.create({
   crew: n
 });
-async function Vt(n) {
-  const e = await be.findOne({ crew: n }).lean();
-  return e || y(await Xt(n));
+async function Jt(n) {
+  const e = await $e.findOne({ crew: n }).lean();
+  return e || y(await Vt(n));
 }
-const Jt = (n, e) => be.findOneAndUpdate({ crew: n }, e, {
+const Zt = (n, e) => $e.findOneAndUpdate({ crew: n }, e, {
   upsert: !0,
   returnDocument: "after"
 }).lean();
-class Zt extends Yt {
+class en extends Xt {
   constructor() {
     super(300);
   }
@@ -535,16 +535,16 @@ class Zt extends Yt {
     return e;
   }
   fetchFromDb(e) {
-    return Vt(e);
+    return Jt(e);
   }
   updateInDb(e, t) {
-    return Jt(e, t);
+    return Zt(e, t);
   }
 }
-const Ys = new Zt();
-class en extends f {
+const ni = new en();
+class tn extends f {
 }
-const Ke = new u({
+const Pe = new u({
   crew: {
     type: u.Types.ObjectId,
     required: !0,
@@ -553,28 +553,28 @@ const Ke = new u({
   },
   streak80Percent: { type: Number, default: 0 }
 });
-Ke.post("findOneAndUpdate", function(n) {
+Pe.post("findOneAndUpdate", function(n) {
   m(
     h.CREW_STATS_FREQUENCY,
     n.crew._id,
     n
   );
 });
-const $e = l?.CrewStatsFrequency || p(
+const Ee = l?.CrewStatsFrequency || p(
   "CrewStatsFrequency",
-  Ke
-), tn = (n) => $e.create({
+  Pe
+), nn = (n) => Ee.create({
   crew: n
 });
-async function nn(n) {
-  const e = await $e.findOne({ crew: n }).lean();
-  return e || y(await tn(n));
+async function rn(n) {
+  const e = await Ee.findOne({ crew: n }).lean();
+  return e || y(await nn(n));
 }
-const rn = (n, e) => $e.findOneAndUpdate({ crew: n }, e, {
+const an = (n, e) => Ee.findOneAndUpdate({ crew: n }, e, {
   upsert: !0,
   returnDocument: "after"
 }).lean();
-class an extends en {
+class sn extends tn {
   constructor() {
     super(300);
   }
@@ -585,13 +585,13 @@ class an extends en {
     return e;
   }
   fetchFromDb(e) {
-    return nn(e);
+    return rn(e);
   }
   updateInDb(e, t) {
-    return rn(e, t);
+    return an(e, t);
   }
 }
-const Xs = new an(), Pe = new u(
+const ri = new sn(), He = new u(
   {
     user: {
       type: u.Types.ObjectId,
@@ -604,15 +604,15 @@ const Xs = new an(), Pe = new u(
       required: !0,
       index: !0
     },
-    status: { type: String, default: T.IN_PROGRESS, index: 1 },
+    status: { type: String, default: D.IN_PROGRESS, index: 1 },
     lastCompletionDate: Date,
     streak: Number
   },
   { minimize: !1 }
 );
-Pe.post("findOneAndUpdate", function(n) {
-  he(
-    we.USER_QUEST,
+He.post("findOneAndUpdate", function(n) {
+  we(
+    ge.USER_QUEST,
     n.user._id,
     n
   ), m(
@@ -621,7 +621,7 @@ Pe.post("findOneAndUpdate", function(n) {
     n
   );
 });
-const B = l?.UserQuest || p("UserQuest", Pe), sn = new u({
+const x = l?.UserQuest || p("UserQuest", He), un = new u({
   user: {
     type: u.Types.ObjectId,
     required: !0,
@@ -636,12 +636,12 @@ const B = l?.UserQuest || p("UserQuest", Pe), sn = new u({
   commands: {
     work: { type: Date, default: /* @__PURE__ */ new Date(0) },
     dice: { type: Date, default: /* @__PURE__ */ new Date(0) },
-    qod: { type: Date, default: /* @__PURE__ */ new Date(0) },
-    guess: { type: Date, default: /* @__PURE__ */ new Date(0) },
-    blackjack: { type: Date, default: /* @__PURE__ */ new Date(0) },
+    doubleOrQuit: { type: Date, default: /* @__PURE__ */ new Date(0) },
+    priceIsRight: { type: Date, default: /* @__PURE__ */ new Date(0) },
+    blackJack: { type: Date, default: /* @__PURE__ */ new Date(0) },
     rps: { type: Date, default: /* @__PURE__ */ new Date(0) }
   }
-}), V = l?.UserCooldown || p("UserCooldown", sn), He = new u(
+}), J = l?.UserCooldown || p("UserCooldown", un), Le = new u(
   {
     user: {
       type: u.Types.ObjectId,
@@ -656,18 +656,18 @@ const B = l?.UserQuest || p("UserQuest", Pe), sn = new u({
       index: !0
     },
     permission: { type: String, default: "member", required: !0 },
-    percent: { type: Number, default: wt }
+    percent: { type: Number, default: gt }
   },
   { minimize: !1 }
 );
-He.post("findOneAndUpdate", function(n) {
+Le.post("findOneAndUpdate", function(n) {
   m(
     h.USER_CREW,
     n.user._id,
     n
   );
 });
-const _ = l?.UserCrew || p("UserCrew", He), un = new u({
+const q = l?.UserCrew || p("UserCrew", Le), cn = new u({
   user: {
     type: u.Types.ObjectId,
     required: !0,
@@ -683,7 +683,7 @@ const _ = l?.UserCrew || p("UserCrew", He), un = new u({
   },
   previousCompletedQuest: { type: [String], default: [] },
   previousMessageSent: { type: Number, default: 0 }
-}), J = l?.UserDailyReport || p("UserDailyReport", un), cn = new u({
+}), Z = l?.UserDailyReport || p("UserDailyReport", cn), on = new u({
   user: {
     type: u.Types.ObjectId,
     required: !0,
@@ -691,7 +691,7 @@ const _ = l?.UserCrew || p("UserCrew", He), un = new u({
     ref: "User"
   },
   encyclopedia: { type: [String], default: [] }
-}), Z = l?.UserEncyclopedia || p("UserEncyclopedia", cn), on = new u({
+}), ee = l?.UserEncyclopedia || p("UserEncyclopedia", on), dn = new u({
   user: {
     type: u.Types.ObjectId,
     required: !0,
@@ -708,7 +708,7 @@ const _ = l?.UserCrew || p("UserCrew", He), un = new u({
     },
     default: null
   }
-}), ee = l?.UserGames || p("UserGames", on), Le = new u(
+}), te = l?.UserGames || p("UserGames", dn), Qe = new u(
   {
     user: {
       type: u.Types.ObjectId,
@@ -730,9 +730,9 @@ const _ = l?.UserCrew || p("UserCrew", He), un = new u({
   },
   { minimize: !1 }
 );
-Le.post("findOneAndUpdate", function(n) {
-  he(
-    we.USER_INVENTORY,
+Qe.post("findOneAndUpdate", function(n) {
+  we(
+    ge.USER_INVENTORY,
     n.user._id,
     n
   ), m(
@@ -741,14 +741,14 @@ Le.post("findOneAndUpdate", function(n) {
     n
   );
 });
-const te = l?.UserInventory || p("UserInventory", Le), dn = new me.EventEmitter(), ln = (n, e) => {
-  dn.emit(n, e);
-}, C = {
+const ne = l?.UserInventory || p("UserInventory", Qe), ln = new he.EventEmitter(), pn = (n, e) => {
+  ln.emit(n, e);
+}, R = {
   multiplier: { type: Number, default: 0 },
   origin: String,
   expireAt: { type: Date, default: null },
   startAt: { type: Date, default: null }
-}, Qe = new u({
+}, We = new u({
   user: {
     type: u.Types.ObjectId,
     required: !0,
@@ -771,33 +771,33 @@ const te = l?.UserInventory || p("UserInventory", Le), dn = new me.EventEmitter(
   buffs: {
     cooldown: {
       casino: {
-        type: [C],
+        type: [R],
         default: []
       },
       work: {
-        type: [C],
+        type: [R],
         default: []
       }
     },
     berry: {
       work: {
-        type: [C],
+        type: [R],
         default: []
       },
       global: {
-        type: [C],
+        type: [R],
         default: []
       }
     },
     drop: {
       work: {
-        type: [C],
+        type: [R],
         default: []
       }
     },
     xp: {
       global: {
-        type: [C],
+        type: [R],
         default: []
       }
     }
@@ -825,14 +825,14 @@ const te = l?.UserInventory || p("UserInventory", Le), dn = new me.EventEmitter(
     wisdom: { type: Number, default: 0 }
   }
 });
-Qe.post("findOneAndUpdate", async function(n) {
+We.post("findOneAndUpdate", async function(n) {
   m(
     h.USER_META,
     n.user._id,
     n
-  ), n.hp <= 0 && ln("death", n.user._id);
+  ), n.hp <= 0 && pn("death", n.user._id);
 });
-const O = l?.UserMeta || p("UserMeta", Qe), We = new u({
+const T = l?.UserMeta || p("UserMeta", We), Ge = new u({
   user: {
     type: u.Types.ObjectId,
     required: !0,
@@ -849,14 +849,14 @@ const O = l?.UserMeta || p("UserMeta", Qe), We = new u({
   unlockedBags: { type: [String], default: ["default"] },
   selectedBag: { type: String, default: "default" }
 });
-We.post("findOneAndUpdate", function(n) {
+Ge.post("findOneAndUpdate", function(n) {
   m(
     h.USER_ORNAMENT,
     n.user._id,
     n
   );
 });
-const ne = l?.UserOrnament || p("UserOrnament", We), Ge = new u(
+const re = l?.UserOrnament || p("UserOrnament", Ge), Ye = new u(
   {
     user: {
       type: u.Types.ObjectId,
@@ -880,14 +880,14 @@ const ne = l?.UserOrnament || p("UserOrnament", We), Ge = new u(
   },
   { minimize: !1 }
 );
-Ge.post("findOneAndUpdate", function(n) {
-  he(
-    we.USER_RAID,
+Ye.post("findOneAndUpdate", function(n) {
+  we(
+    ge.USER_RAID,
     n.user._id,
     n
   );
 });
-const re = l?.UserRaid || p("UserRaid", Ge), pn = new u({
+const ae = l?.UserRaid || p("UserRaid", Ye), yn = new u({
   user: {
     type: u.Types.ObjectId,
     required: !0,
@@ -913,7 +913,7 @@ const re = l?.UserRaid || p("UserRaid", Ge), pn = new u({
       rps: { type: Boolean, default: !1 }
     }
   }
-}), j = l?.UserSettings || p("UserSettings", pn), yn = new u(
+}), z = l?.UserSettings || p("UserSettings", yn), fn = new u(
   {
     user: {
       type: u.Types.ObjectId,
@@ -925,7 +925,7 @@ const re = l?.UserRaid || p("UserRaid", Ge), pn = new u({
     limit: { type: u.Types.Mixed, default: {} }
   },
   { minimize: !1 }
-), ae = l?.UserShop || p("UserShop", yn), Ye = new u({
+), se = l?.UserShop || p("UserShop", fn), Xe = new u({
   user: {
     type: u.Types.ObjectId,
     required: !0,
@@ -960,14 +960,14 @@ const re = l?.UserRaid || p("UserRaid", Ge), pn = new u({
     guessInOneTryCount: { type: Number, default: 0 }
   }
 });
-Ye.post("findOneAndUpdate", function(n) {
+Xe.post("findOneAndUpdate", function(n) {
   m(
     h.USER_STATS_CASINO,
     n.user._id,
     n
   );
 });
-const v = l?.UserStatsCasino || p("UserStatsCasino", Ye), Xe = new u({
+const A = l?.UserStatsCasino || p("UserStatsCasino", Xe), Ve = new u({
   user: {
     type: u.Types.ObjectId,
     required: !0,
@@ -979,14 +979,14 @@ const v = l?.UserStatsCasino || p("UserStatsCasino", Ye), Xe = new u({
   timeCrewBeyond10PercentXp: { type: Number, default: 0 },
   timeCrewAbove90PercentXp: { type: Number, default: 0 }
 });
-Xe.post("findOneAndUpdate", function(n) {
+Ve.post("findOneAndUpdate", function(n) {
   m(
     h.USER_STATS_CREW,
     n.user._id,
     n
   );
 });
-const se = l?.UserStatsCrew || p("UserStatsCrew", Xe), Ve = new u({
+const ie = l?.UserStatsCrew || p("UserStatsCrew", Ve), Je = new u({
   user: {
     type: u.Types.ObjectId,
     required: !0,
@@ -997,14 +997,14 @@ const se = l?.UserStatsCrew || p("UserStatsCrew", Xe), Ve = new u({
   raidFinishedCount: { type: Number, default: 0 },
   totalSpentInShop: { type: Number, default: 0 }
 });
-Ve.post("findOneAndUpdate", function(n) {
+Je.post("findOneAndUpdate", function(n) {
   m(
     h.USER_STATS_ECONOMY,
     n.user._id,
     n
   );
 });
-const ie = l?.UserStatsEconomy || p("UserStatsEconomy", Ve), Je = new u({
+const ue = l?.UserStatsEconomy || p("UserStatsEconomy", Je), Ze = new u({
   user: {
     type: u.Types.ObjectId,
     required: !0,
@@ -1016,17 +1016,17 @@ const ie = l?.UserStatsEconomy || p("UserStatsEconomy", Ve), Je = new u({
   randomMessageClaimed: { type: Number, default: 0 },
   writeDifferentChatIds: { type: [String], default: [] }
 });
-Je.post("findOneAndUpdate", function(n) {
+Ze.post("findOneAndUpdate", function(n) {
   m(
     h.USER_STATS_ENGAGEMENT,
     n.user._id,
     n
   );
 });
-const ue = l?.UserStatsEngagement || p(
+const ce = l?.UserStatsEngagement || p(
   "UserStatsEngagement",
-  Je
-), Ze = new u({
+  Ze
+), et = new u({
   user: {
     type: u.Types.ObjectId,
     required: !0,
@@ -1045,14 +1045,14 @@ const ue = l?.UserStatsEngagement || p(
     loseEverything: { type: Boolean, default: !1 }
   }
 });
-Ze.post("findOneAndUpdate", function(n) {
+et.post("findOneAndUpdate", function(n) {
   m(
     h.USER_STATS_FLAGS,
     n.user._id,
     n
   );
 });
-const ce = l?.UserStatsFlags || p("UserStatsFlags", Ze), et = new u({
+const oe = l?.UserStatsFlags || p("UserStatsFlags", et), tt = new u({
   user: {
     type: u.Types.ObjectId,
     required: !0,
@@ -1064,7 +1064,7 @@ const ce = l?.UserStatsFlags || p("UserStatsFlags", Ze), et = new u({
     lastTimeRead: { type: Date, default: /* @__PURE__ */ new Date() }
   }
 });
-et.post("findOneAndUpdate", function(n) {
+tt.post("findOneAndUpdate", function(n) {
   m(
     h.USER_STATS_FREQUENCY,
     n.user._id,
@@ -1073,8 +1073,8 @@ et.post("findOneAndUpdate", function(n) {
 });
 const M = l?.UserStatsFrequency || p(
   "UserStatsFrequency",
-  et
-), tt = new u({
+  tt
+), nt = new u({
   user: {
     type: u.Types.ObjectId,
     required: !0,
@@ -1101,32 +1101,32 @@ const M = l?.UserStatsFrequency || p(
     totalCrafted: { type: Number, default: 0 }
   }
 });
-tt.post("findOneAndUpdate", function(n) {
+nt.post("findOneAndUpdate", function(n) {
   m(
     h.USER_STATS_INVENTORY,
     n.user._id,
     n
   );
 });
-const A = l?.UserStatsInventory || p(
+const B = l?.UserStatsInventory || p(
   "UserStatsInventory",
-  tt
-), Ee = new u({
+  nt
+), Ue = new u({
   discordId: { type: String, required: !0, unique: !0 },
   birthday: { type: Date, default: null, index: 1 },
-  faction: { type: String, default: gt, index: 1 },
+  faction: { type: String, default: St, index: 1 },
   canChangeFaction: { type: Boolean, default: !1 },
   canChooseFaction: { type: Boolean, default: !1 }
 });
-Ee.post("findOneAndUpdate", function(n) {
+Ue.post("findOneAndUpdate", function(n) {
   m(h.USER, n._id, n);
 });
-Ee.post("deleteOne", async function() {
+Ue.post("deleteOne", async function() {
   const n = this.getQuery()._id;
-  await V.deleteOne({ user: n }), await _.deleteOne({ user: n }), await J.deleteOne({ user: n }), await Z.deleteOne({ user: n }), await ee.deleteOne({ user: n }), await te.deleteOne({ user: n }), await O.deleteOne({ user: n }), await ne.deleteOne({ user: n }), await B.deleteMany({ user: n }), await re.deleteOne({ user: n }), await j.deleteOne({ user: n }), await ae.deleteOne({ user: n }), await v.deleteOne({ user: n }), await se.deleteOne({ user: n }), await ie.deleteOne({ user: n }), await ue.deleteOne({ user: n }), await ce.deleteOne({ user: n }), await M.deleteOne({ user: n }), await A.deleteOne({ user: n });
+  await J.deleteOne({ user: n }), await q.deleteOne({ user: n }), await Z.deleteOne({ user: n }), await ee.deleteOne({ user: n }), await te.deleteOne({ user: n }), await ne.deleteOne({ user: n }), await T.deleteOne({ user: n }), await re.deleteOne({ user: n }), await x.deleteMany({ user: n }), await ae.deleteOne({ user: n }), await z.deleteOne({ user: n }), await se.deleteOne({ user: n }), await A.deleteOne({ user: n }), await ie.deleteOne({ user: n }), await ue.deleteOne({ user: n }), await ce.deleteOne({ user: n }), await oe.deleteOne({ user: n }), await M.deleteOne({ user: n }), await B.deleteOne({ user: n });
 });
-const $ = l?.User || p("User", Ee);
-class fn extends b {
+const $ = l?.User || p("User", Ue);
+class mn extends b {
   getByObjectId(e) {
     return this.update({ _id: e }, {});
   }
@@ -1182,34 +1182,6 @@ class fn extends b {
       }
     ]);
   }
-  async getFactionRank(e) {
-    const t = await this.get(e);
-    return (await $.aggregate([
-      {
-        $lookup: {
-          from: "usermetas",
-          localField: "_id",
-          foreignField: "user",
-          as: "meta"
-        }
-      },
-      { $unwind: "$meta" },
-      { $match: { faction: t.faction } },
-      {
-        $setWindowFields: {
-          sortBy: { "meta.xp.amount": -1 },
-          output: { rank: { $rank: {} } }
-        }
-      },
-      { $match: { _id: t._id } },
-      {
-        $project: {
-          _id: 0,
-          rank: 1
-        }
-      }
-    ]))[0];
-  }
   getFactionRanking(e) {
     return $.aggregate([
       { $match: { faction: e } },
@@ -1278,10 +1250,10 @@ class fn extends b {
     ]);
   }
   getQuestRanking() {
-    return B.aggregate([
+    return x.aggregate([
       {
         $match: {
-          status: T.COMPLETED
+          status: D.COMPLETED
         }
       },
       {
@@ -1352,18 +1324,18 @@ class fn extends b {
     await this.update({ discordId: e }, { $set: { faction: t } });
   }
 }
-const mn = (n) => $.find(n), hn = (n) => $.create({
+const hn = (n, e) => $.find(n, {}, e).lean(), wn = (n) => $.create({
   discordId: n
 });
-async function wn(n) {
-  const e = await $.findOne({ discordId: n }).lean();
-  return e || y(await hn(n));
+async function gn(n, { upsert: e = !0, ...t }) {
+  const r = await $.findOne({ discordId: n }, {}, t).lean();
+  return !r && e ? y(await wn(n)) : r;
 }
-const gn = (n, e) => $.findOneAndUpdate(n, e, {
+const Sn = (n, e) => $.findOneAndUpdate(n, e, {
   upsert: !0,
   returnDocument: "after"
-});
-class Sn extends fn {
+}).lean();
+class bn extends mn {
   constructor() {
     super(3600);
   }
@@ -1373,24 +1345,17 @@ class Sn extends fn {
   getKey({ discordId: e }) {
     return e;
   }
-  fetchFromDb(e) {
-    return wn(e);
+  fetchFromDb(e, t) {
+    return gn(e, t);
   }
-  fetchManyFromDb(e) {
-    return mn(e);
+  fetchManyFromDb(e, t) {
+    return hn(e, t);
   }
   updateInDb(e, t) {
-    return gn(e, t);
+    return Sn(e, t);
   }
 }
-const bn = new Sn(), Vs = [
-  "work",
-  "rps",
-  "blackjack",
-  "guess",
-  "qod",
-  "dice"
-], $n = new u(
+const $n = new bn(), ai = ["work", ...bt], En = new u(
   {
     user: {
       type: u.Types.ObjectId,
@@ -1402,12 +1367,12 @@ const bn = new Sn(), Vs = [
     type: { type: String, required: !0 }
   },
   { minimize: !1 }
-), z = l?.Reminder || p("Reminder", $n), En = async (n) => {
-  await z.deleteMany(n);
+), K = l?.Reminder || p("Reminder", En), Un = async (n) => {
+  await K.deleteMany(n);
 }, In = async (n, e) => {
-  await z.deleteOne({ user: n, type: e });
+  await K.deleteOne({ user: n, type: e });
 };
-class Un extends b {
+class Dn extends b {
   getAllPassedReminder() {
     return this.getMany({ date: { $lte: /* @__PURE__ */ new Date() } });
   }
@@ -1430,25 +1395,25 @@ class Un extends b {
   }
   async deleteSelectedReminders(e) {
     const t = await this.getMany({ _id: { $in: e } });
-    await En({ _id: { $in: e } }), t.forEach((r) => {
+    await Un({ _id: { $in: e } }), t.forEach((r) => {
       this.invalidate({ user: r.user, type: r.type });
     });
   }
 }
-function Dn(n, e = {}) {
-  return z.find(n, e).lean();
+function On(n, e) {
+  return K.find(n, {}, e).lean();
 }
 async function Tn(n) {
-  const e = await z.findOne(n).lean();
+  const e = await K.findOne(n).lean();
   return e || null;
 }
-async function On(n, e, t) {
-  return z.findOneAndUpdate(n, e, {
+async function Rn(n, e, t) {
+  return K.findOneAndUpdate(n, e, {
     ...t,
     returnDocument: "after"
   }).lean();
 }
-class Cn extends Un {
+class Cn extends Dn {
   constructor() {
     super(300);
   }
@@ -1465,14 +1430,14 @@ class Cn extends Un {
     return Tn(e);
   }
   fetchManyFromDb(e, t) {
-    return Dn(e, t);
+    return On(e, t);
   }
   updateInDb(e, t, r = { upsert: !1 }) {
-    return On(e, t, r);
+    return Rn(e, t, r);
   }
 }
-const H = new Cn();
-class Rn extends b {
+const L = new Cn();
+class vn extends b {
   async isOrnamentIds(e, t = () => !0) {
     const a = (await this.getAll()).filter(t).map(({ ornamentId: s }) => s);
     return e.every((s) => a.includes(s));
@@ -1511,7 +1476,7 @@ class Rn extends b {
     return (await this.getAll()).filter(this.isShopTitle);
   }
   formatBackgroundId(e) {
-    return e.ornamentId === "background_default" ? "par défaut" : `"${dt(e.ornamentId.split("_").join(" "))}"`;
+    return e.ornamentId === "background_default" ? "par défaut" : `"${lt(e.ornamentId.split("_").join(" "))}"`;
   }
   pickOrnament(e) {
     const t = Math.random();
@@ -1527,7 +1492,7 @@ class Rn extends b {
         continue;
       }
       if (i.length !== 0)
-        return i[Y(0, i.length)];
+        return i[X(0, i.length)];
     }
     throw Error("pickOrnament - All ods array were empty");
   }
@@ -1536,15 +1501,15 @@ class Rn extends b {
       throw new RangeError(
         "pickEachRarityOrnament - must give same number of odds than ranks"
       );
-    return N(
+    return F(
       t.map((r, a) => {
         const s = Ce[a], i = e[s];
-        return Math.random() > r || !i || !i.length ? null : lt(i);
+        return Math.random() > r || !i || !i.length ? null : pt(i);
       })
     );
   }
 }
-const vn = new u(
+const An = new u(
   {
     ornamentId: { unique: !0, index: 1, required: !0, type: String },
     type: { required: !0, type: String },
@@ -1558,26 +1523,26 @@ const vn = new u(
     strength: Number
   },
   { minimize: !1 }
-), Ie = l?.Ornaments || p("Ornaments", vn), Mn = async (n, e = {}) => Ie.find(n, e).lean();
-async function An(n) {
+), Ie = l?.Ornaments || p("Ornaments", An), Mn = async (n, e) => Ie.find(n, {}, e).lean();
+async function Bn(n) {
   const e = await Ie.findOne({ ornamentId: n }).lean();
   return e || null;
 }
-const Bn = (n, e) => Ie.findOneAndUpdate(n, e, {
+const xn = (n, e) => Ie.findOneAndUpdate(n, e, {
   returnDocument: "after"
 }).lean();
-class _n extends Rn {
+class qn extends vn {
   constructor() {
     super(3600);
   }
   updateInDb(e, t) {
-    return Bn(e, t);
+    return xn(e, t);
   }
   fetchFromDb(e) {
-    return An(e);
+    return Bn(e);
   }
-  fetchManyFromDb(e) {
-    return Mn(e);
+  fetchManyFromDb(e, t) {
+    return Mn(e, t);
   }
   getKey(e) {
     return e.ornamentId;
@@ -1586,7 +1551,7 @@ class _n extends Rn {
     return e;
   }
 }
-const g = new _n(), xn = new u(
+const g = new qn(), kn = new u(
   {
     panoplyId: { unique: !0, index: 1, required: !0, type: String },
     name: { required: !0, type: String },
@@ -1600,21 +1565,21 @@ const g = new _n(), xn = new u(
     halfBonus: u.Types.Mixed
   },
   { minimize: !1 }
-), K = l?.Panoplies || p("Panoplies", xn), qn = (n) => K.find(n).lean(), kn = async (n) => K.find(n).populate("equipments");
-async function Nn(n) {
-  const e = await K.findOne({ panoplyId: n }).lean();
+), P = l?.Panoplies || p("Panoplies", kn), _n = (n, e) => P.find(n, {}, e).lean(), Nn = async (n, e) => P.find(n, {}, e).populate("equipments");
+async function Fn(n) {
+  const e = await P.findOne({ panoplyId: n }).lean();
   return e || null;
 }
-const Fn = async (n) => K.findOne(n).populate("equipments");
-class jn extends b {
+const jn = async (n) => P.findOne(n).populate("equipments");
+class zn extends b {
   getAllPopulated() {
-    return kn({});
+    return Nn({}, {});
   }
   getPopulated(e) {
-    return Fn({ panoplyId: e });
+    return jn({ panoplyId: e });
   }
   hasPanoply(e, t) {
-    const r = N(Object.values(e)), a = t.equipments.filter(
+    const r = F(Object.values(e)), a = t.equipments.filter(
       (s) => r.find((i) => i.entityId === s.entityId)
     ).length;
     if (a === t.equipments.length)
@@ -1625,7 +1590,7 @@ class jn extends b {
   async getPanoplyBonus(e) {
     const t = [], r = await this.getAllPopulated();
     for (const a of r) {
-      const s = N(Object.values(e)), i = a.equipments.filter(
+      const s = F(Object.values(e)), i = a.equipments.filter(
         (o) => s.find(({ entityId: c }) => c === o.entityId)
       );
       i.length === a.equipments.length ? t.push([a, "full"]) : i.length >= a.equipments.length / 2 ? t.push([a, "half"]) : i.length >= 1 && t.push([a, null]);
@@ -1633,10 +1598,10 @@ class jn extends b {
     return t;
   }
 }
-const zn = async (n, e) => K.findOneAndUpdate(n, e, {
+const Kn = async (n, e) => P.findOneAndUpdate(n, e, {
   returnDocument: "after"
 }).lean();
-class Kn extends jn {
+class Pn extends zn {
   constructor() {
     super(3600);
   }
@@ -1647,17 +1612,17 @@ class Kn extends jn {
     return e;
   }
   updateInDb(e, t) {
-    return zn(e, t);
+    return Kn(e, t);
   }
   fetchFromDb(e) {
-    return Nn(e);
+    return Fn(e);
   }
-  fetchManyFromDb(e = {}) {
-    return qn(e);
+  fetchManyFromDb(e, t) {
+    return _n(e, t);
   }
 }
-const I = new Kn();
-class Pn extends b {
+const U = new Pn();
+class Hn extends b {
   isEntity(e) {
     return !!e && "entityId" in e;
   }
@@ -1695,14 +1660,14 @@ class Pn extends b {
   }
   async recordToEntityTuple(e) {
     const t = await this.getAll();
-    return R(e).reduce((r, [a, s]) => {
+    return C(e).reduce((r, [a, s]) => {
       const i = t.find(({ entityId: o }) => o === a);
       return i && r.push([i, s]), r;
     }, []);
   }
   async getAllEntitiesLimit() {
     const e = await this.getAll();
-    return Ae(
+    return Be(
       e.map((t) => [t.entityId, t.shop?.limit ?? 0])
     );
   }
@@ -1726,18 +1691,18 @@ class Pn extends b {
       intelligence: 0,
       wisdom: 0
     };
-    const r = await I.getAllPopulated();
-    for (const a of _e) {
+    const r = await U.getAllPopulated();
+    for (const a of qe) {
       const s = e[a];
-      s && (t = F(
+      s && (t = j(
         t,
         (await this.fromDBToEquipableEquipment(s)).characteristics,
         (i, o) => i + o
       ));
     }
     for (const a of r) {
-      const s = I.hasPanoply(e, a);
-      s && !("target" in s) && (t = F(
+      const s = U.hasPanoply(e, a);
+      s && !("target" in s) && (t = j(
         t,
         s,
         (i, o) => i + o
@@ -1748,14 +1713,14 @@ class Pn extends b {
   getSomeItems(e, t) {
     const r = [];
     for (; r.length < e; ) {
-      const a = q(t, r, (s) => s.entityId);
+      const a = _(t, r, (s) => s.entityId);
       r.push(
         g.pickOrnament(
-          pt(a, (s) => s.shop?.odd ?? 0)
+          yt(a, (s) => s.shop?.odd ?? 0)
         )
       );
     }
-    return Oe(r, (a) => a.shop?.price ?? 0);
+    return Re(r, (a) => a.shop?.price ?? 0);
   }
   filterCraftEntities(e) {
     return e.filter((t) => t.usage?.craft);
@@ -1811,12 +1776,9 @@ class Pn extends b {
   isSameEquipment(e, t) {
     return e.entityId === t.entityId && e.seed === t.seed;
   }
-  getEquipmentSlotType(e) {
-    return St[e];
-  }
   seedEquipment(e, t) {
-    const r = yt(t), a = Oe(
-      R(e.characteristics),
+    const r = ft(t), a = Re(
+      C(e.characteristics),
       ([s]) => s
     );
     return {
@@ -1825,7 +1787,7 @@ class Pn extends b {
       characteristics: Object.fromEntries(
         a.map(([s, i]) => [
           s,
-          Array.isArray(i) ? Y(i[0], i[1] + 1, r) : i
+          Array.isArray(i) ? X(i[0], i[1] + 1, r) : i
         ])
       )
     };
@@ -1839,17 +1801,17 @@ class Pn extends b {
     return Object.values(e.characteristics).reduce((r, a) => r + a, 0) + e.level;
   }
 }
-const Hn = new u(
+const Ln = new u(
   {
     type: {
       type: String,
-      enum: bt,
+      enum: $t,
       required: !0
     },
     params: { type: u.Types.Mixed }
   },
   { _id: !1 }
-), Ln = new u(
+), Qn = new u(
   {
     entityId: { unique: !0, required: !0, type: String },
     type: { required: !0, type: String },
@@ -1871,7 +1833,7 @@ const Hn = new u(
     image: { required: !0, type: String },
     emojis: { required: !0, type: String },
     category: { required: !0, type: String },
-    effects: { type: [Hn], default: [] },
+    effects: { type: [Ln], default: [] },
     rankId: String,
     usage: {
       _id: !1,
@@ -1932,31 +1894,31 @@ const Hn = new u(
     panoply: String
   },
   { minimize: !1 }
-), oe = l?.Entities || p("Entities", Ln), Qn = async (n) => await oe.create({
+), de = l?.Entities || p("Entities", Qn), Wn = async (n) => await de.create({
   ...n
-}), Wn = async (n, e = {}) => oe.find(n, e).lean();
-async function Gn(n) {
-  const e = await oe.findOne({ entityId: n }).lean();
+}), Gn = async (n, e) => de.find(n, {}, e).lean();
+async function Yn(n) {
+  const e = await de.findOne({ entityId: n }).lean();
   return e || null;
 }
-const Yn = (n, e) => oe.findOneAndUpdate(n, e, {
+const Xn = (n, e) => de.findOneAndUpdate(n, e, {
   returnDocument: "after"
 }).lean();
-class Xn extends Pn {
+class Vn extends Hn {
   constructor() {
     super(3600);
   }
   createInDb(e) {
-    return Qn(e);
+    return Wn(e);
   }
   updateInDb(e, t) {
-    return Yn(e, t);
+    return Xn(e, t);
   }
   fetchFromDb(e) {
-    return Gn(e);
+    return Yn(e);
   }
-  fetchManyFromDb(e) {
-    return Wn(e);
+  fetchManyFromDb(e, t) {
+    return Gn(e, t);
   }
   normalizeKey(e) {
     return e;
@@ -1965,14 +1927,14 @@ class Xn extends Pn {
     return e.entityId;
   }
 }
-const d = new Xn(), Vn = (n, e, t) => _.create({
+const d = new Vn(), Jn = (n, e, t) => q.create({
   user: n,
   crew: e,
   permission: t
-}), Jn = async (n) => {
-  await _.deleteOne({ user: n });
+}), Zn = async (n) => {
+  await q.deleteOne({ user: n });
 };
-class Zn extends b {
+class er extends b {
   async updatePercent(e, t) {
     await this.update(e, {
       $set: {
@@ -1988,10 +1950,10 @@ class Zn extends b {
     });
   }
   async addUserToCrew(e, t, r) {
-    await Vn(e, t, r), this.invalidate(t);
+    await Jn(e, t, r), this.invalidate(t);
   }
   async removeUserFromCrew(e, t) {
-    await Jn(e), this.invalidate(e), this.invalidate(t);
+    await Zn(e), this.invalidate(e), this.invalidate(t);
   }
   async getAllUserIdsFromCrew(e) {
     const t = e.toString(), r = this.cache.get(t);
@@ -2001,8 +1963,8 @@ class Zn extends b {
     return this.cache.set(t, a), a.map(({ user: s }) => s);
   }
 }
-const er = (n) => _.find(n).lean(), tr = (n) => _.findOne({ user: n }).lean(), nr = (n, e) => _.findOneAndUpdate({ user: n }, e, { returnDocument: "after" }).lean();
-class rr extends Zn {
+const tr = (n) => q.find(n).lean(), nr = (n) => q.findOne({ user: n }).lean(), rr = (n, e) => q.findOneAndUpdate({ user: n }, e, { returnDocument: "after" }).lean();
+class ar extends er {
   constructor() {
     super(300);
   }
@@ -2013,17 +1975,17 @@ class rr extends Zn {
     return e;
   }
   fetchFromDb(e) {
-    return tr(e);
+    return nr(e);
   }
   fetchManyFromDb(e) {
-    return er(e);
+    return tr(e);
   }
   updateInDb(e, t) {
-    return nr(e, t);
+    return rr(e, t);
   }
 }
-const ar = new rr();
-class sr extends f {
+const sr = new ar();
+class ir extends f {
   hasAlreadyFoundEntity(e, t) {
     return e.encyclopedia.includes(t);
   }
@@ -2033,23 +1995,23 @@ class sr extends f {
     });
   }
 }
-const ir = async (n) => await Z.create({
+const ur = async (n) => await ee.create({
   user: n
 });
-async function ur(n) {
-  const e = await Z.findOne({ user: n }).lean();
-  return e || y(await ir(n));
+async function cr(n) {
+  const e = await ee.findOne({ user: n }).lean();
+  return e || y(await ur(n));
 }
-const cr = (n, e) => Z.findOneAndUpdate({ user: n }, e, {
+const or = (n, e) => ee.findOneAndUpdate({ user: n }, e, {
   upsert: !0,
   returnDocument: "after"
 }).lean();
-class or extends sr {
+class dr extends ir {
   constructor() {
     super(300);
   }
   fetchFromDb(e) {
-    return ur(e);
+    return cr(e);
   }
   getKey({ user: e }) {
     return e;
@@ -2058,13 +2020,13 @@ class or extends sr {
     return e.toString();
   }
   updateInDb(e, t) {
-    return cr(e, t);
+    return or(e, t);
   }
 }
-const ye = new or();
-class dr extends f {
+const fe = new dr();
+class lr extends f {
   getPanoplyEffectiveBonus(e, t) {
-    const r = N(
+    const r = F(
       Object.values(e.equippedItems)
     ), a = t.equipments.filter(
       (s) => r.find((i) => i.entityId === s.entityId)
@@ -2083,13 +2045,13 @@ class dr extends f {
       intelligence: 0,
       wisdom: 0
     };
-    const r = await I.getAllPopulated();
-    for (const a of _e) {
+    const r = await U.getAllPopulated();
+    for (const a of qe) {
       const s = e.equippedItems?.[a];
       if (!s)
         continue;
       const i = await d.fromDBToEquipableEquipment(s);
-      t = F(
+      t = j(
         t,
         i.characteristics,
         (o, c) => o + c
@@ -2097,7 +2059,7 @@ class dr extends f {
     }
     for (const a of r) {
       const s = this.getPanoplyEffectiveBonus(e, a);
-      s && !("target" in s) && (t = F(
+      s && !("target" in s) && (t = j(
         t,
         s,
         (i, o) => i + o
@@ -2107,7 +2069,7 @@ class dr extends f {
   }
   async hasInventoryRequirements(e, t) {
     const r = await this.get(e);
-    return R(t).reduce(
+    return C(t).reduce(
       (a, [s, i]) => a && (r.itemList[s] ?? 0) >= (i ?? 0),
       !0
     );
@@ -2119,7 +2081,7 @@ class dr extends f {
     return (await this.get(e)).itemList;
   }
   async calcBottleMultiplier(e, { bottle: { buffs: t } }) {
-    const r = await this.get(e), s = (await I.getPanoplyBonus(
+    const r = await this.get(e), s = (await U.getPanoplyBonus(
       r.equippedItems
     )).find(
       ([i, o]) => i.panoplyId === "herbalist" && o !== null
@@ -2133,14 +2095,14 @@ class dr extends f {
     })) : t;
   }
   async calcMinStreakForWorkLoot(e) {
-    const t = await this.get(e), r = (await I.getPanoplyBonus(t.equippedItems)).find(
+    const t = await this.get(e), r = (await U.getPanoplyBonus(t.equippedItems)).find(
       ([a, s]) => a.panoplyId === "marine" && s !== null
     );
     return r && r[1] === "full" ? 10 : r && r[1] === "half" ? 20 : 1 / 0;
   }
   async hasRevolutionaryBuff(e) {
     const t = await this.get(e);
-    return (await I.getPanoplyBonus(t.equippedItems)).find(
+    return (await U.getPanoplyBonus(t.equippedItems)).find(
       ([a, s]) => a.panoplyId === "revolutionary" && s !== null
     )?.[1] ?? null;
   }
@@ -2150,16 +2112,16 @@ class dr extends f {
   async addItem(e, t, r) {
     await this.update(e, {
       $inc: { [`itemList.${t}`]: r }
-    }), await ye.addEntities(e, [t]);
+    }), await fe.addEntities(e, [t]);
   }
   async addItems(e, t) {
     await this.update(e, {
       $inc: Object.fromEntries(
         Object.entries(t).filter(([, r]) => (r ?? 0) > 0).map(([r, a]) => [`itemList.${r}`, a])
       )
-    }), await ye.addEntities(
+    }), await fe.addEntities(
       e,
-      R(t).filter(([, r]) => r > 0).map(([r]) => r)
+      C(t).filter(([, r]) => r > 0).map(([r]) => r)
     );
   }
   async removeItem(e, t, r) {
@@ -2189,7 +2151,7 @@ class dr extends f {
   async addEquipments(e, t) {
     await this.update(e, {
       $push: { equipmentList: { $each: t } }
-    }), await ye.addEntities(
+    }), await fe.addEntities(
       e,
       t.map((r) => r.entityId)
     );
@@ -2208,23 +2170,23 @@ class dr extends f {
     r?.equipmentSave[t] && await this.equip(e, r.equipmentSave[t]);
   }
   async equip(e, t) {
-    const r = await U.getMaxHp(e), a = Object.fromEntries(
-      R(t).map(([s, i]) => [
+    const r = await I.getMaxHp(e), a = Object.fromEntries(
+      C(t).map(([s, i]) => [
         `equippedItems.${s}`,
         i
       ])
     );
     await this.update(e, {
       $set: a
-    }), await U.updateHp(e, r);
+    }), await I.updateHp(e, r);
   }
   async unequip(e, t) {
-    const r = await U.getMaxHp(e);
+    const r = await I.getMaxHp(e);
     await this.update(e, {
       $set: {
         [`equippedItems.${t}`]: null
       }
-    }), await U.updateHp(e, r);
+    }), await I.updateHp(e, r);
   }
   async craftItem(e, t, r, a) {
     for (const { entityId: o, size: c } of t.entities)
@@ -2238,30 +2200,30 @@ class dr extends f {
       await d.isEntityId(i, d.isItem) && await this.addItem(e, i, a * o);
     await this.removeItem(e, "tools", 1);
   }
-  async enchantItem(e, t, r, a) {
-    await this.removeItem(e, t, a * 4), await this.removeItem(e, "enchanted_stone", a), await this.addItem(e, r, a);
+  async enchantItem(e, t, r, a, s) {
+    await this.removeItem(e, t, s * 4), await this.removeItem(e, a, s), await this.addItem(e, r, s);
   }
   async unlockRecipe(e, t) {
     await this.update(e, { $addToSet: { recipes: t } });
   }
 }
-const lr = (n) => te.create({
+const pr = (n) => ne.create({
   user: n
 });
-async function pr(n) {
-  const e = await te.findOne({ user: n }).lean();
-  return e || y(await lr(n));
+async function yr(n) {
+  const e = await ne.findOne({ user: n }).lean();
+  return e || y(await pr(n));
 }
-const yr = (n, e) => te.findOneAndUpdate({ user: n }, e, {
+const fr = (n, e) => ne.findOneAndUpdate({ user: n }, e, {
   upsert: !0,
   returnDocument: "after"
 }).lean();
-class fr extends dr {
+class mr extends lr {
   constructor() {
     super(300);
   }
   fetchFromDb(e) {
-    return pr(e);
+    return yr(e);
   }
   normalizeKey(e) {
     return e.toString();
@@ -2270,19 +2232,17 @@ class fr extends dr {
     return e;
   }
   updateInDb(e, t) {
-    return yr(e, t);
+    return fr(e, t);
   }
 }
-const w = new fr();
-class mr extends b {
-  getTotalCharacteristics({
-    characteristics: e,
-    scrolls: t
-  }) {
-    return Ae(
-      $t.map((r) => [
-        r,
-        Et(e[r]) + t[r]
+const w = new mr();
+class hr extends b {
+  async getTotalCharacteristics(e) {
+    const { characteristics: t, scrolls: r } = await this.get(e);
+    return Be(
+      Et.map((a) => [
+        a,
+        Ut(t[a]) + r[a]
       ])
     );
   }
@@ -2334,7 +2294,7 @@ class mr extends b {
       t.booster ? 0.25 : 0
     );
     return a + s + t.buffs.xp.global.reduce(
-      (i, { expireAt: o, startAt: c, multiplier: S }) => c && c > /* @__PURE__ */ new Date() || o && L(o) ? i : i + S,
+      (i, { expireAt: o, startAt: c, multiplier: S }) => c && c > /* @__PURE__ */ new Date() || o && Q(o) ? i : i + S,
       0
     );
   }
@@ -2356,82 +2316,49 @@ class mr extends b {
   }
   async calcBuffMultiplier(e, t, r) {
     return (await this.get(e)).buffs[t][r].reduce(
-      (i, { expireAt: o, startAt: c, multiplier: S }) => i + (/* @__PURE__ */ new Date() >= (c ?? /* @__PURE__ */ new Date()) && (!o || !L(o)) ? S : 0),
+      (i, { expireAt: o, startAt: c, multiplier: S }) => i + (/* @__PURE__ */ new Date() >= (c ?? /* @__PURE__ */ new Date()) && (!o || !Q(o)) ? S : 0),
       1
     );
   }
   async getMaxHp(e) {
-    const t = await this.get(e), r = await w.get(e), { vitality: a } = this.getTotalCharacteristics(t), s = await w.getUserEquipmentsCharacteristics(
-      r
+    const t = await w.get(e), { vitality: r } = await this.getTotalCharacteristics(e), a = await w.getUserEquipmentsCharacteristics(
+      t
     );
-    return (a + s.vitality) * Ut + Dt;
+    return (r + a.vitality) * Dt + Ot;
   }
   async getHpRatio(e) {
     const t = await this.get(e), r = await this.getMaxHp(e);
     return Math.min(t.hp / r, 1);
   }
   async hasCharacteristicRequirement(e, t) {
-    const r = await this.get(e), a = await w.get(e), s = await w.getUserEquipmentsCharacteristics(
-      a
-    ), i = F(
-      this.getTotalCharacteristics(r),
-      s,
-      (o, c) => o + c
+    const r = await w.get(e), a = await w.getUserEquipmentsCharacteristics(
+      r
+    ), s = j(
+      await this.getTotalCharacteristics(e),
+      a,
+      (i, o) => i + o
     );
     if ("sum" in t) {
-      let o = 0;
-      for (const c of t.characteristics)
-        o += i[c] ?? 0;
-      return o >= t.sum;
+      let i = 0;
+      for (const o of t.characteristics)
+        i += s[o] ?? 0;
+      return i >= t.sum;
     } else {
-      for (const o of Object.keys(
+      for (const i of Object.keys(
         t
       ))
-        if (i[o] < (t[o] ?? 0))
+        if (s[i] < (t[i] ?? 0))
           return !1;
       return !0;
     }
   }
-  async getGlobalRank(e) {
-    return (await O.aggregate([
-      {
-        $setWindowFields: {
-          sortBy: { "xp.amount": -1 },
-          output: {
-            rank: { $rank: {} }
-          }
-        }
-      },
-      { $match: { user: e } },
-      { $project: { rank: 1 } }
-    ]))[0];
-  }
-  async getBerryRank(e) {
-    return (await O.aggregate([
-      {
-        $setWindowFields: {
-          sortBy: { berry: -1 },
-          output: {
-            rank: { $rank: {} }
-          }
-        }
-      },
-      { $match: { user: e } },
-      { $project: { rank: 1 } }
-    ]))[0];
-  }
   async hasMalusBuff(e) {
-    const t = await this.get(e), r = [
-      ...t.buffs.xp.global,
-      ...t.buffs.berry.global,
-      ...t.buffs.berry.work,
-      ...t.buffs.cooldown.work,
-      ...t.buffs.cooldown.casino,
-      ...t.buffs.drop.work
-    ];
-    for (const { multiplier: a, startAt: s, expireAt: i } of r)
-      if (a < 0 && (!i || !L(i)) && (s ?? /* @__PURE__ */ new Date()) <= /* @__PURE__ */ new Date())
-        return !0;
+    const t = await this.get(e);
+    for (const r of Object.values(t.buffs))
+      for (const a of Object.values(r))
+        for (const { multiplier: s, startAt: i, expireAt: o } of a)
+          if (s < 0 && (!o || !Q(o)) && (i ?? /* @__PURE__ */ new Date()) <= /* @__PURE__ */ new Date())
+            return !0;
     return !1;
   }
   /*
@@ -2581,15 +2508,15 @@ class mr extends b {
     });
   }
   async updatePanoplyBuff(e, t, r, a) {
-    const s = await d.fromDBToEquipableEquipment(t), i = N(Object.values(r)), c = (await I.getAllPopulated()).find(
-      (D) => D.panoplyId === s.panoply
+    const s = await d.fromDBToEquipableEquipment(t), i = F(Object.values(r)), c = (await U.getAllPopulated()).find(
+      (O) => O.panoplyId === s.panoply
     );
     if (!c)
       return;
     const S = c.equipments.filter(
-      (D) => (i.find((P) => D.entityId === P.entityId) || !a && s.entityId === D.entityId) && (a ? s.entityId !== D.entityId : !0)
-    ).length, x = S === c.equipments.length ? c.fullBonus : S >= c.equipments.length / 2 ? c.halfBonus : void 0;
-    c.halfBonus && "target" in c.halfBonus && await this.removeBuff(e, c.halfBonus), c.fullBonus && "target" in c.fullBonus && await this.removeBuff(e, c.fullBonus), x && "target" in x && await this.updateBuff(e, x);
+      (O) => (i.find((H) => O.entityId === H.entityId) || !a && s.entityId === O.entityId) && (a ? s.entityId !== O.entityId : !0)
+    ).length, k = S === c.equipments.length ? c.fullBonus : S >= c.equipments.length / 2 ? c.halfBonus : void 0;
+    c.halfBonus && "target" in c.halfBonus && await this.removeBuff(e, c.halfBonus), c.fullBonus && "target" in c.fullBonus && await this.removeBuff(e, c.fullBonus), k && "target" in k && await this.updateBuff(e, k);
   }
   async gainHp(e, t) {
     const r = await this.get(e), s = await this.getMaxHp(e) - r.hp;
@@ -2692,34 +2619,34 @@ class mr extends b {
     });
   }
   async updateUserXp(e, t) {
-    const r = await ar.get(e), a = r?.percent ?? 0, s = await this.calcXp(
+    const r = await sr.get(e), a = r?.percent ?? 0, s = await this.calcXp(
       e,
       t,
       (1 - a) * await this.getHpRatio(e)
     );
     let i = 0;
-    return await this.addXp(e, s), r && (i = await Re.calcXp(
+    return await this.addXp(e, s), r && (i = await ve.calcXp(
       r.crew,
       t * a
-    ), await Re.addXp(r.crew, i)), { userXp: s, crewXp: i };
+    ), await ve.addXp(r.crew, i)), { userXp: s, crewXp: i };
   }
   async updateUserBerry(e, t, r) {
     const a = await this.calcBerry(e, t, r);
     return await this.addBerry(e, a), a;
   }
 }
-const hr = (n) => O.find(n).lean(), wr = async (n) => await O.create({
+const wr = (n) => T.find(n).lean(), gr = async (n) => await T.create({
   user: n
 });
-async function gr(n) {
-  const e = await O.findOne({ user: n }).lean();
-  return e || y(await wr(n));
+async function Sr(n) {
+  const e = await T.findOne({ user: n }).lean();
+  return e || y(await gr(n));
 }
-const Sr = (n, e) => O.findOneAndUpdate({ user: n }, e, {
+const br = (n, e) => T.findOneAndUpdate({ user: n }, e, {
   returnDocument: "after",
   upsert: !0
 }).lean();
-class br extends mr {
+class $r extends hr {
   constructor() {
     super(300);
   }
@@ -2730,17 +2657,17 @@ class br extends mr {
     return e;
   }
   fetchFromDb(e) {
-    return gr(e);
+    return Sr(e);
   }
   fetchManyFromDb(e) {
-    return hr(e);
+    return wr(e);
   }
   updateInDb(e, t) {
-    return Sr(e, t);
+    return br(e, t);
   }
 }
-const U = new br();
-class $r extends b {
+const I = new $r();
+class Er extends b {
   async updateSendDailyQuest(e, t) {
     await this.update(e, { $set: { sendDailyQuest: t } });
   }
@@ -2759,18 +2686,18 @@ class $r extends b {
     });
   }
 }
-const Er = (n) => j.find(n).lean(), Ir = async (n) => await j.create({
+const Ur = (n) => z.find(n).lean(), Ir = async (n) => await z.create({
   user: n
 });
-async function Ur(n) {
-  const e = await j.findOne({ user: n }).lean();
+async function Dr(n) {
+  const e = await z.findOne({ user: n }).lean();
   return e || y(await Ir(n));
 }
-const Dr = (n, e) => j.findOneAndUpdate({ user: n }, e, {
+const Or = (n, e) => z.findOneAndUpdate({ user: n }, e, {
   returnDocument: "after",
   upsert: !0
 }).lean();
-class Tr extends $r {
+class Tr extends Er {
   constructor() {
     super(3600);
   }
@@ -2781,17 +2708,17 @@ class Tr extends $r {
     return e.user;
   }
   fetchFromDb(e) {
-    return Ur(e);
+    return Dr(e);
   }
   fetchManyFromDb(e) {
-    return Er(e);
+    return Ur(e);
   }
   updateInDb(e, t) {
-    return Dr(e, t);
+    return Or(e, t);
   }
 }
-const ve = new Tr();
-class Or extends f {
+const Ae = new Tr();
+class Rr extends f {
   async getCommandCooldown(e, t) {
     return (await this.get(e)).commands[t];
   }
@@ -2816,21 +2743,21 @@ class Or extends f {
           }
         }
       }
-    ]), await H.updateReminderDate(
+    ]), await L.updateReminderDate(
       e,
       "raid/special",
       -1 * t * 3600 * 1e3
-    ), await H.updateReminderDate(
+    ), await L.updateReminderDate(
       e,
       "raid/classic",
       -1 * t * 3600 * 1e3
     );
   }
   async startRaidCooldown(e, t, r) {
-    const { reminder: a } = await ve.get(e);
+    const { reminder: a } = await Ae.get(e);
     await this.update(e, {
       $set: { [`raid.${t}`]: new Date(Date.now() + r) }
-    }), a.raid[t] && await H.addReminder(
+    }), a.raid[t] && await L.addReminder(
       e,
       `raid/${t}`,
       new Date(Date.now() + r)
@@ -2841,33 +2768,33 @@ class Or extends f {
       $set: {
         lockUserCommand: new Date(Date.now() + 2 * 3600 * 1e3)
       }
-    }), await U.gainHp(e, 1);
+    }), await I.gainHp(e, 1);
   }
   async useCommand(e, t, r) {
-    const { reminder: a } = await ve.get(e);
+    const { reminder: a } = await Ae.get(e);
     await this.update(e, {
       $set: {
         [`commands.${t}`]: new Date(Date.now() + r)
       }
-    }), a.commands[t] && await H.addReminder(
+    }), a.commands[t] && await L.addReminder(
       e,
       `commands/${t}`,
       new Date(Date.now() + r)
     );
   }
 }
-const Cr = async (n) => await V.create({
+const Cr = async (n) => await J.create({
   user: n
 });
-async function Rr(n) {
-  const e = await V.findOne({ user: n }).lean();
+async function vr(n) {
+  const e = await J.findOne({ user: n }).lean();
   return e || y(await Cr(n));
 }
-const vr = (n, e) => V.findOneAndUpdate({ user: n }, e, {
+const Ar = (n, e) => J.findOneAndUpdate({ user: n }, e, {
   returnDocument: "after",
   upsert: !0
 }).lean();
-class Mr extends Or {
+class Mr extends Rr {
   constructor() {
     super(300);
   }
@@ -2878,14 +2805,14 @@ class Mr extends Or {
     return e.user;
   }
   fetchFromDb(e) {
-    return Rr(e);
+    return vr(e);
   }
   updateInDb(e, t) {
-    return vr(e, t);
+    return Ar(e, t);
   }
 }
-const Ar = new Mr();
-class Br extends f {
+const Br = new Mr();
+class xr extends f {
   async unlockTitle(e, t) {
     await g.isOrnamentIds([t], g.isTitle) && await this.update(e, { $addToSet: { unlockedTitles: t } });
   }
@@ -2954,18 +2881,18 @@ class Br extends f {
     });
   }
 }
-const _r = async (n) => await ne.create({
+const qr = async (n) => await re.create({
   user: n
 });
-async function xr(n) {
-  const e = await ne.findOne({ user: n }).lean();
-  return e || y(await _r(n));
+async function kr(n) {
+  const e = await re.findOne({ user: n }).lean();
+  return e || y(await qr(n));
 }
-const qr = async (n, e) => ne.findOneAndUpdate({ user: n }, e, {
+const _r = async (n, e) => re.findOneAndUpdate({ user: n }, e, {
   upsert: !0,
   returnDocument: "after"
 }).lean();
-class kr extends Br {
+class Nr extends xr {
   constructor() {
     super(300);
   }
@@ -2976,14 +2903,14 @@ class kr extends Br {
     return e;
   }
   fetchFromDb(e) {
-    return xr(e);
+    return kr(e);
   }
   updateInDb(e, t) {
-    return qr(e, t);
+    return _r(e, t);
   }
 }
-const G = new kr();
-class Nr extends b {
+const Y = new Nr();
+class Fr extends b {
   async getStatus(e, t) {
     return (await this.get({ user: e, questId: t })).status;
   }
@@ -2992,14 +2919,17 @@ class Nr extends b {
   }
   async isStreaking(e, t) {
     const { lastCompletionDate: r } = await this.get({ user: e, questId: t });
-    return !!r && fe(k(), r);
+    return !!r && me(N(), r);
   }
   async getStreakMultiplier(e, t) {
     const r = await this.get({ user: e, questId: t });
     return await this.isStreaking(e, t) ? 1 + Math.min(2, (r.streak ?? 0) / 10) : 1;
   }
+  async getCompletedCount(e) {
+    return (await this.getMany({ user: e, status: D.COMPLETED })).length;
+  }
   async completeQuest(e, t = !1) {
-    const r = k();
+    const r = N();
     r.setHours(0, 0, 0, 0);
     const a = /* @__PURE__ */ new Date();
     return a.setHours(0, 0, 0, 0), this.update(
@@ -3022,7 +2952,7 @@ class Nr extends b {
               }
             } : {},
             lastCompletionDate: /* @__PURE__ */ new Date(),
-            status: T.COMPLETED
+            status: D.COMPLETED
           }
         }
       ],
@@ -3030,24 +2960,24 @@ class Nr extends b {
     );
   }
 }
-function Fr(n) {
-  return B.find(n).lean();
+function jr(n) {
+  return x.find(n).lean();
 }
-const jr = async (n) => await B.create({
+const zr = async (n) => await x.create({
   ...n
 });
-async function zr(n) {
-  const e = await B.findOne(n).lean();
-  return e || y(await jr(n));
+async function Kr(n) {
+  const e = await x.findOne(n).lean();
+  return e || y(await zr(n));
 }
-function Kr(n, e, t) {
-  return B.findOneAndUpdate(n, e, {
+function Pr(n, e, t) {
+  return x.findOneAndUpdate(n, e, {
     upsert: !0,
     ...t,
     returnDocument: "after"
   }).lean();
 }
-class Pr extends Nr {
+class Hr extends Fr {
   constructor() {
     super(3600);
   }
@@ -3061,21 +2991,21 @@ class Pr extends Nr {
     return { user: e, questId: t };
   }
   fetchFromDb(e) {
-    return zr(e);
+    return Kr(e);
   }
   fetchManyFromDb(e) {
-    return Fr(e);
+    return jr(e);
   }
   updateInDb(e, t, r) {
-    return Kr(e, t, r);
+    return Pr(e, t, r);
   }
 }
-const Me = new Pr();
-class Hr extends f {
+const Me = new Hr();
+class Lr extends f {
   async updateDailyReport(e) {
-    const t = await U.get(e), r = await G.get(e), a = await Me.getMany({
+    const t = await I.get(e), r = await Y.get(e), a = await Me.getMany({
       user: e,
-      status: T.COMPLETED
+      status: D.COMPLETED
     });
     await this.update(e, {
       $set: {
@@ -3101,30 +3031,30 @@ class Hr extends f {
     } = t;
     if (s <= 0)
       return;
-    const o = await U.get(e), c = await Me.getMany({
+    const o = await I.get(e), c = await Me.getMany({
       user: e,
-      status: T.COMPLETED
-    }), S = await G.get(e), { berry: x, xp: D } = o, { voice: P, amount: rt } = D, { unlockedBadges: at, unlockedBackgrounds: st, unlockedTitles: it } = S;
+      status: D.COMPLETED
+    }), S = await Y.get(e), { berry: k, xp: O } = o, { voice: H, amount: at } = O, { unlockedBadges: st, unlockedBackgrounds: it, unlockedTitles: ut } = S;
     return {
-      berry: x - i,
-      xp: rt - s,
+      berry: k - i,
+      xp: at - s,
       // TODO
       // message: user.questMeta.messageSent - previousMessageSent,
-      voice: fe(P.lastConnection, k()) ? P.minutesInVoiceToday : 0,
-      quest: q(
-        c.map(({ questId: ut }) => ut),
+      voice: me(H.lastConnection, N()) ? H.minutesInVoiceToday : 0,
+      quest: _(
+        c.map(({ questId: ct }) => ct),
         a
       ),
-      badge: q(at, r.unlockedBadges),
-      title: q(it, r.unlockedTitles),
-      background: q(
-        st,
+      badge: _(st, r.unlockedBadges),
+      title: _(ut, r.unlockedTitles),
+      background: _(
+        it,
         r.unlockedBackgrounds
       )
     };
   }
   async getAllDailyReportsToSend() {
-    const e = await bn.getMany({
+    const e = await $n.getMany({
       "settings.sendDailyReport": !0,
       faction: { $ne: "citizen" }
     });
@@ -3137,18 +3067,18 @@ class Hr extends f {
     );
   }
 }
-const Lr = (n) => J.create({
+const Qr = (n) => Z.create({
   user: n
 });
-async function Qr(n) {
-  const e = await J.findOne({ user: n }).lean();
-  return e || y(await Lr(n));
+async function Wr(n) {
+  const e = await Z.findOne({ user: n }).lean();
+  return e || y(await Qr(n));
 }
-const Wr = (n, e) => J.findOneAndUpdate({ user: n }, e, {
+const Gr = (n, e) => Z.findOneAndUpdate({ user: n }, e, {
   upsert: !0,
   returnDocument: "after"
 }).lean();
-class Gr extends Hr {
+class Yr extends Lr {
   constructor() {
     super(60);
   }
@@ -3159,14 +3089,14 @@ class Gr extends Hr {
     return e.user;
   }
   fetchFromDb(e) {
-    return Qr(e);
+    return Wr(e);
   }
   updateInDb(e, t) {
-    return Wr(e, t);
+    return Gr(e, t);
   }
 }
-const Js = new Gr();
-class Yr extends f {
+const si = new Yr();
+class Xr extends f {
   async setGuessGame(e, t, r, a) {
     await this.update(e, {
       $set: {
@@ -3197,18 +3127,18 @@ class Yr extends f {
     });
   }
 }
-const Xr = async (n) => await ee.create({
+const Vr = async (n) => await te.create({
   user: n
 });
-async function Vr(n) {
-  const e = await ee.findOne({ user: n }).lean();
-  return e || y(await Xr(n));
+async function Jr(n) {
+  const e = await te.findOne({ user: n }).lean();
+  return e || y(await Vr(n));
 }
-const Jr = (n, e) => ee.findOneAndUpdate({ user: n }, e, {
+const Zr = (n, e) => te.findOneAndUpdate({ user: n }, e, {
   upsert: !0,
   returnDocument: "after"
 }).lean();
-class Zr extends Yr {
+class ea extends Xr {
   constructor() {
     super(300);
   }
@@ -3219,14 +3149,14 @@ class Zr extends Yr {
     return e;
   }
   fetchFromDb(e) {
-    return Vr(e);
+    return Jr(e);
   }
   updateInDb(e, t) {
-    return Jr(e, t);
+    return Zr(e, t);
   }
 }
-const Zs = new Zr();
-class ea extends f {
+const ii = new ea();
+class ta extends f {
   async hasUnlockedRaid(e, t) {
     return (await this.get(e)).unlocked?.[t];
   }
@@ -3260,7 +3190,7 @@ class ea extends f {
           rewards: {}
         }
       }
-    }), await Ar.startRaidCooldown(e, a, s), i;
+    }), await Br.startRaidCooldown(e, a, s), i;
   }
   async resetRaid(e) {
     await this.update(e, {
@@ -3293,7 +3223,7 @@ class ea extends f {
   async addRewardsToRaid(e, t) {
     await this.update(e, {
       $inc: Object.fromEntries(
-        R(t).filter(([r]) => r !== "title" && r !== "condition").map(([r, a]) => [`currentRaid.rewards.${r}`, a])
+        C(t).filter(([r]) => r !== "title" && r !== "condition").map(([r, a]) => [`currentRaid.rewards.${r}`, a])
       ),
       ...t.title ? { $set: { "currentRaid.rewards.title": t.title } } : {}
     });
@@ -3306,16 +3236,16 @@ class ea extends f {
     });
   }
 }
-const ta = (n) => re.create({
+const na = (n) => ae.create({
   user: n
-}), na = async (n) => {
-  const e = await re.findOne({ user: n }).lean();
-  return e || y(await ta(n));
-}, ra = (n, e) => re.findOneAndUpdate({ user: n }, e, {
+}), ra = async (n) => {
+  const e = await ae.findOne({ user: n }).lean();
+  return e || y(await na(n));
+}, aa = (n, e) => ae.findOneAndUpdate({ user: n }, e, {
   upsert: !0,
   returnDocument: "after"
 });
-class aa extends ea {
+class sa extends ta {
   constructor() {
     super(3600);
   }
@@ -3326,14 +3256,126 @@ class aa extends ea {
     return e;
   }
   fetchFromDb(e) {
-    return na(e);
+    return ra(e);
   }
   updateInDb(e, t) {
-    return ra(e, t);
+    return aa(e, t);
+  }
+}
+const ui = new sa(), ia = new u({
+  user: {
+    type: u.Types.ObjectId,
+    required: !0,
+    unique: !0,
+    ref: "User"
+  },
+  xp: { type: Number, default: 0 },
+  berry: { type: Number, default: 0 },
+  faction: { type: Number, default: 0 }
+}), v = l?.UserRank || p("UserRank", ia);
+class ua extends f {
+  async computeAllXpRanks() {
+    const t = (await T.aggregate([
+      {
+        $setWindowFields: {
+          sortBy: { "xp.amount": -1 },
+          output: { xpRank: { $rank: {} } }
+        }
+      },
+      { $project: { user: 1, xpRank: 1 } }
+    ])).map(({ user: r, xpRank: a }) => ({
+      updateOne: {
+        filter: { user: r },
+        update: { $set: { xp: a } },
+        upsert: !0
+      }
+    }));
+    t.length > 0 && await v.bulkWrite(t), this.clearAll();
+  }
+  async computeAllBerryRanks() {
+    const t = (await T.aggregate([
+      {
+        $setWindowFields: {
+          sortBy: { berry: -1 },
+          output: { berryRank: { $rank: {} } }
+        }
+      },
+      { $project: { user: 1, berryRank: 1 } }
+    ])).map(({ user: r, berryRank: a }) => ({
+      updateOne: {
+        filter: { user: r },
+        update: { $set: { berry: a } },
+        upsert: !0
+      }
+    }));
+    t.length > 0 && await v.bulkWrite(t), this.clearAll();
+  }
+  async computeAllFactionRanks() {
+    const t = (await $.aggregate([
+      {
+        $lookup: {
+          from: "usermetas",
+          localField: "_id",
+          foreignField: "user",
+          as: "meta"
+        }
+      },
+      { $unwind: "$meta" },
+      {
+        $setWindowFields: {
+          partitionBy: "$faction",
+          sortBy: { "meta.xp.amount": -1 },
+          output: { factionRank: { $rank: {} } }
+        }
+      },
+      { $project: { factionRank: 1 } }
+    ])).map(({ _id: r, factionRank: a }) => ({
+      updateOne: {
+        filter: { user: r },
+        update: { $set: { faction: a } },
+        upsert: !0
+      }
+    }));
+    t.length > 0 && await v.bulkWrite(t), this.clearAll();
+  }
+  async computeAllRanks() {
+    await Promise.all([
+      this.computeAllXpRanks(),
+      this.computeAllBerryRanks(),
+      this.computeAllFactionRanks()
+    ]);
   }
 }
-const ei = new aa();
-class sa extends f {
+const ca = async (n) => await v.create({
+  user: n
+});
+async function oa(n) {
+  const e = await v.findOne({ user: n }).lean();
+  return e || y(await ca(n));
+}
+const da = (n, e) => v.findOneAndUpdate({ user: n }, e, {
+  returnDocument: "after",
+  upsert: !0
+}).lean();
+class la extends ua {
+  constructor() {
+    super(300);
+  }
+  normalizeKey(e) {
+    return e.toString();
+  }
+  getKey(e) {
+    return e.user;
+  }
+  fetchFromDb(e) {
+    return oa(e);
+  }
+  updateInDb(e, t) {
+    return da(e, t);
+  }
+}
+const ci = new la();
+class pa extends f {
   async isBuyLimitReached(e, t, r) {
     const a = await d.getAllEntitiesLimit();
     if (await d.isEntityId(t, d.isEquipment))
@@ -3343,7 +3385,7 @@ class sa extends f {
     const c = await w.hasRevolutionaryBuff(e);
     return s.lastShopId !== r ? !1 : (c === "half" && t === "chest_2" && (o += 2), c === "full" && t === "chest_3" && (o += 1), !!(o && i && i >= o));
   }
-  async getShopItemRest(e, t, r, a = Ot) {
+  async getShopItemRest(e, t, r, a = Rt) {
     const s = await d.getAllEntitiesLimit();
     if (await d.isEntityId(t, d.isEquipment))
       return a;
@@ -3378,16 +3420,16 @@ class sa extends f {
     ]);
   }
 }
-const ia = async (n) => await ae.create({
+const ya = async (n) => await se.create({
   user: n
-}), ua = async (n) => {
-  const e = await ae.findOne({ user: n }).lean();
-  return e || y(await ia(n));
-}, ca = (n, e) => ae.findOneAndUpdate({ user: n }, e, {
+}), fa = async (n) => {
+  const e = await se.findOne({ user: n }).lean();
+  return e || y(await ya(n));
+}, ma = (n, e) => se.findOneAndUpdate({ user: n }, e, {
   upsert: !0,
   returnDocument: "after"
 }).lean();
-class oa extends sa {
+class ha extends pa {
   constructor() {
     super(300);
   }
@@ -3398,14 +3440,14 @@ class oa extends sa {
     return e;
   }
   fetchFromDb(e) {
-    return ua(e);
+    return fa(e);
   }
   updateInDb(e, t) {
-    return ca(e, t);
+    return ma(e, t);
   }
 }
-const ti = new oa();
-class da extends f {
+const oi = new ha();
+class wa extends f {
   async didSevenDoubleAtDoQ(e) {
     await this.update(e, {
       $inc: { "doubleOrQuit.sevenDoubleInARowCount": 1 }
@@ -3429,10 +3471,10 @@ class da extends f {
     await this.update(e, { $inc: { drawCount: 1 } });
   }
   async bet666(e) {
-    const t = k();
+    const t = N();
     t.setHours(0, 0, 0, 0);
     const r = /* @__PURE__ */ new Date();
-    r.setHours(0, 0, 0, 0), await v.updateOne(
+    r.setHours(0, 0, 0, 0), await A.updateOne(
       {
         user: e,
         "bet666.last": {
@@ -3441,7 +3483,7 @@ class da extends f {
         }
       },
       { $inc: { "bet666.count": 1 }, $set: { "bet666.last": /* @__PURE__ */ new Date() } }
-    ), await v.updateOne(
+    ), await A.updateOne(
       {
         user: e,
         "bet666.last": {
@@ -3484,18 +3526,18 @@ class da extends f {
     await this.update(e, { $inc: { "dice.drawWithDoubleSixCount": 1 } });
   }
 }
-const la = async (n) => await v.create({
+const ga = async (n) => await A.create({
   user: n
 });
-async function pa(n) {
-  const e = await v.findOne({ user: n }).lean();
-  return e || y(await la(n));
+async function Sa(n) {
+  const e = await A.findOne({ user: n }).lean();
+  return e || y(await ga(n));
 }
-const ya = (n, e) => v.findOneAndUpdate({ user: n }, e, {
+const ba = (n, e) => A.findOneAndUpdate({ user: n }, e, {
   upsert: !0,
   returnDocument: "after"
 }).lean();
-class fa extends da {
+class $a extends wa {
   constructor() {
     super(300);
   }
@@ -3506,14 +3548,14 @@ class fa extends da {
     return e;
   }
   fetchFromDb(e) {
-    return pa(e);
+    return Sa(e);
   }
   updateInDb(e, t) {
-    return ya(e, t);
+    return ba(e, t);
   }
 }
-const ni = new fa();
-class ma extends f {
+const di = new $a();
+class Ea extends f {
   async increaseXpGiven(e, t) {
     await this.update(e, {
       $inc: {
@@ -3535,18 +3577,18 @@ class ma extends f {
     t ? await this.update(e, { $set: { timeCrewAbove90PercentXp: 0 } }) : await this.update(e, { $inc: { timeCrewAbove90PercentXp: 1 } });
   }
 }
-const ha = async (n) => await se.create({
+const Ua = async (n) => await ie.create({
   user: n
 });
-async function wa(n) {
-  const e = await se.findOne({ user: n }).lean();
-  return e || y(await ha(n));
+async function Ia(n) {
+  const e = await ie.findOne({ user: n }).lean();
+  return e || y(await Ua(n));
 }
-const ga = (n, e) => se.findOneAndUpdate({ user: n }, e, {
+const Da = (n, e) => ie.findOneAndUpdate({ user: n }, e, {
   upsert: !0,
   returnDocument: "after"
 }).lean();
-class Sa extends ma {
+class Oa extends Ea {
   constructor() {
     super(300);
   }
@@ -3557,14 +3599,14 @@ class Sa extends ma {
     return e;
   }
   fetchFromDb(e) {
-    return wa(e);
+    return Ia(e);
   }
   updateInDb(e, t) {
-    return ga(e, t);
+    return Da(e, t);
   }
 }
-const ri = new Sa();
-class ba extends f {
+const li = new Oa();
+class Ta extends f {
   async workIncrement(e) {
     await this.update(e, { $inc: { workCount: 1 } });
   }
@@ -3576,18 +3618,18 @@ class ba extends f {
     });
   }
 }
-const $a = (n) => ie.create({
+const Ra = (n) => ue.create({
   user: n
 });
-async function Ea(n) {
-  const e = await ie.findOne({ user: n }).lean();
-  return e || y(await $a(n));
+async function Ca(n) {
+  const e = await ue.findOne({ user: n }).lean();
+  return e || y(await Ra(n));
 }
-const Ia = (n, e) => ie.findOneAndUpdate({ user: n }, e, {
+const va = (n, e) => ue.findOneAndUpdate({ user: n }, e, {
   upsert: !0,
   returnDocument: "after"
 }).lean();
-class Ua extends ba {
+class Aa extends Ta {
   constructor() {
     super(300);
   }
@@ -3598,14 +3640,14 @@ class Ua extends ba {
     return e;
   }
   fetchFromDb(e) {
-    return Ea(e);
+    return Ca(e);
   }
   updateInDb(e, t) {
-    return Ia(e, t);
+    return va(e, t);
   }
 }
-const Da = new Ua();
-class Ta extends f {
+const Ma = new Aa();
+class Ba extends f {
   async randomMessageIncrement(e) {
     await this.update(e, { $inc: { randomMessageClaimed: 1 } });
   }
@@ -3623,18 +3665,18 @@ class Ta extends f {
     await this.update(e, { $inc: { totalMinutesInVoice: t } });
   }
 }
-const Oa = async (n) => await ue.create({
+const xa = async (n) => await ce.create({
   user: n
 });
-async function Ca(n) {
-  const e = await ue.findOne({ user: n }).lean();
-  return e || y(await Oa(n));
+async function qa(n) {
+  const e = await ce.findOne({ user: n }).lean();
+  return e || y(await xa(n));
 }
-const Ra = (n, e) => ue.findOneAndUpdate({ user: n }, e, {
+const ka = (n, e) => ce.findOneAndUpdate({ user: n }, e, {
   upsert: !0,
   returnDocument: "after"
 }).lean();
-class va extends Ta {
+class _a extends Ba {
   constructor() {
     super(300);
   }
@@ -3647,14 +3689,14 @@ class va extends Ta {
     return e;
   }
   fetchFromDb(e) {
-    return Ca(e);
+    return qa(e);
   }
   updateInDb(e, t) {
-    return Ra(e, t);
+    return ka(e, t);
   }
 }
-const ai = new va();
-class Ma extends f {
+const pi = new _a();
+class Na extends f {
   async hasReportedSomeone(e) {
     await this.update(e, { $set: { reportedSomeone: !0 } });
   }
@@ -3685,18 +3727,18 @@ class Ma extends f {
     await this.update(e, { $set: { "gamblingFlags.lose10M": !0 } });
   }
 }
-const Aa = async (n) => await ce.create({
+const Fa = async (n) => await oe.create({
   user: n
 });
-async function Ba(n) {
-  const e = await ce.findOne({ user: n }).lean();
-  return e || y(await Aa(n));
+async function ja(n) {
+  const e = await oe.findOne({ user: n }).lean();
+  return e || y(await Fa(n));
 }
-const _a = (n, e) => ce.findOneAndUpdate({ user: n }, e, {
+const za = (n, e) => oe.findOneAndUpdate({ user: n }, e, {
   upsert: !0,
   returnDocument: "after"
 }).lean();
-class xa extends Ma {
+class Ka extends Na {
   constructor() {
     super(300);
   }
@@ -3707,14 +3749,14 @@ class xa extends Ma {
     return e;
   }
   fetchFromDb(e) {
-    return Ba(e);
+    return ja(e);
   }
   updateInDb(e, t) {
-    return _a(e, t);
+    return za(e, t);
   }
 }
-const si = new xa();
-class qa extends f {
+const yi = new Ka();
+class Pa extends f {
   async readEdito(e) {
     const t = /* @__PURE__ */ new Date();
     t.setHours(0, 0, 0, 0), await M.updateOne(
@@ -3741,18 +3783,18 @@ class qa extends f {
     ), this.invalidate(e);
   }
 }
-const ka = async (n) => await M.create({
+const Ha = async (n) => await M.create({
   user: n
 });
-async function Na(n) {
+async function La(n) {
   const e = await M.findOne({ user: n }).lean();
-  return e || y(await ka(n));
+  return e || y(await Ha(n));
 }
-const Fa = (n, e) => M.findOneAndUpdate({ user: n }, e, {
+const Qa = (n, e) => M.findOneAndUpdate({ user: n }, e, {
   upsert: !0,
   returnDocument: "after"
 }).lean();
-class ja extends qa {
+class Wa extends Pa {
   constructor() {
     super(300);
   }
@@ -3763,14 +3805,14 @@ class ja extends qa {
     return e;
   }
   fetchFromDb(e) {
-    return Na(e);
+    return La(e);
   }
   updateInDb(e, t) {
-    return Fa(e, t);
+    return Qa(e, t);
   }
 }
-const ii = new ja();
-class za extends f {
+const fi = new Wa();
+class Ga extends f {
   async updateCraftStats(e, t, r) {
     const a = await d.get(r);
     !a || !d.isItem(a) || await this.update(e, {
@@ -3793,7 +3835,7 @@ class za extends f {
   }
   async incrementBottleUsedToday(e, t) {
     const r = /* @__PURE__ */ new Date();
-    r.setHours(0, 0, 0, 0), await A.updateOne(
+    r.setHours(0, 0, 0, 0), await B.updateOne(
       {
         user: e,
         "bottle.lastUsed": {
@@ -3804,7 +3846,7 @@ class za extends f {
         $inc: { "bottle.usedToday": t },
         $set: { "bottle.lastUsed": /* @__PURE__ */ new Date() }
       }
-    ), await A.updateOne(
+    ), await B.updateOne(
       {
         user: e,
         "bottle.lastUsed": {
@@ -3830,18 +3872,18 @@ class za extends f {
     });
   }
 }
-const Ka = async (n) => await A.create({
+const Ya = async (n) => await B.create({
   user: n
 });
-async function Pa(n) {
-  const e = await A.findOne({ user: n }).lean();
-  return e || y(await Ka(n));
+async function Xa(n) {
+  const e = await B.findOne({ user: n }).lean();
+  return e || y(await Ya(n));
 }
-const Ha = (n, e) => A.findOneAndUpdate({ user: n }, e, {
+const Va = (n, e) => B.findOneAndUpdate({ user: n }, e, {
   upsert: !0,
   returnDocument: "after"
 }).lean();
-class La extends za {
+class Ja extends Ga {
   constructor() {
     super(300);
   }
@@ -3852,14 +3894,14 @@ class La extends za {
     return e;
   }
   fetchFromDb(e) {
-    return Pa(e);
+    return Xa(e);
   }
   updateInDb(e, t) {
-    return Ha(e, t);
+    return Va(e, t);
   }
 }
-const ui = new La();
-class Qa extends b {
+const mi = new Ja();
+class Za extends b {
   async maxCraftQuantity(e, t) {
     const r = await w.get(e);
     let a = 1 / 0;
@@ -3892,57 +3934,57 @@ class Qa extends b {
     return !!(await this.getAll()).find((r) => r.craftId === e);
   }
   async getRecipeResult(e, t) {
-    const r = await w.get(e), a = (await I.getPanoplyBonus(r.equippedItems)).find(
+    const r = await w.get(e), a = (await U.getPanoplyBonus(r.equippedItems)).find(
       ([s, i]) => s.panoplyId === "little_blacksmith" && i !== null
     );
     return a?.[1] === "full" && t === "chest_3" ? "chest_blacksmith_3" : a?.[1] === "half" && t === "chest_2" ? "chest_blacksmith_2" : a?.[1] === "half" && t === "chest_1" ? "chest_blacksmith_1" : t;
   }
 }
-const Wa = new u(
+const es = new u(
   {
     entityId: { type: String, required: !0 },
     size: { type: Number, required: !0 }
   },
   { _id: !1 }
-), Ga = new u(
+), ts = new u(
   {
     entityId: { type: String, required: !0 },
     size: { type: Number, required: !0 }
   },
   { _id: !1 }
-), Ya = new u(
+), ns = new u(
   {
     craftId: { type: String, unique: !0, required: !0 },
     name: { type: String, required: !0 },
-    entities: { type: [Wa], required: !0 },
-    result: { type: Ga, required: !0 }
+    entities: { type: [es], required: !0 },
+    result: { type: ts, required: !0 }
   },
   { minimize: !1 }
-), de = l?.Recipes || p("Recipes", Ya), Xa = async (n) => await de.create({
+), le = l?.Recipes || p("Recipes", ns), rs = async (n) => await le.create({
   ...n
-}), Va = async (n, e = {}) => de.find(n, e).lean();
-async function Ja(n) {
-  const e = await de.findOne({ craftId: n }).lean();
+}), as = async (n, e) => le.find(n, {}, e).lean();
+async function ss(n) {
+  const e = await le.findOne({ craftId: n }).lean();
   return e || null;
 }
-const Za = (n, e) => de.findOneAndUpdate(n, e, {
+const is = (n, e) => le.findOneAndUpdate(n, e, {
   returnDocument: "after"
 }).lean();
-class es extends Qa {
+class us extends Za {
   constructor() {
     super(3600);
   }
   createInDb(e) {
-    return Xa(e);
+    return rs(e);
   }
   updateInDb(e, t) {
-    return Za(e, t);
+    return is(e, t);
   }
   fetchFromDb(e) {
-    return Ja(e);
+    return ss(e);
   }
-  fetchManyFromDb(e) {
-    return Va(e);
+  fetchManyFromDb(e, t) {
+    return as(e, t);
   }
   normalizeKey(e) {
     return e;
@@ -3951,14 +3993,14 @@ class es extends Qa {
     return e.craftId;
   }
 }
-const ci = new es(), ts = new u({
+const hi = new us(), cs = new u({
   bannedUserId: { type: String, index: !0, required: !0 },
   authorId: { type: String, required: !0 },
   unbannedTimestamp: { type: Date, index: 1 },
   reason: { type: String, required: !0 },
   guildId: { type: String, required: !0 }
-}), le = l?.Bans || p("Bans", ts), ns = (n, e) => le.deleteOne({ bannedUserId: n, guildId: e });
-class rs extends b {
+}), pe = l?.Bans || p("Bans", cs), os = (n, e) => pe.deleteOne({ bannedUserId: n, guildId: e });
+class ds extends b {
   async getUnbanUsers() {
     return this.getMany({
       unbannedTimestamp: { $lte: /* @__PURE__ */ new Date(), $ne: null }
@@ -3972,14 +4014,14 @@ class rs extends b {
     return !!(r && (!r.unbannedTimestamp || r.unbannedTimestamp > /* @__PURE__ */ new Date()));
   }
   async deleteBan(e, t) {
-    await ns(e, t), this.invalidate({ bannedUserId: e, guildId: t });
+    await os(e, t), this.invalidate({ bannedUserId: e, guildId: t });
   }
 }
-const as = (n) => le.find(n).lean(), ss = (n) => le.findOne(n).lean(), is = (n, e) => le.findOneAndUpdate(n, e, {
+const ls = (n) => pe.find(n).lean(), ps = (n) => pe.findOne(n).lean(), ys = (n, e) => pe.findOneAndUpdate(n, e, {
   returnDocument: "after",
   upsert: !0
 }).lean();
-class us extends rs {
+class fs extends ds {
   constructor() {
     super(3600 * 36);
   }
@@ -3990,16 +4032,16 @@ class us extends rs {
     return { bannedUserId: e, guildId: t };
   }
   fetchFromDb(e) {
-    return ss(e);
+    return ps(e);
   }
   fetchManyFromDb(e) {
-    return as(e);
+    return ls(e);
   }
   updateInDb(e, t) {
-    return is(e, t);
+    return ys(e, t);
   }
 }
-const oi = new us(), cs = new u({
+const wi = new fs(), ms = new u({
   senderId: {
     type: u.Types.ObjectId,
     required: !0,
@@ -4016,35 +4058,36 @@ const oi = new us(), cs = new u({
   meta: {
     rps: { type: String, default: void 0 }
   }
-}), pe = l?.Invitation || p("Invitation", cs), os = (n) => pe.create({
+}), ye = l?.Invitation || p("Invitation", ms), hs = (n) => ye.create({
   ...n
-}), ds = async (n) => {
-  await pe.deleteMany({
+}), ws = async (n) => {
+  await ye.deleteMany({
     ...n
   });
 };
-class ls extends f {
+class gs extends f {
   async sendInvitation({
     senderId: e,
     receiverId: t,
     gameMode: r,
     ...a
   }) {
-    return await this.get({ senderId: e, gameMode: r, receiverId: t }) ? !1 : (await os({ ...a, senderId: e, gameMode: r, receiverId: t }), !0);
-  }
-  async receiveInvitation(e) {
-    return this.get(e);
+    return await this.get({ senderId: e, gameMode: r, receiverId: t }) ? null : await hs({ ...a, senderId: e, gameMode: r, receiverId: t });
   }
-  async deleteInvitation(e) {
-    await ds(e), this.invalidate(e);
+  async deleteInvitation({
+    senderId: e,
+    receiverId: t,
+    gameMode: r
+  }) {
+    await ws({ senderId: e, gameMode: r, receiverId: t }), this.invalidate({ senderId: e, gameMode: r, receiverId: t });
   }
 }
-const ps = (n) => pe.findOne({
+const Ss = (n) => ye.findOne({
   ...n
-}).lean(), ys = (n, e) => pe.findOneAndUpdate(n, e, {
+}).lean(), bs = (n, e) => ye.findOneAndUpdate(n, e, {
   returnDocument: "after"
 }).lean();
-class fs extends ls {
+class $s extends gs {
   constructor() {
     super(3600);
   }
@@ -4059,19 +4102,19 @@ class fs extends ls {
     return { gameMode: t, receiverId: e, senderId: r };
   }
   fetchFromDb(e) {
-    return ps(e);
+    return Ss(e);
   }
   updateInDb(e, t) {
-    return ys(e, t);
+    return bs(e, t);
   }
 }
-const di = new fs();
-class ms extends f {
+const gi = new $s();
+class Es extends f {
   async setEditoChannel(e, t) {
     await this.update({ guildId: e }, { $set: { "edito.channelId": t } });
   }
   async randomizeEditoPrice(e) {
-    const t = Y(100, 1001);
+    const t = X(100, 1001);
     return await this.update({ guildId: e }, { $set: { "edito.price": t } }), t;
   }
   async setEditoMessageId(e, t) {
@@ -4127,7 +4170,7 @@ class ms extends f {
     );
   }
 }
-const hs = new u({
+const Us = new u({
   guildId: { type: String, required: !0, unique: !0 },
   ranking: {
     channelId: { type: String, default: null },
@@ -4136,7 +4179,11 @@ const hs = new u({
   roles: {
     premium: { type: String, default: null },
     booster: { type: String, default: null },
-    scam: { type: String, default: null }
+    scam: { type: String, default: null },
+    factions: {
+      canChange: { type: String, default: null },
+      canChoose: { type: String, default: null }
+    }
   },
   channels: {
     gambling: { type: String, default: null },
@@ -4169,16 +4216,16 @@ const hs = new u({
     }
   },
   shopChannelId: { type: String, default: null }
-}), Ue = l?.Settings || p("Settings", hs), ws = (n) => Ue.create({
+}), De = l?.Settings || p("Settings", Us), Is = (n) => De.create({
   guildId: n
-}), gs = async (n) => {
-  const e = await Ue.findOne({ guildId: n }).lean();
-  return e || y(await ws(n));
-}, Ss = (n, e) => Ue.findOneAndUpdate(n, e, {
+}), Ds = async (n) => {
+  const e = await De.findOne({ guildId: n }).lean();
+  return e || y(await Is(n));
+}, Os = (n, e) => De.findOneAndUpdate(n, e, {
   upsert: !0,
   returnDocument: "after"
 }).lean();
-class bs extends ms {
+class Ts extends Es {
   constructor() {
     super(3600 * 24 * 30);
   }
@@ -4189,13 +4236,13 @@ class bs extends ms {
     return e;
   }
   fetchFromDb(e) {
-    return gs(e);
+    return Ds(e);
   }
   updateInDb(e, t) {
-    return Ss(e, t);
+    return Os(e, t);
   }
 }
-const li = new bs(), $s = new u(
+const Si = new Ts(), Rs = new u(
   {
     shopType: { type: String, required: !0, unique: !0 },
     publishedAt: { type: Date, default: /* @__PURE__ */ new Date() },
@@ -4224,11 +4271,11 @@ const li = new bs(), $s = new u(
     }
   },
   { minimize: !1 }
-), De = l?.Shop || p("Shop", $s), Es = (n) => De.create({
+), Oe = l?.Shop || p("Shop", Rs), Cs = (n) => Oe.create({
   shopType: n
-}), Is = async (n) => {
-  const e = await De.findOne({ shopType: n }).lean();
-  return e || y(await Es(n));
+}), vs = async (n) => {
+  const e = await Oe.findOne({ shopType: n }).lean();
+  return e || y(await Cs(n));
 };
 class E {
   toDBShopItem() {
@@ -4240,11 +4287,11 @@ class E {
     };
   }
   async onBuy(e, t) {
-    this.currency === "berry" ? (await U.updateUserBerry(
+    this.currency === "berry" ? (await I.updateUserBerry(
       e,
       -1 * this.price * t,
       !1
-    ), await Da.updateTotalSpentInShop(
+    ), await Ma.updateTotalSpentInShop(
       e,
       this.price * t
     )) : await w.removeItem(
@@ -4281,7 +4328,7 @@ class E {
     return !1;
   }
 }
-class Us extends E {
+class As extends E {
   price;
   size;
   currency;
@@ -4295,13 +4342,13 @@ class Us extends E {
     super(), this.data = t, this.price = e, this.size = r, this.currency = a;
   }
   async onBuy(e, t) {
-    await super.onBuy(e, t), await G.unlockBackground(e, this.data.ornamentId);
+    await super.onBuy(e, t), await Y.unlockBackground(e, this.data.ornamentId);
   }
   isBackground() {
     return !0;
   }
 }
-class Ds extends E {
+class Ms extends E {
   price;
   size;
   currency;
@@ -4321,7 +4368,7 @@ class Ds extends E {
     return !0;
   }
 }
-class Ts extends E {
+class Bs extends E {
   price;
   size;
   currency;
@@ -4341,7 +4388,7 @@ class Ts extends E {
     return !0;
   }
 }
-class Os extends E {
+class xs extends E {
   price;
   size;
   currency;
@@ -4361,7 +4408,7 @@ class Os extends E {
     return !0;
   }
 }
-class Cs extends E {
+class qs extends E {
   price;
   size;
   currency;
@@ -4377,7 +4424,7 @@ class Cs extends E {
   async onBuy(e, t) {
     await super.onBuy(e, t), await w.addEquipments(
       e,
-      ft({ stop: t }).map(
+      mt({ stop: t }).map(
         () => d.seedEquipment(
           { ...this.data },
           Date.now() - Math.round(Math.random() * 1e3)
@@ -4392,7 +4439,7 @@ class Cs extends E {
     return !0;
   }
 }
-class Rs extends E {
+class ks extends E {
   price;
   size;
   currency;
@@ -4412,7 +4459,7 @@ class Rs extends E {
     return !0;
   }
 }
-class vs extends E {
+class _s extends E {
   price;
   size;
   currency;
@@ -4432,7 +4479,7 @@ class vs extends E {
     return !0;
   }
 }
-class Ms extends E {
+class Ns extends E {
   price;
   size;
   currency;
@@ -4452,7 +4499,7 @@ class Ms extends E {
     return !0;
   }
 }
-class As extends E {
+class Fs extends E {
   price;
   size;
   currency;
@@ -4466,36 +4513,36 @@ class As extends E {
     super(), this.data = t, this.price = e, this.size = r, this.currency = a;
   }
   async onBuy(e, t) {
-    await super.onBuy(e, t), await G.unlockTitle(e, this.data.ornamentId);
+    await super.onBuy(e, t), await Y.unlockTitle(e, this.data.ornamentId);
   }
   isTitle() {
     return !0;
   }
 }
-class Bs extends f {
+class js extends f {
   async getShopItem(e, t) {
     const a = (await this.get(e)).items.find((S) => S.id === t);
     if (!a)
       return;
     const { price: s, size: i, currency: o } = a, c = await d.get(a.id) ?? await g.get(a.id);
     if (g.isOrnament(c) && g.isBackground(c))
-      return new Us({ price: s, item: c, size: i, currency: o });
-    if (g.isOrnament(c) && g.isTitle(c))
       return new As({ price: s, item: c, size: i, currency: o });
+    if (g.isOrnament(c) && g.isTitle(c))
+      return new Fs({ price: s, item: c, size: i, currency: o });
     if (d.isEntity(c) && d.isChestItem(c))
-      return new Ts({ price: s, item: c, size: i, currency: o });
+      return new Bs({ price: s, item: c, size: i, currency: o });
     if (d.isEntity(c) && d.isBoostItem(c))
-      return new Ds({ price: s, item: c, size: i, currency: o });
+      return new Ms({ price: s, item: c, size: i, currency: o });
     if (d.isEntity(c) && d.isRepairItem(c))
-      return new vs({ price: s, item: c, size: i, currency: o });
+      return new _s({ price: s, item: c, size: i, currency: o });
     if (d.isEntity(c) && d.isStoreItem(c))
-      return new Ms({ price: s, item: c, size: i, currency: o });
+      return new Ns({ price: s, item: c, size: i, currency: o });
     if (d.isEntity(c) && d.isObjectItem(c))
-      return new Os({ price: s, item: c, size: i, currency: o });
+      return new xs({ price: s, item: c, size: i, currency: o });
     if (d.isEntity(c) && d.isEquipment(c))
-      return new Cs({ price: s, item: c, size: i, currency: o });
+      return new qs({ price: s, item: c, size: i, currency: o });
     if (d.isEntity(c) && d.isBottleItem(c))
-      return new Rs({ price: s, size: i, item: c, currency: o });
+      return new ks({ price: s, size: i, item: c, currency: o });
   }
   async getShopItemList(e) {
     const t = await this.get(e), r = [];
@@ -4554,8 +4601,8 @@ class Bs extends f {
     );
   }
 }
-const _s = (n, e) => De.findOneAndUpdate(n, e, { upsert: !0, returnDocument: "after" }).lean();
-class xs extends Bs {
+const zs = (n, e) => Oe.findOneAndUpdate(n, e, { upsert: !0, returnDocument: "after" }).lean();
+class Ks extends js {
   constructor() {
     super(3600);
   }
@@ -4566,28 +4613,28 @@ class xs extends Bs {
     return e;
   }
   fetchFromDb(e) {
-    return Is(e);
+    return vs(e);
   }
   updateInDb(e, t) {
-    return _s(e, t);
+    return zs(e, t);
   }
 }
-const pi = new xs(), qs = new u({
+const bi = new Ks(), Ps = new u({
   warnedUserId: { type: String, required: !0, index: !0 },
   authorId: String,
   date: { type: Date, default: Date.now() },
   reason: { type: String, default: null }
-}), nt = l?.Warn || p("Warn", qs), ks = (n) => nt.countDocuments(n);
-class Ns extends b {
+}), rt = l?.Warn || p("Warn", Ps), Hs = (n) => rt.countDocuments(n);
+class Ls extends b {
   getUserWarns(e) {
     return this.getMany({ warnedUserId: e });
   }
   getUserWarnCount(e) {
-    return ks({ warnedUserId: e });
+    return Hs({ warnedUserId: e });
   }
 }
-const Fs = (n) => nt.find(n).lean();
-class js extends Ns {
+const Qs = (n) => rt.find(n).lean();
+class Ws extends Ls {
   constructor() {
     super(300);
   }
@@ -4601,63 +4648,64 @@ class js extends Ns {
     throw new Error("Method not implemented.");
   }
   fetchManyFromDb(e) {
-    return Fs(e);
+    return Qs(e);
   }
   updateInDb() {
     throw new Error("Method not implemented.");
   }
 }
-const yi = new js(), fi = (n) => {
-  ct(n);
+const $i = new Ws(), Ei = (n) => {
+  ot(n);
 };
-class mi extends ot.ObjectId {
+class Ui extends dt.ObjectId {
 }
 export {
-  Vs as COOLDOWN_COMMANDS,
-  mi as ObjectId,
+  ai as COOLDOWN_COMMANDS,
+  Ui as ObjectId,
   h as QUEST_MIDDLEWARE_EVENT_NAME,
-  we as RAID_MIDDLEWARE_EVENT_NAME,
-  oi as banService,
-  fi as connectToServices,
-  Re as crewMetaService,
-  Ws as crewOrnamentsService,
-  Gs as crewQuestService,
-  At as crewService,
-  Ys as crewStatsEngagementService,
-  Xs as crewStatsFrequencyService,
+  ge as RAID_MIDDLEWARE_EVENT_NAME,
+  wi as banService,
+  Ei as connectToServices,
+  ve as crewMetaService,
+  ei as crewOrnamentsService,
+  ti as crewQuestService,
+  Bt as crewService,
+  ni as crewStatsEngagementService,
+  ri as crewStatsFrequencyService,
   m as emitQuestMiddlewareEvent,
-  he as emitRaidMiddlewareEvent,
+  we as emitRaidMiddlewareEvent,
   d as entityService,
-  Is as findShop,
-  di as invitationService,
+  vs as findShop,
+  gi as invitationService,
   g as ornamentService,
-  I as panoplyService,
-  ci as recipeService,
-  Ls as registerQuestMiddlewareEvents,
-  Qs as registerRaidMiddlewareEvents,
-  H as reminderService,
-  li as settingsService,
-  De as shopModel,
-  pi as shopService,
-  Ar as userCooldownService,
-  ar as userCrewService,
-  Js as userDailyReportService,
-  ye as userEncyclopediaService,
-  Zs as userGamesService,
+  U as panoplyService,
+  hi as recipeService,
+  Js as registerQuestMiddlewareEvents,
+  Zs as registerRaidMiddlewareEvents,
+  L as reminderService,
+  Si as settingsService,
+  Oe as shopModel,
+  bi as shopService,
+  Br as userCooldownService,
+  sr as userCrewService,
+  si as userDailyReportService,
+  fe as userEncyclopediaService,
+  ii as userGamesService,
   w as userInventoryService,
-  U as userMetaService,
-  G as userOrnamentService,
+  I as userMetaService,
+  Y as userOrnamentService,
   Me as userQuestService,
-  ei as userRaidService,
-  bn as userService,
-  ve as userSettingsService,
-  ti as userShopService,
-  ni as userStatsCasinoService,
-  ri as userStatsCrewService,
-  Da as userStatsEconomyService,
-  ai as userStatsEngagementService,
-  si as userStatsFlagsService,
-  ii as userStatsFrequencyService,
-  ui as userStatsInventoryService,
-  yi as warnService
+  ui as userRaidService,
+  ci as userRankService,
+  $n as userService,
+  Ae as userSettingsService,
+  oi as userShopService,
+  di as userStatsCasinoService,
+  li as userStatsCrewService,
+  Ma as userStatsEconomyService,
+  pi as userStatsEngagementService,
+  yi as userStatsFlagsService,
+  fi as userStatsFrequencyService,
+  mi as userStatsInventoryService,
+  $i as warnService
 };