@opfr/services 1.1.4 → 1.2.0

package/dist/index.es.js

@@ -1,5 +1,5 @@
 import { Schema as u, models as l, model as p, connect as ut, Types as ct } from "mongoose";
-import { randomBetween as Y, hasExpire as L, sameDay as ye, yesterday as k, capitalizeAllWords as ot, filterNullAndUndefined as N, pickFrom as dt, shuffle as Te, recordToArray as C, arrayToRecord as Me, mergeObjects as F, exclude as q, groupBy as lt, sortBy as De, seededRandom as pt, range as yt } from "@opfr/utils-lang";
+import { randomBetween as Y, hasExpire as L, sameDay as ye, yesterday as k, capitalizeAllWords as ot, filterNullAndUndefined as N, pickFrom as dt, shuffle as Te, recordToArray as R, arrayToRecord as ve, mergeObjects as F, exclude as q, groupBy as lt, sortBy as De, seededRandom as pt, range as yt } from "@opfr/utils-lang";
 import ft from "node-cache";
 import { CREW_DEFAULT_DISINTEGRATION as Ae, CREW_DEFAULT_MEMBER_LIMIT as mt, QuestStatus as D, CREW_DEFAULT_XP_PERCENT as ht, DEFAULT_FACTION as wt, RANK_IDS_WITHOUT_BASIC as Oe, EQUIPMENT_SLOT as Be, EQUIPMENT_FROM_SLOT_TO_TYPE as gt, EFFECT_KEYS as St, CHARACTERISTICS as bt, getComputedCharacteristicValue as $t, getCurrentLevel as Et, HP_PER_VITALITY as Ut, DEFAULT_MAX_HP as It, transformToDBBuff as Tt, SHOP_DEFAULT_AVAILABLE_ENTITY_AMOUNT as Dt } from "@opfr/definitions";
 import * as fe from "events";
@@ -54,7 +54,7 @@ class b extends f {
 }
 const _e = new fe.EventEmitter(), m = (n, e, t) => {
   _e.emit(n, e, t);
-}, _s = (n) => {
+}, xs = (n) => {
   for (const [e, t] of Object.entries(n))
     _e.on(e, (a, r) => {
       t(a, r);
@@ -81,7 +81,7 @@ const _e = new fe.EventEmitter(), m = (n, e, t) => {
   USER_STATS_INVENTORY: "middleware/quest/USER_STATS_INVENTORY"
 }, xe = new fe.EventEmitter(), me = (n, e, t) => {
   xe.emit(n, e, t);
-}, xs = (n) => {
+}, qs = (n) => {
   for (const [e, t] of Object.entries(n))
     xe.on(e, (a, r) => {
       t(a, r);
@@ -194,7 +194,7 @@ const Ct = async (n) => {
 }, Rt = (n, e) => W.findOneAndUpdate({ _id: n }, e, {
   returnDocument: "after"
 }).lean();
-class vt extends Ot {
+class Mt extends Ot {
   constructor() {
     super(3600);
   }
@@ -211,17 +211,17 @@ class vt extends Ot {
     return Rt(e, t);
   }
 }
-const Mt = new vt();
+const vt = new Mt();
 class At extends f {
   async hasXpBuff(e) {
     const t = await this.get(e);
     if (!L(t.buffs.xp.expireAt))
-      return t.buffs.xp.boost;
+      return t.buffs.xp;
   }
   async calcXp(e, t) {
-    const a = await Mt.get(e);
+    const a = await vt.get(e);
     return a ? Math.ceil(
-      t * (a.disintegration / Ae) * (await this.hasXpBuff(e) ?? 1)
+      t * (a.disintegration / Ae) * ((await this.hasXpBuff(e))?.boost ?? 1)
     ) : 0;
   }
   async addXp(e, t) {
@@ -299,10 +299,10 @@ const we = l?.CrewMeta || p("CrewMeta", ke), Bt = async (n) => await we.create({
   crew: n
 });
 async function _t(n) {
-  const e = await we.findOne({ user: n }).lean();
+  const e = await we.findOne({ crew: n }).lean();
   return e || y(await Bt(n));
 }
-const xt = (n, e) => we.findOneAndUpdate({ user: n }, e, {
+const xt = (n, e) => we.findOneAndUpdate({ crew: n }, e, {
   returnDocument: "after",
   upsert: !0
 }).lean();
@@ -377,7 +377,7 @@ class zt extends kt {
     return jt(e, t);
   }
 }
-const qs = new zt();
+const ks = new zt();
 class Pt extends b {
   async getStatus(e, t) {
     return (await this.get({ crew: e, questId: t })).status;
@@ -470,7 +470,7 @@ class Wt extends Pt {
     return Qt(e, t, a);
   }
 }
-const ks = new Wt();
+const Ns = new Wt();
 class Gt extends f {
   async setActualVoiceMembers(e, t) {
     await this.update(e, {
@@ -541,7 +541,7 @@ class Jt extends Gt {
     return Vt(e, t);
   }
 }
-const Ns = new Jt();
+const Fs = new Jt();
 class Zt extends f {
 }
 const ze = new u({
@@ -591,7 +591,7 @@ class an extends Zt {
     return nn(e, t);
   }
 }
-const Fs = new an(), Pe = new u(
+const js = new an(), Pe = new u(
   {
     user: {
       type: u.Types.ObjectId,
@@ -743,7 +743,7 @@ He.post("findOneAndUpdate", function(n) {
 });
 const te = l?.UserInventory || p("UserInventory", He), on = new fe.EventEmitter(), dn = (n, e) => {
   on.emit(n, e);
-}, O = {
+}, C = {
   multiplier: { type: Number, default: 0 },
   origin: String,
   expireAt: { type: Date, default: null },
@@ -771,33 +771,33 @@ const te = l?.UserInventory || p("UserInventory", He), on = new fe.EventEmitter(
   buffs: {
     cooldown: {
       casino: {
-        type: [O],
+        type: [C],
         default: []
       },
       work: {
-        type: [O],
+        type: [C],
         default: []
       }
     },
     berry: {
       work: {
-        type: [O],
+        type: [C],
         default: []
       },
       global: {
-        type: [O],
+        type: [C],
         default: []
       }
     },
     drop: {
       work: {
-        type: [O],
+        type: [C],
         default: []
       }
     },
     xp: {
       global: {
-        type: [O],
+        type: [C],
         default: []
       }
     }
@@ -832,7 +832,7 @@ Le.post("findOneAndUpdate", async function(n) {
     n
   ), n.hp <= 0 && dn("death", n.user._id);
 });
-const R = l?.UserMeta || p("UserMeta", Le), Qe = new u({
+const O = l?.UserMeta || p("UserMeta", Le), Qe = new u({
   user: {
     type: u.Types.ObjectId,
     required: !0,
@@ -967,7 +967,7 @@ Ge.post("findOneAndUpdate", function(n) {
     n
   );
 });
-const v = l?.UserStatsCasino || p("UserStatsCasino", Ge), Ye = new u({
+const M = l?.UserStatsCasino || p("UserStatsCasino", Ge), Ye = new u({
   user: {
     type: u.Types.ObjectId,
     required: !0,
@@ -1071,7 +1071,7 @@ Ze.post("findOneAndUpdate", function(n) {
     n
   );
 });
-const M = l?.UserStatsFrequency || p(
+const v = l?.UserStatsFrequency || p(
   "UserStatsFrequency",
   Ze
 ), et = new u({
@@ -1123,7 +1123,7 @@ $e.post("findOneAndUpdate", function(n) {
 });
 $e.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 R.deleteOne({ user: n }), await ne.deleteOne({ user: n }), await B.deleteMany({ user: n }), await ae.deleteOne({ user: n }), await j.deleteOne({ user: n }), await re.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 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 ae.deleteOne({ user: n }), await j.deleteOne({ user: n }), await re.deleteOne({ user: n }), await M.deleteOne({ user: n }), await se.deleteOne({ user: n }), await ie.deleteOne({ user: n }), await ue.deleteOne({ user: n }), await ce.deleteOne({ user: n }), await v.deleteOne({ user: n }), await A.deleteOne({ user: n });
 });
 const $ = l?.User || p("User", $e);
 class yn extends b {
@@ -1383,7 +1383,7 @@ class gn extends yn {
     return wn(e, t);
   }
 }
-const Sn = new gn(), js = [
+const Sn = new gn(), zs = [
   "work",
   "rps",
   "blackjack",
@@ -1558,8 +1558,8 @@ const Rn = new u(
     strength: Number
   },
   { minimize: !1 }
-), Ee = l?.Ornaments || p("Ornaments", Rn), vn = async (n, e = {}) => Ee.find(n, e).lean();
-async function Mn(n) {
+), Ee = l?.Ornaments || p("Ornaments", Rn), Mn = async (n, e = {}) => Ee.find(n, e).lean();
+async function vn(n) {
   const e = await Ee.findOne({ ornamentId: n }).lean();
   return e || null;
 }
@@ -1574,10 +1574,10 @@ class Bn extends Cn {
     return An(e, t);
   }
   fetchFromDb(e) {
-    return Mn(e);
+    return vn(e);
   }
   fetchManyFromDb(e) {
-    return vn(e);
+    return Mn(e);
   }
   getKey(e) {
     return e.ornamentId;
@@ -1695,14 +1695,14 @@ class Pn extends b {
   }
   async recordToEntityTuple(e) {
     const t = await this.getAll();
-    return C(e).reduce((a, [r, s]) => {
+    return R(e).reduce((a, [r, s]) => {
       const i = t.find(({ entityId: o }) => o === r);
       return i && a.push([i, s]), a;
     }, []);
   }
   async getAllEntitiesLimit() {
     const e = await this.getAll();
-    return Me(
+    return ve(
       e.map((t) => [t.entityId, t.shop?.limit ?? 0])
     );
   }
@@ -1816,7 +1816,7 @@ class Pn extends b {
   }
   seedEquipment(e, t) {
     const a = pt(t), r = De(
-      C(e.characteristics),
+      R(e.characteristics),
       ([s]) => s
     );
     return {
@@ -2001,7 +2001,7 @@ class Jn extends b {
     return this.cache.set(t, r), r.map(({ user: s }) => s);
   }
 }
-const Zn = (n) => _.find(n).lean(), ea = (n) => _.findOne({ user: n }).lean(), ta = (n, e) => _.findOneAndUpdate({ user: n }, e).lean();
+const Zn = (n) => _.find(n).lean(), ea = (n) => _.findOne({ user: n }).lean(), ta = (n, e) => _.findOneAndUpdate({ user: n }, e, { returnDocument: "after" }).lean();
 class na extends Jn {
   constructor() {
     super(300);
@@ -2121,7 +2121,7 @@ class oa extends f {
     return !0;
   }
   hasInventoryRequirements(e, t) {
-    return C(t).reduce(
+    return R(t).reduce(
       (a, [r, s]) => a && (e.itemList[r] ?? 0) >= (s ?? 0),
       !0
     );
@@ -2179,7 +2179,7 @@ class oa extends f {
       )
     }), await pe.addEntities(
       e,
-      C(t).filter(([, a]) => a > 0).map(([a]) => a)
+      R(t).filter(([, a]) => a > 0).map(([a]) => a)
     );
   }
   async removeItem(e, t, a) {
@@ -2197,7 +2197,7 @@ class oa extends f {
     await this.update(e, {
       $pull: {
         equipmentList: {
-          id: t,
+          entityId: t,
           seed: a
         }
       }
@@ -2229,7 +2229,7 @@ class oa extends f {
   }
   async equip(e, t) {
     const a = await I.getMaxHp(e), r = Object.fromEntries(
-      C(t).map(([s, i]) => [
+      R(t).map(([s, i]) => [
         `equippedItems.${s}`,
         i
       ])
@@ -2294,12 +2294,12 @@ class ya extends oa {
   }
 }
 const S = new ya();
-class fa extends f {
+class fa extends b {
   getTotalCharacteristics({
     characteristics: e,
     scrolls: t
   }) {
-    return Me(
+    return ve(
       bt.map((a) => [
         a,
         $t(e[a]) + t[a]
@@ -2310,6 +2310,44 @@ class fa extends f {
     const t = await this.get(e);
     return Date.now() - t.xp.lastMessageWithXp.getTime() > 60 * 1e3;
   }
+  async getAllWithExpiredBuffs() {
+    const e = /* @__PURE__ */ new Date();
+    return this.getMany({
+      $or: [
+        { "xp.boost": { $lt: e } },
+        {
+          "buffs.cooldown.casino": {
+            $elemMatch: { expireAt: { $lt: e } }
+          }
+        },
+        {
+          "buffs.cooldown.work": {
+            $elemMatch: { expireAt: { $lt: e } }
+          }
+        },
+        {
+          "buffs.berry.work": {
+            $elemMatch: { expireAt: { $lt: e } }
+          }
+        },
+        {
+          "buffs.berry.global": {
+            $elemMatch: { expireAt: { $lt: e } }
+          }
+        },
+        {
+          "buffs.drop.work": {
+            $elemMatch: { expireAt: { $lt: e } }
+          }
+        },
+        {
+          "buffs.xp.global": {
+            $elemMatch: { expireAt: { $lt: e } }
+          }
+        }
+      ]
+    });
+  }
   async calcXpBoost(e) {
     const t = await this.get(e), { boost: a } = t.xp, r = a !== null && Date.now() < a.getTime() ? 0.2 : 0, s = Math.max(
       t.premium ? 0.5 : 0,
@@ -2375,7 +2413,7 @@ class fa extends f {
     }
   }
   async getGlobalRank(e) {
-    return (await R.aggregate([
+    return (await O.aggregate([
       {
         $setWindowFields: {
           sortBy: { "xp.amount": -1 },
@@ -2384,12 +2422,12 @@ class fa extends f {
           }
         }
       },
-      { $match: { _id: e } },
+      { $match: { user: e } },
       { $project: { rank: 1 } }
     ]))[0];
   }
   async getBerryRank(e) {
-    return (await R.aggregate([
+    return (await O.aggregate([
       {
         $setWindowFields: {
           sortBy: { berry: -1 },
@@ -2398,7 +2436,7 @@ class fa extends f {
           }
         }
       },
-      { $match: { _id: e } },
+      { $match: { user: e } },
       { $project: { rank: 1 } }
     ]))[0];
   }
@@ -2690,18 +2728,18 @@ class fa extends f {
     return await this.addBerry(e, r), r;
   }
 }
-const ma = async (n) => await R.create({
+const ma = (n) => O.find(n).lean(), ha = async (n) => await O.create({
   user: n
 });
-async function ha(n) {
-  const e = await R.findOne({ user: n }).lean();
-  return e || y(await ma(n));
+async function wa(n) {
+  const e = await O.findOne({ user: n }).lean();
+  return e || y(await ha(n));
 }
-const wa = (n, e) => R.findOneAndUpdate({ user: n }, e, {
+const ga = (n, e) => O.findOneAndUpdate({ user: n }, e, {
   returnDocument: "after",
   upsert: !0
 }).lean();
-class ga extends fa {
+class Sa extends fa {
   constructor() {
     super(300);
   }
@@ -2712,54 +2750,47 @@ class ga extends fa {
     return e;
   }
   fetchFromDb(e) {
-    return ha(e);
+    return wa(e);
+  }
+  fetchManyFromDb(e) {
+    return ma(e);
   }
   updateInDb(e, t) {
-    return wa(e, t);
+    return ga(e, t);
   }
 }
-const I = new ga();
-class Sa extends b {
+const I = new Sa();
+class ba extends b {
   async updateSendDailyQuest(e, t) {
-    await this.update(
-      { discordId: e },
-      { $set: { sendDailyQuest: t } }
-    );
+    await this.update(e, { $set: { sendDailyQuest: t } });
   }
   async updateSendDailyReport(e, t) {
-    await this.update(
-      { discordId: e },
-      { $set: { sendDailyReport: t } }
-    );
+    await this.update(e, { $set: { sendDailyReport: t } });
   }
   async updateInventorySort(e, t) {
-    await this.update({ discordId: e }, { $set: { "sort.inventory": t } });
+    await this.update(e, { $set: { "sort.inventory": t } });
   }
   async updateReminderSettings(e, t, a) {
-    await this.update(
-      { discordId: e },
-      { $set: { [`reminder.${t}`]: a } }
-    );
+    await this.update(e, { $set: { [`reminder.${t}`]: a } });
   }
   getUsersWithDailyReportEnable() {
     return this.getMany({
-      "settings.sendDailyReport": !0,
-      faction: { $ne: "citizen" }
+      sendDailyReport: !0
     });
   }
 }
-const ba = (n) => j.find(n).lean(), $a = async (n) => await j.create({
+const $a = (n) => j.find(n).lean(), Ea = async (n) => await j.create({
   user: n
 });
-async function Ea(n) {
+async function Ua(n) {
   const e = await j.findOne({ user: n }).lean();
-  return e || y(await $a(n));
+  return e || y(await Ea(n));
 }
-const Ua = (n, e) => j.findOneAndUpdate({ user: n }, e, {
+const Ia = (n, e) => j.findOneAndUpdate({ user: n }, e, {
   returnDocument: "after",
   upsert: !0
 }).lean();
-class Ia extends Sa {
+class Ta extends ba {
   constructor() {
     super(3600);
   }
@@ -2770,17 +2801,17 @@ class Ia extends Sa {
     return e.user;
   }
   fetchFromDb(e) {
-    return Ea(e);
+    return Ua(e);
   }
   fetchManyFromDb(e) {
-    return ba(e);
+    return $a(e);
   }
   updateInDb(e, t) {
-    return Ua(e, t);
+    return Ia(e, t);
   }
 }
-const Re = new Ia();
-class Ta extends f {
+const Re = new Ta();
+class Da extends f {
   async getCommandCooldown(e, t) {
     return (await this.get(e)).commands[t];
   }
@@ -2845,18 +2876,18 @@ class Ta extends f {
     );
   }
 }
-const Da = async (n) => await V.create({
+const Oa = async (n) => await V.create({
   user: n
 });
-async function Oa(n) {
+async function Ca(n) {
   const e = await V.findOne({ user: n }).lean();
-  return e || y(await Da(n));
+  return e || y(await Oa(n));
 }
-const Ca = (n, e) => V.findOneAndUpdate({ user: n }, e, {
+const Ra = (n, e) => V.findOneAndUpdate({ user: n }, e, {
   returnDocument: "after",
   upsert: !0
 }).lean();
-class Ra extends Ta {
+class Ma extends Da {
   constructor() {
     super(300);
   }
@@ -2867,14 +2898,14 @@ class Ra extends Ta {
     return e.user;
   }
   fetchFromDb(e) {
-    return Oa(e);
+    return Ca(e);
   }
   updateInDb(e, t) {
-    return Ca(e, t);
+    return Ra(e, t);
   }
 }
-const va = new Ra();
-class Ma extends f {
+const va = new Ma();
+class Aa extends f {
   async unlockTitle(e, t) {
     await g.isOrnamentIds([t], g.isTitle) && await this.update(e, { $addToSet: { unlockedTitles: t } });
   }
@@ -2943,18 +2974,18 @@ class Ma extends f {
     });
   }
 }
-const Aa = async (n) => await ne.create({
+const Ba = async (n) => await ne.create({
   user: n
 });
-async function Ba(n) {
+async function _a(n) {
   const e = await ne.findOne({ user: n }).lean();
-  return e || y(await Aa(n));
+  return e || y(await Ba(n));
 }
-const _a = async (n, e) => ne.findOneAndUpdate({ user: n }, e, {
+const xa = async (n, e) => ne.findOneAndUpdate({ user: n }, e, {
   upsert: !0,
   returnDocument: "after"
 }).lean();
-class xa extends Ma {
+class qa extends Aa {
   constructor() {
     super(300);
   }
@@ -2965,14 +2996,14 @@ class xa extends Ma {
     return e;
   }
   fetchFromDb(e) {
-    return Ba(e);
+    return _a(e);
   }
   updateInDb(e, t) {
-    return _a(e, t);
+    return xa(e, t);
   }
 }
-const G = new xa();
-class qa extends b {
+const G = new qa();
+class ka extends b {
   async getStatus(e, t) {
     return (await this.get({ user: e, questId: t })).status;
   }
@@ -3019,24 +3050,24 @@ class qa extends b {
     );
   }
 }
-function ka(n) {
+function Na(n) {
   return B.find(n).lean();
 }
-const Na = async (n) => await B.create({
+const Fa = async (n) => await B.create({
   ...n
 });
-async function Fa(n) {
+async function ja(n) {
   const e = await B.findOne(n).lean();
-  return e || y(await Na(n));
+  return e || y(await Fa(n));
 }
-function ja(n, e, t) {
+function za(n, e, t) {
   return B.findOneAndUpdate(n, e, {
     upsert: !0,
     ...t,
     returnDocument: "after"
   }).lean();
 }
-class za extends qa {
+class Pa extends ka {
   constructor() {
     super(3600);
   }
@@ -3050,19 +3081,19 @@ class za extends qa {
     return { user: e, questId: t };
   }
   fetchFromDb(e) {
-    return Fa(e);
+    return ja(e);
   }
   fetchManyFromDb(e) {
-    return ka(e);
+    return Na(e);
   }
   updateInDb(e, t, a) {
-    return ja(e, t, a);
+    return za(e, t, a);
   }
 }
-const ve = new za();
-class Pa extends f {
+const Me = new Pa();
+class Ka extends f {
   async updateDailyReport(e) {
-    const t = await I.get(e), a = await G.get(e), r = await ve.getMany({
+    const t = await I.get(e), a = await G.get(e), r = await Me.getMany({
       user: e,
       status: D.COMPLETED
     });
@@ -3090,7 +3121,7 @@ class Pa extends f {
     } = t;
     if (s <= 0)
       return;
-    const o = await I.get(e), c = await ve.getMany({
+    const o = await I.get(e), c = await Me.getMany({
       user: e,
       status: D.COMPLETED
     }), w = await G.get(e), { berry: x, xp: T } = o, { voice: K, amount: nt } = T, { unlockedBadges: at, unlockedBackgrounds: rt, unlockedTitles: st } = w;
@@ -3126,18 +3157,18 @@ class Pa extends f {
     );
   }
 }
-const Ka = (n) => J.create({
+const Ha = (n) => J.create({
   user: n
 });
-async function Ha(n) {
+async function La(n) {
   const e = await J.findOne({ user: n }).lean();
-  return e || y(await Ka(n));
+  return e || y(await Ha(n));
 }
-const La = (n, e) => J.findOneAndUpdate({ user: n }, e, {
+const Qa = (n, e) => J.findOneAndUpdate({ user: n }, e, {
   upsert: !0,
   returnDocument: "after"
 }).lean();
-class Qa extends Pa {
+class Wa extends Ka {
   constructor() {
     super(60);
   }
@@ -3148,14 +3179,14 @@ class Qa extends Pa {
     return e.user;
   }
   fetchFromDb(e) {
-    return Ha(e);
+    return La(e);
   }
   updateInDb(e, t) {
-    return La(e, t);
+    return Qa(e, t);
   }
 }
-const zs = new Qa();
-class Wa extends f {
+const Ps = new Wa();
+class Ga extends f {
   async setGuessGame(e, t, a, r) {
     await this.update(e, {
       $set: {
@@ -3186,18 +3217,18 @@ class Wa extends f {
     });
   }
 }
-const Ga = async (n) => await ee.create({
+const Ya = async (n) => await ee.create({
   user: n
 });
-async function Ya(n) {
+async function Xa(n) {
   const e = await ee.findOne({ user: n }).lean();
-  return e || y(await Ga(n));
+  return e || y(await Ya(n));
 }
-const Xa = (n, e) => ee.findOneAndUpdate({ user: n }, e, {
+const Va = (n, e) => ee.findOneAndUpdate({ user: n }, e, {
   upsert: !0,
   returnDocument: "after"
 }).lean();
-class Va extends Wa {
+class Ja extends Ga {
   constructor() {
     super(300);
   }
@@ -3208,14 +3239,14 @@ class Va extends Wa {
     return e;
   }
   fetchFromDb(e) {
-    return Ya(e);
+    return Xa(e);
   }
   updateInDb(e, t) {
-    return Xa(e, t);
+    return Va(e, t);
   }
 }
-const Ps = new Va();
-class Ja extends f {
+const Ks = new Ja();
+class Za extends f {
   async hasUnlockedRaid(e, t) {
     return (await this.get(e)).unlocked?.[t];
   }
@@ -3282,7 +3313,7 @@ class Ja extends f {
   async addRewardsToRaid(e, t) {
     await this.update(e, {
       $inc: Object.fromEntries(
-        C(t).filter(([a]) => a !== "title" && a !== "condition").map(([a, r]) => [`currentRaid.rewards.${a}`, r])
+        R(t).filter(([a]) => a !== "title" && a !== "condition").map(([a, r]) => [`currentRaid.rewards.${a}`, r])
       ),
       ...t.title ? { $set: { "currentRaid.rewards.title": t.title } } : {}
     });
@@ -3295,16 +3326,16 @@ class Ja extends f {
     });
   }
 }
-const Za = (n) => ae.create({
+const er = (n) => ae.create({
   user: n
-}), er = async (n) => {
+}), tr = async (n) => {
   const e = await ae.findOne({ user: n }).lean();
-  return e || y(await Za(n));
-}, tr = (n, e) => ae.findOneAndUpdate({ user: n }, e, {
+  return e || y(await er(n));
+}, nr = (n, e) => ae.findOneAndUpdate({ user: n }, e, {
   upsert: !0,
   returnDocument: "after"
 });
-class nr extends Ja {
+class ar extends Za {
   constructor() {
     super(3600);
   }
@@ -3315,14 +3346,14 @@ class nr extends Ja {
     return e;
   }
   fetchFromDb(e) {
-    return er(e);
+    return tr(e);
   }
   updateInDb(e, t) {
-    return tr(e, t);
+    return nr(e, t);
   }
 }
-const Ks = new nr();
-class ar extends f {
+const Hs = new ar();
+class rr extends f {
   async isBuyLimitReached(e, t, a) {
     const r = await d.getAllEntitiesLimit();
     if (await d.isEntityId(t, d.isEquipment))
@@ -3367,16 +3398,16 @@ class ar extends f {
     ]);
   }
 }
-const rr = async (n) => await re.create({
+const sr = async (n) => await re.create({
   user: n
-}), sr = async (n) => {
+}), ir = async (n) => {
   const e = await re.findOne({ user: n }).lean();
-  return e || y(await rr(n));
-}, ir = (n, e) => re.findOneAndUpdate({ user: n }, e, {
+  return e || y(await sr(n));
+}, ur = (n, e) => re.findOneAndUpdate({ user: n }, e, {
   upsert: !0,
   returnDocument: "after"
 }).lean();
-class ur extends ar {
+class cr extends rr {
   constructor() {
     super(300);
   }
@@ -3387,14 +3418,14 @@ class ur extends ar {
     return e;
   }
   fetchFromDb(e) {
-    return sr(e);
+    return ir(e);
   }
   updateInDb(e, t) {
-    return ir(e, t);
+    return ur(e, t);
   }
 }
-const Hs = new ur();
-class cr extends f {
+const Ls = new cr();
+class or extends f {
   async didSevenDoubleAtDoQ(e) {
     await this.update(e, {
       $inc: { "doubleOrQuit.sevenDoubleInARowCount": 1 }
@@ -3421,7 +3452,7 @@ class cr extends f {
     const t = k();
     t.setHours(0, 0, 0, 0);
     const a = /* @__PURE__ */ new Date();
-    a.setHours(0, 0, 0, 0), await v.updateOne(
+    a.setHours(0, 0, 0, 0), await M.updateOne(
       {
         user: e,
         "bet666.last": {
@@ -3430,7 +3461,7 @@ class cr extends f {
         }
       },
       { $inc: { "bet666.count": 1 }, $set: { "bet666.last": /* @__PURE__ */ new Date() } }
-    ), await v.updateOne(
+    ), await M.updateOne(
       {
         user: e,
         "bet666.last": {
@@ -3473,18 +3504,18 @@ class cr extends f {
     await this.update(e, { $inc: { "dice.drawWithDoubleSixCount": 1 } });
   }
 }
-const or = async (n) => await v.create({
+const dr = async (n) => await M.create({
   user: n
 });
-async function dr(n) {
-  const e = await v.findOne({ user: n }).lean();
-  return e || y(await or(n));
+async function lr(n) {
+  const e = await M.findOne({ user: n }).lean();
+  return e || y(await dr(n));
 }
-const lr = (n, e) => v.findOneAndUpdate({ user: n }, e, {
+const pr = (n, e) => M.findOneAndUpdate({ user: n }, e, {
   upsert: !0,
   returnDocument: "after"
 }).lean();
-class pr extends cr {
+class yr extends or {
   constructor() {
     super(300);
   }
@@ -3495,14 +3526,14 @@ class pr extends cr {
     return e;
   }
   fetchFromDb(e) {
-    return dr(e);
+    return lr(e);
   }
   updateInDb(e, t) {
-    return lr(e, t);
+    return pr(e, t);
   }
 }
-const Ls = new pr();
-class yr extends f {
+const Qs = new yr();
+class fr extends f {
   async increaseXpGiven(e, t) {
     await this.update(e, {
       $inc: {
@@ -3524,18 +3555,18 @@ class yr extends f {
     t ? await this.update(e, { $set: { timeCrewAbove90PercentXp: 0 } }) : await this.update(e, { $inc: { timeCrewAbove90PercentXp: 1 } });
   }
 }
-const fr = async (n) => await se.create({
+const mr = async (n) => await se.create({
   user: n
 });
-async function mr(n) {
+async function hr(n) {
   const e = await se.findOne({ user: n }).lean();
-  return e || y(await fr(n));
+  return e || y(await mr(n));
 }
-const hr = (n, e) => se.findOneAndUpdate({ user: n }, e, {
+const wr = (n, e) => se.findOneAndUpdate({ user: n }, e, {
   upsert: !0,
   returnDocument: "after"
 }).lean();
-class wr extends yr {
+class gr extends fr {
   constructor() {
     super(300);
   }
@@ -3546,14 +3577,14 @@ class wr extends yr {
     return e;
   }
   fetchFromDb(e) {
-    return mr(e);
+    return hr(e);
   }
   updateInDb(e, t) {
-    return hr(e, t);
+    return wr(e, t);
   }
 }
-const Qs = new wr();
-class gr extends f {
+const Ws = new gr();
+class Sr extends f {
   async workIncrement(e) {
     await this.update(e, { $inc: { workCount: 1 } });
   }
@@ -3565,18 +3596,18 @@ class gr extends f {
     });
   }
 }
-const Sr = (n) => ie.create({
+const br = (n) => ie.create({
   user: n
 });
-async function br(n) {
+async function $r(n) {
   const e = await ie.findOne({ user: n }).lean();
-  return e || y(await Sr(n));
+  return e || y(await br(n));
 }
-const $r = (n, e) => ie.findOneAndUpdate({ user: n }, e, {
+const Er = (n, e) => ie.findOneAndUpdate({ user: n }, e, {
   upsert: !0,
   returnDocument: "after"
 }).lean();
-class Er extends gr {
+class Ur extends Sr {
   constructor() {
     super(300);
   }
@@ -3587,14 +3618,14 @@ class Er extends gr {
     return e;
   }
   fetchFromDb(e) {
-    return br(e);
+    return $r(e);
   }
   updateInDb(e, t) {
-    return $r(e, t);
+    return Er(e, t);
   }
 }
-const Ur = new Er();
-class Ir extends f {
+const Ir = new Ur();
+class Tr extends f {
   async randomMessageIncrement(e) {
     await this.update(e, { $inc: { randomMessageClaimed: 1 } });
   }
@@ -3612,18 +3643,18 @@ class Ir extends f {
     await this.update(e, { $inc: { totalMinutesInVoice: t } });
   }
 }
-const Tr = async (n) => await ue.create({
+const Dr = async (n) => await ue.create({
   user: n
 });
-async function Dr(n) {
+async function Or(n) {
   const e = await ue.findOne({ user: n }).lean();
-  return e || y(await Tr(n));
+  return e || y(await Dr(n));
 }
-const Or = (n, e) => ue.findOneAndUpdate({ user: n }, e, {
+const Cr = (n, e) => ue.findOneAndUpdate({ user: n }, e, {
   upsert: !0,
   returnDocument: "after"
 }).lean();
-class Cr extends Ir {
+class Rr extends Tr {
   constructor() {
     super(300);
   }
@@ -3636,14 +3667,14 @@ class Cr extends Ir {
     return e;
   }
   fetchFromDb(e) {
-    return Dr(e);
+    return Or(e);
   }
   updateInDb(e, t) {
-    return Or(e, t);
+    return Cr(e, t);
   }
 }
-const Ws = new Cr();
-class Rr extends f {
+const Gs = new Rr();
+class Mr extends f {
   async hasReportedSomeone(e) {
     await this.update(e, { $set: { reportedSomeone: !0 } });
   }
@@ -3677,15 +3708,15 @@ class Rr extends f {
 const vr = async (n) => await ce.create({
   user: n
 });
-async function Mr(n) {
+async function Ar(n) {
   const e = await ce.findOne({ user: n }).lean();
   return e || y(await vr(n));
 }
-const Ar = (n, e) => ce.findOneAndUpdate({ user: n }, e, {
+const Br = (n, e) => ce.findOneAndUpdate({ user: n }, e, {
   upsert: !0,
   returnDocument: "after"
 }).lean();
-class Br extends Rr {
+class _r extends Mr {
   constructor() {
     super(300);
   }
@@ -3696,17 +3727,17 @@ class Br extends Rr {
     return e;
   }
   fetchFromDb(e) {
-    return Mr(e);
+    return Ar(e);
   }
   updateInDb(e, t) {
-    return Ar(e, t);
+    return Br(e, t);
   }
 }
-const Gs = new Br();
-class _r extends f {
+const Ys = new _r();
+class xr extends f {
   async readEdito(e) {
     const t = /* @__PURE__ */ new Date();
-    t.setHours(0, 0, 0, 0), await M.updateOne(
+    t.setHours(0, 0, 0, 0), await v.updateOne(
       {
         user: e,
         "edito.lastTimeRead": {
@@ -3717,7 +3748,7 @@ class _r extends f {
         $inc: { "edito.readToday": 1 },
         $set: { "edito.lastTimeRead": /* @__PURE__ */ new Date() }
       }
-    ), await M.updateOne(
+    ), await v.updateOne(
       {
         user: e,
         "edito.lastTimeRead": {
@@ -3730,18 +3761,18 @@ class _r extends f {
     ), this.invalidate(e);
   }
 }
-const xr = async (n) => await M.create({
+const qr = async (n) => await v.create({
   user: n
 });
-async function qr(n) {
-  const e = await M.findOne({ user: n }).lean();
-  return e || y(await xr(n));
+async function kr(n) {
+  const e = await v.findOne({ user: n }).lean();
+  return e || y(await qr(n));
 }
-const kr = (n, e) => M.findOneAndUpdate({ user: n }, e, {
+const Nr = (n, e) => v.findOneAndUpdate({ user: n }, e, {
   upsert: !0,
   returnDocument: "after"
 }).lean();
-class Nr extends _r {
+class Fr extends xr {
   constructor() {
     super(300);
   }
@@ -3752,14 +3783,14 @@ class Nr extends _r {
     return e;
   }
   fetchFromDb(e) {
-    return qr(e);
+    return kr(e);
   }
   updateInDb(e, t) {
-    return kr(e, t);
+    return Nr(e, t);
   }
 }
-const Ys = new Nr();
-class Fr extends f {
+const Xs = new Fr();
+class jr extends f {
   async updateCraftStats(e, t, a) {
     const r = await d.get(a);
     !r || !d.isItem(r) || await this.update(e, {
@@ -3819,18 +3850,18 @@ class Fr extends f {
     });
   }
 }
-const jr = async (n) => await A.create({
+const zr = async (n) => await A.create({
   user: n
 });
-async function zr(n) {
+async function Pr(n) {
   const e = await A.findOne({ user: n }).lean();
-  return e || y(await jr(n));
+  return e || y(await zr(n));
 }
-const Pr = (n, e) => A.findOneAndUpdate({ user: n }, e, {
+const Kr = (n, e) => A.findOneAndUpdate({ user: n }, e, {
   upsert: !0,
   returnDocument: "after"
 }).lean();
-class Kr extends Fr {
+class Hr extends jr {
   constructor() {
     super(300);
   }
@@ -3841,39 +3872,41 @@ class Kr extends Fr {
     return e;
   }
   fetchFromDb(e) {
-    return zr(e);
+    return Pr(e);
   }
   updateInDb(e, t) {
-    return Pr(e, t);
+    return Kr(e, t);
   }
 }
-const Xs = new Kr(), Hr = new u({
+const Vs = new Hr(), Lr = 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 }
-}), de = l?.Bans || p("Bans", Hr), Lr = (n) => de.create({
-  ...n
-});
-class Qr extends b {
+}), de = l?.Bans || p("Bans", Lr), Qr = (n, e) => de.deleteOne({ bannedUserId: n, guildId: e });
+class Wr extends b {
   async getUnbanUsers() {
     return this.getMany({
       unbannedTimestamp: { $lte: /* @__PURE__ */ new Date(), $ne: null }
     });
   }
-  async banUserFromGuild(e) {
-    await Lr(e);
+  async banUserFromGuild({ bannedUserId: e, guildId: t, ...a }) {
+    await this.update({ bannedUserId: e, guildId: t }, { ...a });
   }
   async isBannedFromGuild(e, t) {
     const a = await this.get({ bannedUserId: e, guildId: t });
     return !!(a && (!a.unbannedTimestamp || a.unbannedTimestamp > /* @__PURE__ */ new Date()));
   }
+  async deleteBan(e, t) {
+    await Qr(e, t), this.invalidate({ bannedUserId: e, guildId: t });
+  }
 }
-const Wr = (n) => de.find(n).lean(), Gr = (n) => de.findOne(n).lean(), Yr = (n, e) => de.findOneAndUpdate(n, e, {
-  returnDocument: "after"
+const Gr = (n) => de.find(n).lean(), Yr = (n) => de.findOne(n).lean(), Xr = (n, e) => de.findOneAndUpdate(n, e, {
+  returnDocument: "after",
+  upsert: !0
 }).lean();
-class Xr extends Qr {
+class Vr extends Wr {
   constructor() {
     super(3600 * 36);
   }
@@ -3884,16 +3917,16 @@ class Xr extends Qr {
     return { bannedUserId: e, guildId: t };
   }
   fetchFromDb(e) {
-    return Gr(e);
+    return Yr(e);
   }
   fetchManyFromDb(e) {
-    return Wr(e);
+    return Gr(e);
   }
   updateInDb(e, t) {
-    return Yr(e, t);
+    return Xr(e, t);
   }
 }
-const Vs = new Xr(), Vr = new u({
+const Js = new Vr(), Jr = new u({
   senderId: {
     type: u.Types.ObjectId,
     required: !0,
@@ -3910,35 +3943,35 @@ const Vs = new Xr(), Vr = new u({
   meta: {
     rps: { type: String, default: void 0 }
   }
-}), le = l?.Invitation || p("Invitation", Vr), Jr = (n) => le.create({
+}), le = l?.Invitation || p("Invitation", Jr), Zr = (n) => le.create({
   ...n
-}), Zr = async (n) => {
+}), es = async (n) => {
   await le.deleteMany({
     ...n
   });
 };
-class es extends f {
+class ts extends f {
   async sendInvitation({
     senderId: e,
     receiverId: t,
     gameMode: a,
     ...r
   }) {
-    return await this.get({ senderId: e, gameMode: a, receiverId: t }) ? !1 : (await Jr({ ...r, senderId: e, gameMode: a, receiverId: t }), !0);
+    return await this.get({ senderId: e, gameMode: a, receiverId: t }) ? !1 : (await Zr({ ...r, senderId: e, gameMode: a, receiverId: t }), !0);
   }
   async receiveInvitation(e) {
     return this.get(e);
   }
   async deleteInvitation(e) {
-    await Zr(e), this.invalidate(e);
+    await es(e), this.invalidate(e);
   }
 }
-const ts = (n) => le.findOne({
+const ns = (n) => le.findOne({
   ...n
-}).lean(), ns = (n, e) => le.findOneAndUpdate(n, e, {
+}).lean(), as = (n, e) => le.findOneAndUpdate(n, e, {
   returnDocument: "after"
 }).lean();
-class as extends es {
+class rs extends ts {
   constructor() {
     super(3600);
   }
@@ -3953,14 +3986,14 @@ class as extends es {
     return { gameMode: t, receiverId: e, senderId: a };
   }
   fetchFromDb(e) {
-    return ts(e);
+    return ns(e);
   }
   updateInDb(e, t) {
-    return ns(e, t);
+    return as(e, t);
   }
 }
-const Js = new as();
-class rs extends f {
+const Zs = new rs();
+class ss extends f {
   async setEditoChannel(e, t) {
     await this.update({ guildId: e }, { $set: { "edito.channelId": t } });
   }
@@ -4021,7 +4054,7 @@ class rs extends f {
     );
   }
 }
-const ss = new u({
+const is = new u({
   guildId: { type: String, required: !0, unique: !0 },
   ranking: {
     channelId: { type: String, default: null },
@@ -4063,16 +4096,16 @@ const ss = new u({
     }
   },
   shopChannelId: { type: String, default: null }
-}), Ue = l?.Settings || p("Settings", ss), is = (n) => Ue.create({
+}), Ue = l?.Settings || p("Settings", is), us = (n) => Ue.create({
   guildId: n
-}), us = async (n) => {
+}), cs = async (n) => {
   const e = await Ue.findOne({ guildId: n }).lean();
-  return e || y(await is(n));
-}, cs = (n, e) => Ue.findOneAndUpdate(n, e, {
+  return e || y(await us(n));
+}, os = (n, e) => Ue.findOneAndUpdate(n, e, {
   upsert: !0,
   returnDocument: "after"
 }).lean();
-class os extends rs {
+class ds extends ss {
   constructor() {
     super(3600 * 24 * 30);
   }
@@ -4083,13 +4116,13 @@ class os extends rs {
     return e;
   }
   fetchFromDb(e) {
-    return us(e);
+    return cs(e);
   }
   updateInDb(e, t) {
-    return cs(e, t);
+    return os(e, t);
   }
 }
-const Zs = new os(), ds = new u(
+const ei = new ds(), ls = new u(
   {
     shopType: { type: String, required: !0, unique: !0 },
     publishedAt: { type: Date, default: /* @__PURE__ */ new Date() },
@@ -4118,11 +4151,11 @@ const Zs = new os(), ds = new u(
     }
   },
   { minimize: !1 }
-), Ie = l?.Shop || p("Shop", ds), ls = (n) => Ie.create({
+), Ie = l?.Shop || p("Shop", ls), ps = (n) => Ie.create({
   shopType: n
-}), ps = async (n) => {
+}), ys = async (n) => {
   const e = await Ie.findOne({ shopType: n }).lean();
-  return e || y(await ls(n));
+  return e || y(await ps(n));
 };
 class E {
   toDBShopItem() {
@@ -4138,7 +4171,7 @@ class E {
       e,
       -1 * this.price * t,
       !1
-    ), await Ur.updateTotalSpentInShop(
+    ), await Ir.updateTotalSpentInShop(
       e,
       this.price * t
     )) : await S.removeItem(
@@ -4175,7 +4208,7 @@ class E {
     return !1;
   }
 }
-class ys extends E {
+class fs extends E {
   price;
   size;
   currency;
@@ -4195,7 +4228,7 @@ class ys extends E {
     return !0;
   }
 }
-class fs extends E {
+class ms extends E {
   price;
   size;
   currency;
@@ -4215,7 +4248,7 @@ class fs extends E {
     return !0;
   }
 }
-class ms extends E {
+class hs extends E {
   price;
   size;
   currency;
@@ -4235,7 +4268,7 @@ class ms extends E {
     return !0;
   }
 }
-class hs extends E {
+class ws extends E {
   price;
   size;
   currency;
@@ -4255,7 +4288,7 @@ class hs extends E {
     return !0;
   }
 }
-class ws extends E {
+class gs extends E {
   price;
   size;
   currency;
@@ -4286,7 +4319,7 @@ class ws extends E {
     return !0;
   }
 }
-class gs extends E {
+class Ss extends E {
   price;
   size;
   currency;
@@ -4306,7 +4339,7 @@ class gs extends E {
     return !0;
   }
 }
-class Ss extends E {
+class bs extends E {
   price;
   size;
   currency;
@@ -4326,7 +4359,7 @@ class Ss extends E {
     return !0;
   }
 }
-class bs extends E {
+class $s extends E {
   price;
   size;
   currency;
@@ -4346,7 +4379,7 @@ class bs extends E {
     return !0;
   }
 }
-class $s extends E {
+class Es extends E {
   price;
   size;
   currency;
@@ -4366,30 +4399,30 @@ class $s extends E {
     return !0;
   }
 }
-class Es extends f {
+class Us extends f {
   async getShopItem(e, t) {
     const r = (await this.get(e)).items.find((w) => w.id === t);
     if (!r)
       return;
     const { price: s, size: i, currency: o } = r, c = await d.get(r.id) ?? await g.get(r.id);
     if (g.isOrnament(c) && g.isBackground(c))
-      return new ys({ price: s, item: c, size: i, currency: o });
+      return new fs({ price: s, item: c, size: i, currency: o });
     if (g.isOrnament(c) && g.isTitle(c))
-      return new $s({ price: s, item: c, size: i, currency: o });
+      return new Es({ price: s, item: c, size: i, currency: o });
     if (d.isEntity(c) && d.isChestItem(c))
-      return new ms({ price: s, item: c, size: i, currency: o });
+      return new hs({ price: s, item: c, size: i, currency: o });
     if (d.isEntity(c) && d.isBoostItem(c))
-      return new fs({ 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 Ss({ price: s, item: c, size: i, currency: o });
-    if (d.isEntity(c) && d.isStoreItem(c))
       return new bs({ price: s, item: c, size: i, currency: o });
+    if (d.isEntity(c) && d.isStoreItem(c))
+      return new $s({ price: s, item: c, size: i, currency: o });
     if (d.isEntity(c) && d.isObjectItem(c))
-      return new hs({ price: s, item: c, size: i, currency: o });
-    if (d.isEntity(c) && d.isEquipment(c))
       return new ws({ price: s, item: c, size: i, currency: o });
+    if (d.isEntity(c) && d.isEquipment(c))
+      return new gs({ price: s, item: c, size: i, currency: o });
     if (d.isEntity(c) && d.isBottleItem(c))
-      return new gs({ price: s, size: i, item: c, currency: o });
+      return new Ss({ price: s, size: i, item: c, currency: o });
   }
   async getShopItemList(e) {
     const t = await this.get(e), a = [];
@@ -4448,8 +4481,8 @@ class Es extends f {
     );
   }
 }
-const Us = (n, e) => Ie.findOneAndUpdate(n, e, { upsert: !0, returnDocument: "after" }).lean();
-class Is extends Es {
+const Is = (n, e) => Ie.findOneAndUpdate(n, e, { upsert: !0, returnDocument: "after" }).lean();
+class Ts extends Us {
   constructor() {
     super(3600);
   }
@@ -4460,28 +4493,28 @@ class Is extends Es {
     return e;
   }
   fetchFromDb(e) {
-    return ps(e);
+    return ys(e);
   }
   updateInDb(e, t) {
-    return Us(e, t);
+    return Is(e, t);
   }
 }
-const ei = new Is(), Ts = new u({
+const ti = new Ts(), Ds = new u({
   warnedUserId: { type: String, required: !0, index: !0 },
   authorId: String,
   date: { type: Date, default: Date.now() },
   reason: { type: String, default: null }
-}), tt = l?.Warn || p("Warn", Ts), Ds = (n) => tt.countDocuments(n);
-class Os extends b {
+}), tt = l?.Warn || p("Warn", Ds), Os = (n) => tt.countDocuments(n);
+class Cs extends b {
   getUserWarns(e) {
     return this.getMany({ warnedUserId: e });
   }
   getUserWarnCount(e) {
-    return Ds({ warnedUserId: e });
+    return Os({ warnedUserId: e });
   }
 }
-const Cs = (n) => tt.find(n).lean();
-class Rs extends Os {
+const Rs = (n) => tt.find(n).lean();
+class Ms extends Cs {
   constructor() {
     super(300);
   }
@@ -4495,62 +4528,62 @@ class Rs extends Os {
     throw new Error("Method not implemented.");
   }
   fetchManyFromDb(e) {
-    return Cs(e);
+    return Rs(e);
   }
   updateInDb() {
     throw new Error("Method not implemented.");
   }
 }
-const ti = new Rs(), ni = (n) => {
+const ni = new Ms(), ai = (n) => {
   ut(n);
 };
-class ai extends ct.ObjectId {
+class ri extends ct.ObjectId {
 }
 export {
-  js as COOLDOWN_COMMANDS,
-  ai as ObjectId,
+  zs as COOLDOWN_COMMANDS,
+  ri as ObjectId,
   h as QUEST_MIDDLEWARE_EVENT_NAME,
   he as RAID_MIDDLEWARE_EVENT_NAME,
-  Vs as banService,
-  ni as connectToServices,
+  Js as banService,
+  ai as connectToServices,
   Ce as crewMetaService,
-  qs as crewOrnamentsService,
-  ks as crewQuestService,
-  Mt as crewService,
-  Ns as crewStatsEngagementService,
-  Fs as crewStatsFrequencyService,
+  ks as crewOrnamentsService,
+  Ns as crewQuestService,
+  vt as crewService,
+  Fs as crewStatsEngagementService,
+  js as crewStatsFrequencyService,
   m as emitQuestMiddlewareEvent,
   me as emitRaidMiddlewareEvent,
   d as entityService,
-  ps as findShop,
-  Js as invitationService,
+  ys as findShop,
+  Zs as invitationService,
   g as ornamentService,
   U as panoplyService,
-  _s as registerQuestMiddlewareEvents,
-  xs as registerRaidMiddlewareEvents,
+  xs as registerQuestMiddlewareEvents,
+  qs as registerRaidMiddlewareEvents,
   H as reminderService,
-  Zs as settingsService,
+  ei as settingsService,
   Ie as shopModel,
-  ei as shopService,
+  ti as shopService,
   va as userCooldownService,
   aa as userCrewService,
-  zs as userDailyReportService,
+  Ps as userDailyReportService,
   pe as userEncyclopediaService,
-  Ps as userGamesService,
+  Ks as userGamesService,
   S as userInventoryService,
   I as userMetaService,
   G as userOrnamentService,
-  ve as userQuestService,
-  Ks as userRaidService,
+  Me as userQuestService,
+  Hs as userRaidService,
   Sn as userService,
   Re as userSettingsService,
-  Hs as userShopService,
-  Ls as userStatsCasinoService,
-  Qs as userStatsCrewService,
-  Ur as userStatsEconomyService,
-  Ws as userStatsEngagementService,
-  Gs as userStatsFlagsService,
-  Ys as userStatsFrequencyService,
-  Xs as userStatsInventoryService,
-  ti as warnService
+  Ls as userShopService,
+  Qs as userStatsCasinoService,
+  Ws as userStatsCrewService,
+  Ir as userStatsEconomyService,
+  Gs as userStatsEngagementService,
+  Ys as userStatsFlagsService,
+  Xs as userStatsFrequencyService,
+  Vs as userStatsInventoryService,
+  ni as warnService
 };