@opfr/services 1.7.0 → 1.9.0

package/dist/index.es.js

@@ -1,16 +1,17 @@
-import { Schema as c, models as d, model as l, connect as Qe, Types as Ye } from "mongoose";
-import { QuestStatus as q, DEFAULT_FACTION as Ge, EFFECT_KEYS as We, EQUIPMENT_SLOT as Ie, CHARACTERISTICS as Ve, getComputedCharacteristicValue as Xe, getCurrentLevel as Je, HP_PER_VITALITY as Ze, DEFAULT_MAX_HP as et, transformToDBBuff as tt, RANK_IDS_WITHOUT_BASIC as ge, STORY_MESSAGE_ARGS as nt, STORY_ACTION_TYPES as rt, STORY_STEP_TYPES as at, STORY_SPEAKER_TYPES as st, chapterOne as oe, speakers as it } from "@opfr/definitions";
+import { Schema as o, models as d, model as l, connect as Qe, Types as Ye } from "mongoose";
+import { QuestStatus as k, DEFAULT_FACTION as Ge, EFFECT_KEYS as We, EQUIPMENT_SLOT as Ie, CHARACTERISTICS as Ve, getComputedCharacteristicValue as Xe, getCurrentLevel as Je, HP_PER_VITALITY as Ze, DEFAULT_MAX_HP as et, transformToDBBuff as tt, RANK_IDS_WITHOUT_BASIC as ge, STORY_MESSAGE_ARGS as nt, STORY_ACTION_TYPES as rt, STORY_STEP_TYPES as at, STORY_SPEAKER_TYPES as st, chapterOne as de, speakers as it } from "@opfr/definitions";
 import ut from "node-cache";
 import * as Ue from "events";
-import { filterNullAndUndefined as L, recordToArray as B, arrayToRecord as Te, mergeObjects as Q, seededRandom as ct, sortBy as pe, randomBetween as Ee, hasExpire as de, isString as ot, capitalizeAllWords as dt, pickNthByOdds as Se, pickFrom as lt, sameDay as Oe, yesterday as Y, exclude as P } from "@opfr/utils-lang";
-const G = "___ALL_ENTITIES___";
-class y {
+import { filterNullAndUndefined as Q, recordToArray as F, arrayToRecord as Te, mergeObjects as Y, seededRandom as ot, sortBy as ye, randomBetween as Ee, hasExpire as le, isString as ct, capitalizeAllWords as dt, pickNthByOdds as Se, pickFrom as lt, sameDay as ve, yesterday as G, exclude as z } from "@opfr/utils-lang";
+const W = "___ALL_ENTITIES___";
+class m {
   cache;
-  constructor(e) {
+  constructor(e, t) {
     this.cache = new ut({
       stdTTL: e,
       checkperiod: e * 0.2,
-      useClones: !1
+      useClones: !1,
+      maxKeys: t?.maxKeys ?? -1
     });
   }
   async get(e, t) {
@@ -24,24 +25,24 @@ class y {
     const a = await this.updateInDb(e, t, r);
     if (a) {
       const s = this.getKey(a);
-      this.cache.del(G), 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(G), e && this.cache.del(this.normalizeKey(e));
+    this.cache.del(W), e && this.cache.del(this.normalizeKey(e));
   }
   clearAll() {
     this.cache.flushAll();
   }
 }
-class f extends y {
+class w extends m {
   async getAll() {
-    const e = this.cache.get(G);
+    const e = this.cache.get(W);
     if (e)
       return e;
     const t = await this.fetchManyFromDb({}, {});
-    return this.cache.set(G, t), t.forEach((r) => {
+    return this.cache.set(W, t), t.forEach((r) => {
       this.cache.set(this.normalizeKey(this.getKey(r)), r);
     }), t;
   }
@@ -52,14 +53,14 @@ class f extends y {
     }), r;
   }
 }
-const De = new Ue.EventEmitter(), S = (n, e, t) => {
-  De.emit(n, e, t);
+const Oe = new Ue.EventEmitter(), b = (n, e, t) => {
+  Oe.emit(n, e, t);
 }, La = (n) => {
   for (const [e, t] of Object.entries(n))
-    De.on(e, (r, a) => {
+    Oe.on(e, (r, a) => {
       t(r, a);
     });
-}, w = {
+}, $ = {
   USER: "middleware/quest/USER",
   USER_INVENTORY: "middleware/quest/USER_INVENTORY",
   USER_META: "middleware/quest/USER_META",
@@ -71,10 +72,10 @@ const De = new Ue.EventEmitter(), S = (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"
-}, ve = new c(
+}, De = new o(
   {
     user: {
-      type: c.Types.ObjectId,
+      type: o.Types.ObjectId,
       required: !0,
       ref: "User",
       index: !0
@@ -84,22 +85,22 @@ const De = new Ue.EventEmitter(), S = (n, e, t) => {
       required: !0,
       index: !0
     },
-    status: { type: String, default: q.IN_PROGRESS, index: 1 },
+    status: { type: String, default: k.IN_PROGRESS, index: 1 },
     lastCompletionDate: Date,
     streak: Number
   },
   { minimize: !1 }
 );
-ve.post("findOneAndUpdate", function(n) {
-  n && S(
-    w.USER_QUEST,
+De.post("findOneAndUpdate", function(n) {
+  n && b(
+    $.USER_QUEST,
     n.user._id,
     n
   );
 });
-const C = d?.UserQuest || l("UserQuest", ve), pt = new c({
+const C = d?.UserQuest || l("UserQuest", De), pt = new o({
   user: {
-    type: c.Types.ObjectId,
+    type: o.Types.ObjectId,
     required: !0,
     unique: !0,
     ref: "User"
@@ -109,9 +110,9 @@ const C = d?.UserQuest || l("UserQuest", ve), pt = new c({
     of: Date,
     default: /* @__PURE__ */ new Map()
   }
-}), W = d?.UserCooldown || l("UserCooldown", pt), yt = new c({
+}), V = d?.UserCooldown || l("UserCooldown", pt), yt = new o({
   user: {
-    type: c.Types.ObjectId,
+    type: o.Types.ObjectId,
     required: !0,
     unique: !0,
     ref: "User"
@@ -125,17 +126,17 @@ const C = d?.UserQuest || l("UserQuest", ve), pt = new c({
   },
   previousCompletedQuest: { type: [String], default: [] },
   previousMessageSent: { type: Number, default: 0 }
-}), V = d?.UserDailyReport || l("UserDailyReport", yt), ft = new c({
+}), X = d?.UserDailyReport || l("UserDailyReport", yt), ft = new o({
   user: {
-    type: c.Types.ObjectId,
+    type: o.Types.ObjectId,
     required: !0,
     unique: !0,
     ref: "User"
   },
   encyclopedia: { type: [String], default: [] }
-}), X = d?.UserEncyclopedia || l("UserEncyclopedia", ft), mt = new c({
+}), J = d?.UserEncyclopedia || l("UserEncyclopedia", ft), mt = new o({
   user: {
-    type: c.Types.ObjectId,
+    type: o.Types.ObjectId,
     required: !0,
     unique: !0,
     ref: "User",
@@ -150,10 +151,10 @@ const C = d?.UserQuest || l("UserQuest", ve), pt = new c({
     },
     default: null
   }
-}), J = d?.UserGames || l("UserGames", mt), Me = new c(
+}), Z = d?.UserGames || l("UserGames", mt), xe = new o(
   {
     user: {
-      type: c.Types.ObjectId,
+      type: o.Types.ObjectId,
       required: !0,
       unique: !0,
       ref: "User"
@@ -172,23 +173,23 @@ const C = d?.UserQuest || l("UserQuest", ve), pt = new c({
   },
   { minimize: !1 }
 );
-Me.post("findOneAndUpdate", function(n) {
-  n && S(
-    w.USER_INVENTORY,
+xe.post("findOneAndUpdate", function(n) {
+  n && b(
+    $.USER_INVENTORY,
     n.user._id,
     n
   );
 });
-const Z = d?.UserInventory || l("UserInventory", Me), ht = new Ue.EventEmitter(), gt = (n, e) => {
+const ee = d?.UserInventory || l("UserInventory", xe), ht = new Ue.EventEmitter(), gt = (n, e) => {
   ht.emit(n, e);
-}, M = {
+}, x = {
   multiplier: { type: Number, default: 0 },
   origin: String,
   expireAt: { type: Date, default: null },
   startAt: { type: Date, default: null }
-}, xe = new c({
+}, Me = new o({
   user: {
-    type: c.Types.ObjectId,
+    type: o.Types.ObjectId,
     required: !0,
     unique: !0,
     ref: "User"
@@ -208,33 +209,33 @@ const Z = d?.UserInventory || l("UserInventory", Me), ht = new Ue.EventEmitter()
   buffs: {
     cooldown: {
       casino: {
-        type: [M],
+        type: [x],
         default: []
       },
       work: {
-        type: [M],
+        type: [x],
         default: []
       }
     },
     berry: {
       work: {
-        type: [M],
+        type: [x],
         default: []
       },
       global: {
-        type: [M],
+        type: [x],
         default: []
       }
     },
     drop: {
       work: {
-        type: [M],
+        type: [x],
         default: []
       }
     },
     xp: {
       global: {
-        type: [M],
+        type: [x],
         default: []
       }
     }
@@ -260,16 +261,16 @@ const Z = d?.UserInventory || l("UserInventory", Me), ht = new Ue.EventEmitter()
     wisdom: { type: Number, default: 0 }
   }
 });
-xe.post("findOneAndUpdate", async function(n) {
-  n && (S(
-    w.USER_META,
+Me.post("findOneAndUpdate", async function(n) {
+  n && (b(
+    $.USER_META,
     n.user._id,
     n
   ), n.hp <= 0 && gt("death", n.user._id));
 });
-const v = d?.UserMeta || l("UserMeta", xe), qe = new c({
+const D = d?.UserMeta || l("UserMeta", Me), Ae = new o({
   user: {
-    type: c.Types.ObjectId,
+    type: o.Types.ObjectId,
     required: !0,
     unique: !0,
     ref: "User"
@@ -284,16 +285,16 @@ const v = d?.UserMeta || l("UserMeta", xe), qe = new c({
   unlockedBags: { type: [String], default: ["default"] },
   selectedBag: { type: String, default: "default" }
 });
-qe.post("findOneAndUpdate", function(n) {
-  n && S(
-    w.USER_ORNAMENT,
+Ae.post("findOneAndUpdate", function(n) {
+  n && b(
+    $.USER_ORNAMENT,
     n.user._id,
     n
   );
 });
-const ee = d?.UserOrnament || l("UserOrnament", qe), St = new c({
+const te = d?.UserOrnament || l("UserOrnament", Ae), St = new o({
   user: {
-    type: c.Types.ObjectId,
+    type: o.Types.ObjectId,
     required: !0,
     unique: !0,
     ref: "User"
@@ -310,9 +311,9 @@ const ee = d?.UserOrnament || l("UserOrnament", qe), St = new c({
       default: /* @__PURE__ */ new Map()
     }
   }
-}), F = d?.UserSettings || l("UserSettings", St), Ae = new c({
+}), K = d?.UserSettings || l("UserSettings", St), ke = new o({
   user: {
-    type: c.Types.ObjectId,
+    type: o.Types.ObjectId,
     required: !0,
     unique: !0,
     ref: "User"
@@ -345,16 +346,16 @@ const ee = d?.UserOrnament || l("UserOrnament", qe), St = new c({
     guessInOneTryCount: { type: Number, default: 0 }
   }
 });
-Ae.post("findOneAndUpdate", function(n) {
-  n && S(
-    w.USER_STATS_CASINO,
+ke.post("findOneAndUpdate", function(n) {
+  n && b(
+    $.USER_STATS_CASINO,
     n.user._id,
     n
   );
 });
-const A = d?.UserStatsCasino || l("UserStatsCasino", Ae), ke = new c({
+const q = d?.UserStatsCasino || l("UserStatsCasino", ke), qe = new o({
   user: {
-    type: c.Types.ObjectId,
+    type: o.Types.ObjectId,
     required: !0,
     unique: !0,
     ref: "User"
@@ -362,16 +363,16 @@ const A = d?.UserStatsCasino || l("UserStatsCasino", Ae), ke = new c({
   workCount: { type: Number, default: 0 },
   totalSpentInShop: { type: Number, default: 0 }
 });
-ke.post("findOneAndUpdate", function(n) {
-  n && S(
-    w.USER_STATS_ECONOMY,
+qe.post("findOneAndUpdate", function(n) {
+  n && b(
+    $.USER_STATS_ECONOMY,
     n.user._id,
     n
   );
 });
-const te = d?.UserStatsEconomy || l("UserStatsEconomy", ke), Re = new c({
+const ne = d?.UserStatsEconomy || l("UserStatsEconomy", qe), Re = new o({
   user: {
-    type: c.Types.ObjectId,
+    type: o.Types.ObjectId,
     required: !0,
     unique: !0,
     ref: "User"
@@ -382,18 +383,18 @@ const te = d?.UserStatsEconomy || l("UserStatsEconomy", ke), Re = new c({
   writeDifferentChatIds: { type: [String], default: [] }
 });
 Re.post("findOneAndUpdate", function(n) {
-  n && S(
-    w.USER_STATS_ENGAGEMENT,
+  n && b(
+    $.USER_STATS_ENGAGEMENT,
     n.user._id,
     n
   );
 });
-const ne = d?.UserStatsEngagement || l(
+const re = d?.UserStatsEngagement || l(
   "UserStatsEngagement",
   Re
-), Ce = new c({
+), Ce = new o({
   user: {
-    type: c.Types.ObjectId,
+    type: o.Types.ObjectId,
     required: !0,
     unique: !0,
     ref: "User"
@@ -411,15 +412,15 @@ const ne = d?.UserStatsEngagement || l(
   }
 });
 Ce.post("findOneAndUpdate", function(n) {
-  n && S(
-    w.USER_STATS_FLAGS,
+  n && b(
+    $.USER_STATS_FLAGS,
     n.user._id,
     n
   );
 });
-const re = d?.UserStatsFlags || l("UserStatsFlags", Ce), _e = new c({
+const ae = d?.UserStatsFlags || l("UserStatsFlags", Ce), Be = new o({
   user: {
-    type: c.Types.ObjectId,
+    type: o.Types.ObjectId,
     required: !0,
     unique: !0,
     ref: "User"
@@ -429,19 +430,19 @@ const re = d?.UserStatsFlags || l("UserStatsFlags", Ce), _e = new c({
     lastTimeRead: { type: Date, default: /* @__PURE__ */ new Date(), index: !0 }
   }
 });
-_e.post("findOneAndUpdate", function(n) {
-  n && S(
-    w.USER_STATS_FREQUENCY,
+Be.post("findOneAndUpdate", function(n) {
+  n && b(
+    $.USER_STATS_FREQUENCY,
     n.user._id,
     n
   );
 });
-const D = d?.UserStatsFrequency || l(
+const O = d?.UserStatsFrequency || l(
   "UserStatsFrequency",
-  _e
-), Be = new c({
+  Be
+), _e = new o({
   user: {
-    type: c.Types.ObjectId,
+    type: o.Types.ObjectId,
     required: !0,
     unique: !0,
     ref: "User"
@@ -466,17 +467,17 @@ const D = d?.UserStatsFrequency || l(
     totalCrafted: { type: Number, default: 0 }
   }
 });
-Be.post("findOneAndUpdate", function(n) {
-  n && S(
-    w.USER_STATS_INVENTORY,
+_e.post("findOneAndUpdate", function(n) {
+  n && b(
+    $.USER_STATS_INVENTORY,
     n.user._id,
     n
   );
 });
-const k = d?.UserStatsInventory || l(
+const R = d?.UserStatsInventory || l(
   "UserStatsInventory",
-  Be
-), ye = new c({
+  _e
+), fe = new o({
   discordId: { type: String, required: !0, unique: !0 },
   scam: { type: Boolean, default: !1 },
   birthday: { type: Date, default: null, index: 1 },
@@ -484,21 +485,21 @@ const k = d?.UserStatsInventory || l(
   canChangeFaction: { type: Boolean, default: !1 },
   canChooseFaction: { type: Boolean, default: !1 }
 });
-ye.post("findOneAndUpdate", function(n) {
-  n && S(w.USER, n._id, n);
+fe.post("findOneAndUpdate", function(n) {
+  n && b($.USER, n._id, n);
 });
-ye.post("deleteOne", async function() {
+fe.post("deleteOne", async function() {
   const n = this.getQuery()._id;
-  await W.deleteOne({ user: n }), await V.deleteOne({ user: n }), await X.deleteOne({ user: n }), await J.deleteOne({ user: n }), await Z.deleteOne({ user: n }), await v.deleteOne({ user: n }), await ee.deleteOne({ user: n }), await C.deleteMany({ user: n }), await F.deleteOne({ user: n }), await A.deleteOne({ user: n }), await te.deleteOne({ user: n }), await ne.deleteOne({ user: n }), await re.deleteOne({ user: n }), await D.deleteOne({ user: n }), await k.deleteOne({ user: n });
+  await V.deleteOne({ user: n }), await X.deleteOne({ user: n }), await J.deleteOne({ user: n }), await Z.deleteOne({ user: n }), await ee.deleteOne({ user: n }), await D.deleteOne({ user: n }), await te.deleteOne({ user: n }), await C.deleteMany({ user: n }), await K.deleteOne({ user: n }), await q.deleteOne({ user: n }), await ne.deleteOne({ user: n }), await re.deleteOne({ user: n }), await ae.deleteOne({ user: n }), await O.deleteOne({ user: n }), await R.deleteOne({ user: n });
 });
-const b = d?.User || l("User", ye);
-class wt extends f {
+const I = d?.User || l("User", fe);
+class wt extends w {
   getByObjectId(e) {
     return this.update({ _id: e }, {});
   }
   getNextBirthdays() {
     const e = /* @__PURE__ */ new Date(), t = e.getFullYear();
-    return b.aggregate([
+    return I.aggregate([
       {
         $match: {
           birthday: { $ne: null }
@@ -549,7 +550,7 @@ class wt extends f {
     ]);
   }
   getFactionRanking(e) {
-    return b.aggregate([
+    return I.aggregate([
       { $match: { faction: e } },
       {
         $lookup: {
@@ -572,7 +573,7 @@ class wt extends f {
     ]);
   }
   getGlobalRanking() {
-    return b.aggregate([
+    return I.aggregate([
       {
         $lookup: {
           from: "usermetas",
@@ -594,7 +595,7 @@ class wt extends f {
     ]);
   }
   getBerryRanking() {
-    return b.aggregate([
+    return I.aggregate([
       {
         $lookup: {
           from: "usermetas",
@@ -619,7 +620,7 @@ class wt extends f {
     return C.aggregate([
       {
         $match: {
-          status: q.COMPLETED
+          status: k.COMPLETED
         }
       },
       {
@@ -663,7 +664,7 @@ class wt extends f {
   }
   getTodayAllBirthday() {
     const e = /* @__PURE__ */ new Date();
-    return b.aggregate([
+    return I.aggregate([
       { $match: { birthday: { $ne: null } } },
       {
         $addFields: {
@@ -710,14 +711,14 @@ class wt extends f {
     );
   }
 }
-const bt = (n, e) => b.find(n, {}, e).lean(), p = (n) => n.toObject({ flattenMaps: !0, flattenObjectIds: !1 }), $t = (n) => b.create({
+const bt = (n, e) => I.find(n, {}, e).lean(), y = (n) => n.toObject({ flattenMaps: !0, flattenObjectIds: !1 }), $t = (n) => I.create({
   discordId: n
 });
 async function It(n, { upsert: e = !0, ...t }) {
-  const r = await b.findOne({ discordId: n }, {}, t).lean();
-  return !r && e ? p(await $t(n)) : r;
+  const r = await I.findOne({ discordId: n }, {}, t).lean();
+  return !r && e ? y(await $t(n)) : r;
 }
-const Ut = (n, e) => b.findOneAndUpdate(n, e, {
+const Ut = (n, e) => I.findOneAndUpdate(n, e, {
   upsert: !0,
   returnDocument: "after"
 }).lean();
@@ -741,10 +742,10 @@ class Tt extends wt {
     return Ut(e, t);
   }
 }
-const Et = new Tt(), Ot = new c(
+const Et = new Tt(), vt = new o(
   {
     user: {
-      type: c.Types.ObjectId,
+      type: o.Types.ObjectId,
       ref: "User",
       required: !0,
       index: !0
@@ -753,12 +754,12 @@ const Et = new Tt(), Ot = new c(
     type: { type: String, required: !0 }
   },
   { minimize: !1 }
-), N = d?.Reminder || l("Reminder", Ot), Dt = async (n) => {
-  await N.deleteMany(n);
-}, vt = async (n, e) => {
-  await N.deleteOne({ user: n, type: e });
+), H = d?.Reminder || l("Reminder", vt), Ot = async (n) => {
+  await H.deleteMany(n);
+}, Dt = async (n, e) => {
+  await H.deleteOne({ user: n, type: e });
 };
-class Mt extends f {
+class xt extends w {
   getAllPassedReminder() {
     return this.getMany({ date: { $lte: /* @__PURE__ */ new Date() } });
   }
@@ -777,29 +778,29 @@ class Mt extends f {
     ]);
   }
   async removeReminder(e, t) {
-    await vt(e, t), this.invalidate({ user: e, type: t });
+    await Dt(e, t), this.invalidate({ user: e, type: t });
   }
   async deleteSelectedReminders(e) {
     const t = e.map((r) => r._id);
-    await Dt({ _id: { $in: t } }), e.forEach((r) => {
+    await Ot({ _id: { $in: t } }), e.forEach((r) => {
       this.invalidate({ user: r.user, type: r.type });
     });
   }
 }
-function xt(n, e) {
-  return N.find(n, {}, e).lean();
+function Mt(n, e) {
+  return H.find(n, {}, e).lean();
 }
-async function qt(n) {
-  const e = await N.findOne(n).lean();
+async function At(n) {
+  const e = await H.findOne(n).lean();
   return e || null;
 }
-async function At(n, e, t) {
-  return N.findOneAndUpdate(n, e, {
+async function kt(n, e, t) {
+  return H.findOneAndUpdate(n, e, {
     ...t,
     returnDocument: "after"
   }).lean();
 }
-class kt extends Mt {
+class qt extends xt {
   constructor() {
     super(300);
   }
@@ -813,44 +814,44 @@ class kt extends Mt {
     return `${e.toString()}/${t}`;
   }
   fetchFromDb(e) {
-    return qt(e);
+    return At(e);
   }
   fetchManyFromDb(e, t) {
-    return xt(e, t);
+    return Mt(e, t);
   }
   updateInDb(e, t, r = { upsert: !1 }) {
-    return At(e, t, r);
+    return kt(e, t, r);
   }
 }
-const Rt = new kt(), Ct = new c(
+const Rt = new qt(), Ct = new o(
   {
     panoplyId: { unique: !0, index: 1, required: !0, type: String },
     name: { required: !0, type: String },
     equipments: {
       required: !0,
-      type: [{ type: c.Types.ObjectId, ref: "Entities" }]
+      type: [{ type: o.Types.ObjectId, ref: "Entities" }]
     },
     fullBonusStr: { type: String },
     halfBonusStr: { type: String },
-    fullBonus: c.Types.Mixed,
-    halfBonus: c.Types.Mixed
+    fullBonus: o.Types.Mixed,
+    halfBonus: o.Types.Mixed
   },
   { minimize: !1 }
-), K = d?.Panoplies || l("Panoplies", Ct), _t = (n, e) => K.find(n, {}, e).lean(), Bt = async (n, e) => K.find(n, {}, e).populate("equipments");
+), P = d?.Panoplies || l("Panoplies", Ct), Bt = (n, e) => P.find(n, {}, e).lean(), _t = async (n, e) => P.find(n, {}, e).populate("equipments");
 async function Ft(n) {
-  const e = await K.findOne({ panoplyId: n }).lean();
+  const e = await P.findOne({ panoplyId: n }).lean();
   return e || null;
 }
-const Nt = async (n) => K.findOne(n).populate("equipments");
-class Kt extends f {
+const Nt = async (n) => P.findOne(n).populate("equipments");
+class Kt extends w {
   getAllPopulated() {
-    return Bt({}, {});
+    return _t({}, {});
   }
   getPopulated(e) {
     return Nt({ panoplyId: e });
   }
   hasPanoply(e, t) {
-    const r = L(Object.values(e)), a = t.equipments.filter(
+    const r = Q(Object.values(e)), a = t.equipments.filter(
       (s) => r.find((i) => i.entityId === s.entityId)
     ).length;
     if (a === t.equipments.length)
@@ -861,15 +862,15 @@ class Kt extends f {
   async getPanoplyBonus(e) {
     const t = [], r = await this.getAllPopulated();
     for (const a of r) {
-      const s = L(Object.values(e)), i = a.equipments.filter(
-        (u) => s.find(({ entityId: o }) => o === u.entityId)
+      const s = Q(Object.values(e)), i = a.equipments.filter(
+        (u) => s.find(({ entityId: c }) => c === u.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]);
     }
     return t;
   }
 }
-const Ht = async (n, e) => K.findOneAndUpdate(n, e, {
+const Ht = async (n, e) => P.findOneAndUpdate(n, e, {
   returnDocument: "after"
 }).lean();
 class Pt extends Kt {
@@ -889,20 +890,20 @@ class Pt extends Kt {
     return Ft(e);
   }
   fetchManyFromDb(e, t) {
-    return _t(e, t);
+    return Bt(e, t);
   }
 }
-const R = new Pt(), jt = new c(
+const N = new Pt(), jt = new o(
   {
     type: {
       type: String,
       enum: We,
       required: !0
     },
-    params: { type: c.Types.Mixed }
+    params: { type: o.Types.Mixed }
   },
   { _id: !1 }
-), zt = new c(
+), zt = new o(
   {
     entityId: { unique: !0, required: !0, type: String }
   },
@@ -910,7 +911,7 @@ const R = new Pt(), jt = new c(
     minimize: !1,
     discriminatorKey: "type"
   }
-), Lt = new c({
+), Lt = new o({
   category: { required: !0, type: String },
   subtype: { type: String },
   rankId: String,
@@ -923,17 +924,17 @@ const R = new Pt(), jt = new c(
     },
     default: void 0
   }
-}), Qt = new c({
+}), Qt = new o({
   category: { required: !0, type: String },
   characteristics: {
     _id: !1,
     type: Object
   },
   panoply: String
-}), _ = d?.Entities || l("Entities", zt), Yt = _.discriminator("item", Lt);
-_.discriminator("equipment", Qt);
-const Gt = async (n, e) => _.find(n, {}, e).lean(), Wt = async (n, e) => Yt.find(n, {}, e).lean();
-class Vt extends f {
+}), B = d?.Entities || l("Entities", zt), Yt = B.discriminator("item", Lt);
+B.discriminator("equipment", Qt);
+const Gt = async (n, e) => B.find(n, {}, e).lean(), Wt = async (n, e) => Yt.find(n, {}, e).lean();
+class Vt extends w {
   isEntity(e) {
     return !!e && "entityId" in e;
   }
@@ -956,7 +957,7 @@ class Vt extends f {
   }
   async recordToEntityTuple(e) {
     const t = await this.getAll();
-    return B(e).reduce((r, [a, s]) => {
+    return F(e).reduce((r, [a, s]) => {
       const i = t.find(({ entityId: u }) => u === a);
       return i && r.push([i, s]), r;
     }, []);
@@ -992,18 +993,18 @@ class Vt extends f {
       intelligence: 0,
       wisdom: 0
     };
-    const r = await R.getAllPopulated();
+    const r = await N.getAllPopulated();
     for (const a of Ie) {
       const s = e[a];
-      s && (t = Q(
+      s && (t = Y(
         t,
         (await this.fromDBToEquipableEquipment(s)).characteristics,
         (i, u) => i + u
       ));
     }
     for (const a of r) {
-      const s = R.hasPanoply(e, a);
-      s && !("target" in s) && (t = Q(
+      const s = N.hasPanoply(e, a);
+      s && !("target" in s) && (t = Y(
         t,
         s,
         (i, u) => i + u
@@ -1034,8 +1035,8 @@ class Vt extends f {
     return e.entityId === t.entityId && e.seed === t.seed;
   }
   seedEquipment(e, t) {
-    const r = ct(t), a = pe(
-      B(e.characteristics),
+    const r = ot(t), a = ye(
+      F(e.characteristics),
       ([s]) => s
     );
     return {
@@ -1055,14 +1056,14 @@ class Vt extends f {
     );
   }
 }
-const Xt = async (n) => await _.create({
+const Xt = async (n) => await B.create({
   ...n
 });
 async function Jt(n) {
-  const e = await _.findOne({ entityId: n }).lean();
+  const e = await B.findOne({ entityId: n }).lean();
   return e || null;
 }
-const Zt = (n, e) => _.findOneAndUpdate(n, e, {
+const Zt = (n, e) => B.findOneAndUpdate(n, e, {
   returnDocument: "after"
 }).lean();
 class en extends Vt {
@@ -1088,8 +1089,8 @@ class en extends Vt {
     return e.entityId;
   }
 }
-const m = new en();
-class tn extends y {
+const T = new en();
+class tn extends m {
   hasAlreadyFoundEntity(e, t) {
     return e.encyclopedia.includes(t);
   }
@@ -1099,14 +1100,14 @@ class tn extends y {
     });
   }
 }
-const nn = async (n) => await X.create({
+const nn = async (n) => await J.create({
   user: n
 });
 async function rn(n) {
-  const e = await X.findOne({ user: n }).lean();
-  return e || p(await nn(n));
+  const e = await J.findOne({ user: n }).lean();
+  return e || y(await nn(n));
 }
-const an = (n, e) => X.findOneAndUpdate({ user: n }, e, {
+const an = (n, e) => J.findOneAndUpdate({ user: n }, e, {
   upsert: !0,
   returnDocument: "after"
 }).lean();
@@ -1127,8 +1128,8 @@ class sn extends tn {
     return an(e, t);
   }
 }
-const le = new sn();
-class un extends y {
+const pe = new sn();
+class un extends m {
   async getUserEquipmentsCharacteristics(e) {
     let t = {
       vitality: 0,
@@ -1142,8 +1143,8 @@ class un extends y {
       const a = e.equippedItems?.[r];
       if (!a)
         continue;
-      const s = await m.fromDBToEquipableEquipment(a);
-      t = Q(
+      const s = await T.fromDBToEquipableEquipment(a);
+      t = Y(
         t,
         s.characteristics,
         (i, u) => i + u
@@ -1153,7 +1154,7 @@ class un extends y {
   }
   async hasInventoryRequirements(e, t) {
     const r = await this.get(e);
-    return B(t).reduce(
+    return F(t).reduce(
       (a, [s, i]) => a && (r.itemList[s] ?? 0) >= (i ?? 0),
       !0
     );
@@ -1165,33 +1166,39 @@ class un extends y {
     return (await this.get(e)).itemList;
   }
   async calcMinStreakForWorkLoot(e) {
-    const t = await this.get(e), r = (await R.getPanoplyBonus(t.equippedItems)).find(
+    const t = await this.get(e), r = (await N.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 R.getPanoplyBonus(t.equippedItems)).find(
+    return (await N.getPanoplyBonus(t.equippedItems)).find(
       ([a, s]) => a.panoplyId === "revolutionary" && s !== null
     )?.[1] ?? null;
   }
+  async hasRecipe(e, t) {
+    return (await this.get(e)).recipes.includes(t);
+  }
+  async getRecipes(e) {
+    return (await this.get(e)).recipes;
+  }
   /*
    ** UPDATES
    */
   async addItem(e, t, r) {
     await this.update(e, {
       $inc: { [`itemList.${t}`]: r }
-    }), await le.addEntities(e, [t]);
+    }), await pe.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 le.addEntities(
+    }), await pe.addEntities(
       e,
-      B(t).filter(([, r]) => r > 0).map(([r]) => r)
+      F(t).filter(([, r]) => r > 0).map(([r]) => r)
     );
   }
   async removeItem(e, t, r) {
@@ -1221,7 +1228,7 @@ class un extends y {
   async addEquipments(e, t) {
     await this.update(e, {
       $push: { equipmentList: { $each: t } }
-    }), await le.addEntities(
+    }), await pe.addEntities(
       e,
       t.map((r) => r.entityId)
     );
@@ -1240,51 +1247,44 @@ class un extends y {
     r?.equipmentSave[t] && await this.equip(e, r.equipmentSave[t]);
   }
   async equip(e, t) {
-    const r = await O.getMaxHp(e), a = Object.fromEntries(
-      B(t).map(([s, i]) => [
+    const r = await v.getMaxHp(e), a = Object.fromEntries(
+      F(t).map(([s, i]) => [
         `equippedItems.${s}`,
         i
       ])
     );
     await this.update(e, {
       $set: a
-    }), await O.updateHp(e, r);
+    }), await v.updateHp(e, r);
   }
   async unequip(e, t) {
-    const r = await O.getMaxHp(e);
+    const r = await v.getMaxHp(e);
     await this.update(e, {
       $set: {
         [`equippedItems.${t}`]: null
       }
-    }), await O.updateHp(e, r);
+    }), await v.updateHp(e, r);
   }
   async craftItem(e, t, r, a) {
-    for (const { entityId: u, size: o } of t.entities)
-      await this.removeItem(e, u, o * r);
+    for (const { entityId: u, size: c } of t.entities)
+      await this.removeItem(e, u, (c ?? 1) * r);
     const { entityId: s, size: i } = t.result;
-    await m.isEntityId(s, m.isEquipment) ? await this.addEquipments(e, [{ entityId: s, seed: a }]) : await m.isEntityId(s, m.isItem) && await this.addItem(e, s, i * r);
-  }
-  async dismantleEntity(e, t, r, a, s) {
-    m.isEquipment(t) ? await this.removeEquipment(e, t.entityId, s) : m.isItem(t) && await this.removeItem(e, t.entityId, a);
-    for (const { entityId: i, quantity: u } of r)
-      await m.isEntityId(i, m.isItem) && await this.addItem(e, i, a * u);
-    await this.removeItem(e, "tools", 1);
-  }
-  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);
+    await T.isEntityId(s, T.isEquipment) ? await this.addEquipments(e, [{ entityId: s, seed: a }]) : await T.isEntityId(s, T.isItem) && await this.addItem(e, s, (i ?? 1) * r);
   }
   async unlockRecipe(e, t) {
-    await this.update(e, { $addToSet: { recipes: t } });
+    await this.hasRecipe(e, t) || await this.update(e, {
+      $push: { recipes: t }
+    });
   }
 }
-const cn = (n) => Z.create({
+const on = (n) => ee.create({
   user: n
 });
-async function on(n) {
-  const e = await Z.findOne({ user: n }).lean();
-  return e || p(await cn(n));
+async function cn(n) {
+  const e = await ee.findOne({ user: n }).lean();
+  return e || y(await on(n));
 }
-const dn = (n, e) => Z.findOneAndUpdate({ user: n }, e, {
+const dn = (n, e) => ee.findOneAndUpdate({ user: n }, e, {
   upsert: !0,
   returnDocument: "after"
 }).lean();
@@ -1293,7 +1293,7 @@ class ln extends un {
     super(300);
   }
   fetchFromDb(e) {
-    return on(e);
+    return cn(e);
   }
   normalizeKey(e) {
     return e.toString();
@@ -1305,8 +1305,8 @@ class ln extends un {
     return dn(e, t);
   }
 }
-const E = new ln();
-class pn extends f {
+const M = new ln();
+class pn extends w {
   async getTotalCharacteristics(e) {
     const { characteristics: t, scrolls: r } = await this.get(e);
     return Te(
@@ -1364,7 +1364,7 @@ class pn extends f {
       t.booster ? 0.25 : 0
     );
     return a + s + t.buffs.xp.global.reduce(
-      (i, { expireAt: u, startAt: o, multiplier: h }) => o && o > /* @__PURE__ */ new Date() || u && de(u) ? i : i + h,
+      (i, { expireAt: u, startAt: c, multiplier: f }) => c && c > /* @__PURE__ */ new Date() || u && le(u) ? i : i + f,
       0
     );
   }
@@ -1386,12 +1386,12 @@ class pn extends f {
   }
   async calcBuffMultiplier(e, t, r) {
     return (await this.get(e)).buffs[t][r].reduce(
-      (i, { expireAt: u, startAt: o, multiplier: h }) => i + (/* @__PURE__ */ new Date() >= (o ?? /* @__PURE__ */ new Date()) && (!u || !de(u)) ? h : 0),
+      (i, { expireAt: u, startAt: c, multiplier: f }) => i + (/* @__PURE__ */ new Date() >= (c ?? /* @__PURE__ */ new Date()) && (!u || !le(u)) ? f : 0),
       1
     );
   }
   async getMaxHp(e) {
-    const t = await E.get(e), { vitality: r } = await this.getTotalCharacteristics(e), a = await E.getUserEquipmentsCharacteristics(
+    const t = await M.get(e), { vitality: r } = await this.getTotalCharacteristics(e), a = await M.getUserEquipmentsCharacteristics(
       t
     );
     return (r + a.vitality) * Ze + et;
@@ -1401,9 +1401,9 @@ class pn extends f {
     return Math.min(t.hp / r, 1);
   }
   async hasCharacteristicRequirement(e, t) {
-    const r = await E.get(e), a = await E.getUserEquipmentsCharacteristics(
+    const r = await M.get(e), a = await M.getUserEquipmentsCharacteristics(
       r
-    ), s = Q(
+    ), s = Y(
       await this.getTotalCharacteristics(e),
       a,
       (i, u) => i + u
@@ -1427,7 +1427,7 @@ class pn extends f {
     for (const r of Object.values(t.buffs))
       for (const a of Object.values(r))
         for (const { multiplier: s, startAt: i, expireAt: u } of a)
-          if (s < 0 && (!u || !de(u)) && (i ?? /* @__PURE__ */ new Date()) <= /* @__PURE__ */ new Date())
+          if (s < 0 && (!u || !le(u)) && (i ?? /* @__PURE__ */ new Date()) <= /* @__PURE__ */ new Date())
             return !0;
     return !1;
   }
@@ -1578,15 +1578,15 @@ class pn extends f {
     });
   }
   async updatePanoplyBuff(e, t, r, a) {
-    const s = await m.fromDBToEquipableEquipment(t), i = L(Object.values(r)), o = (await R.getAllPopulated()).find(
+    const s = await T.fromDBToEquipableEquipment(t), i = Q(Object.values(r)), c = (await N.getAllPopulated()).find(
       (g) => g.panoplyId === s.panoply
     );
-    if (!o)
+    if (!c)
       return;
-    const h = o.equipments.filter(
-      (g) => (i.find(($) => g.entityId === $.entityId) || !a && s.entityId === g.entityId) && (a ? s.entityId !== g.entityId : !0)
-    ).length, I = h === o.equipments.length ? o.fullBonus : h >= o.equipments.length / 2 ? o.halfBonus : void 0;
-    o.halfBonus && "target" in o.halfBonus && await this.removeBuff(e, o.halfBonus), o.fullBonus && "target" in o.fullBonus && await this.removeBuff(e, o.fullBonus), I && "target" in I && await this.updateBuff(e, I);
+    const f = c.equipments.filter(
+      (g) => (i.find((S) => g.entityId === S.entityId) || !a && s.entityId === g.entityId) && (a ? s.entityId !== g.entityId : !0)
+    ).length, h = f === c.equipments.length ? c.fullBonus : f >= 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), h && "target" in h && await this.updateBuff(e, h);
   }
   async gainHp(e, t) {
     const r = await this.get(e), s = await this.getMaxHp(e) - r.hp;
@@ -1691,14 +1691,14 @@ class pn extends f {
     return await this.addBerry(e, a), a;
   }
 }
-const yn = (n) => v.find(n).lean(), fn = async (n) => await v.create({
+const yn = (n) => D.find(n).lean(), fn = async (n) => await D.create({
   user: n
 });
 async function mn(n) {
-  const e = await v.findOne({ user: n }).lean();
-  return e || p(await fn(n));
+  const e = await D.findOne({ user: n }).lean();
+  return e || y(await fn(n));
 }
-const hn = (n, e) => v.findOneAndUpdate({ user: n }, e, {
+const hn = (n, e) => D.findOneAndUpdate({ user: n }, e, {
   returnDocument: "after",
   upsert: !0
 }).lean();
@@ -1722,8 +1722,8 @@ class gn extends pn {
     return hn(e, t);
   }
 }
-const O = new gn();
-class Sn extends f {
+const v = new gn();
+class Sn extends w {
   async updateSendDailyQuest(e, t) {
     await this.update(e, { $set: { sendDailyQuest: t } });
   }
@@ -1742,14 +1742,14 @@ class Sn extends f {
     });
   }
 }
-const wn = (n) => F.find(n).lean(), bn = async (n) => await F.create({
+const wn = (n) => K.find(n).lean(), bn = async (n) => await K.create({
   user: n
 });
 async function $n(n) {
-  const e = await F.findOne({ user: n }).lean();
-  return e || p(await bn(n));
+  const e = await K.findOne({ user: n }).lean();
+  return e || y(await bn(n));
 }
-const In = (n, e) => F.findOneAndUpdate({ user: n }, e, {
+const In = (n, e) => K.findOneAndUpdate({ user: n }, e, {
   returnDocument: "after",
   upsert: !0
 }).lean();
@@ -1774,7 +1774,7 @@ class Un extends Sn {
   }
 }
 const Fe = new Un();
-class Tn extends y {
+class Tn extends m {
   async getCommandCooldown(e, t) {
     return (await this.get(e)).commands[t];
   }
@@ -1783,7 +1783,7 @@ class Tn extends y {
       $set: {
         lockUserCommand: new Date(Date.now() + 2 * 3600 * 1e3)
       }
-    }), await O.gainHp(e, 1);
+    }), await v.gainHp(e, 1);
   }
   async useCommand(e, t, r) {
     const { reminder: a } = await Fe.get(e);
@@ -1798,18 +1798,18 @@ class Tn extends y {
     );
   }
 }
-const En = async (n) => await W.create({
+const En = async (n) => await V.create({
   user: n
 });
-async function On(n) {
-  const e = await W.findOne({ user: n }).lean();
-  return e || p(await En(n));
+async function vn(n) {
+  const e = await V.findOne({ user: n }).lean();
+  return e || y(await En(n));
 }
-const Dn = (n, e) => W.findOneAndUpdate({ user: n }, e, {
+const On = (n, e) => V.findOneAndUpdate({ user: n }, e, {
   returnDocument: "after",
   upsert: !0
 }).lean();
-class vn extends Tn {
+class Dn extends Tn {
   constructor() {
     super(300);
   }
@@ -1820,14 +1820,14 @@ class vn extends Tn {
     return e.user;
   }
   fetchFromDb(e) {
-    return On(e);
+    return vn(e);
   }
   updateInDb(e, t) {
-    return Dn(e, t);
+    return On(e, t);
   }
 }
-const Qa = new vn();
-class Mn extends f {
+const Qa = new Dn();
+class xn extends w {
   async isOrnamentIds(e, t = () => !0) {
     const a = (await this.getAll()).filter(t).map(({ ornamentId: s }) => s);
     return e.every((s) => a.includes(s));
@@ -1866,12 +1866,12 @@ class Mn extends f {
     return (await this.getAll()).filter((e) => this.isShopTitle(e));
   }
   formatBackgroundId(e) {
-    const t = ot(e) ? e : e.ornamentId;
+    const t = ct(e) ? e : e.ornamentId;
     return t === "background_default" ? "par défaut" : `"${dt(t.split("_").join(" "))}"`;
   }
   async getSomeShopTitles(e) {
     const t = await this.getAllShopTitles();
-    return pe(
+    return ye(
       Se(
         e,
         t,
@@ -1883,7 +1883,7 @@ class Mn extends f {
   }
   async getSomeBackgrounds(e) {
     const t = await this.getAllBackgrounds();
-    return pe(
+    return ye(
       Se(
         e,
         t,
@@ -1898,7 +1898,7 @@ class Mn extends f {
       throw new RangeError(
         "pickEachRarityOrnament - must give same number of odds than ranks"
       );
-    return L(
+    return Q(
       t.map((r, a) => {
         const s = ge[a], i = e[s];
         return Math.random() > r || !i || !i.length ? null : lt(i);
@@ -1906,7 +1906,7 @@ class Mn extends f {
     );
   }
 }
-const xn = new c(
+const Mn = new o(
   {
     ornamentId: { unique: !0, index: 1, required: !0, type: String },
     type: { required: !0, type: String },
@@ -1920,26 +1920,26 @@ const xn = new c(
     strength: Number
   },
   { minimize: !1 }
-), fe = d?.Ornaments || l("Ornaments", xn), qn = async (n, e) => fe.find(n, {}, e).lean();
-async function An(n) {
-  const e = await fe.findOne({ ornamentId: n }).lean();
+), me = d?.Ornaments || l("Ornaments", Mn), An = async (n, e) => me.find(n, {}, e).lean();
+async function kn(n) {
+  const e = await me.findOne({ ornamentId: n }).lean();
   return e || null;
 }
-const kn = (n, e) => fe.findOneAndUpdate(n, e, {
+const qn = (n, e) => me.findOneAndUpdate(n, e, {
   returnDocument: "after"
 }).lean();
-class Rn extends Mn {
+class Rn extends xn {
   constructor() {
     super(3600);
   }
   updateInDb(e, t) {
-    return kn(e, t);
+    return qn(e, t);
   }
   fetchFromDb(e) {
-    return An(e);
+    return kn(e);
   }
   fetchManyFromDb(e, t) {
-    return qn(e, t);
+    return An(e, t);
   }
   getKey(e) {
     return e.ornamentId;
@@ -1949,7 +1949,7 @@ class Rn extends Mn {
   }
 }
 const U = new Rn();
-class Cn extends y {
+class Cn extends m {
   async unlockTitle(e, t) {
     await U.isOrnamentIds([t], U.isTitle) && await this.update(e, { $addToSet: { unlockedTitles: t } });
   }
@@ -2018,14 +2018,14 @@ class Cn extends y {
     });
   }
 }
-const _n = async (n) => await ee.create({
+const Bn = async (n) => await te.create({
   user: n
 });
-async function Bn(n) {
-  const e = await ee.findOne({ user: n }).lean();
-  return e || p(await _n(n));
+async function _n(n) {
+  const e = await te.findOne({ user: n }).lean();
+  return e || y(await Bn(n));
 }
-const Fn = async (n, e) => ee.findOneAndUpdate({ user: n }, e, {
+const Fn = async (n, e) => te.findOneAndUpdate({ user: n }, e, {
   upsert: !0,
   returnDocument: "after"
 }).lean();
@@ -2040,14 +2040,14 @@ class Nn extends Cn {
     return e;
   }
   fetchFromDb(e) {
-    return Bn(e);
+    return _n(e);
   }
   updateInDb(e, t) {
     return Fn(e, t);
   }
 }
 const we = new Nn();
-class Kn extends f {
+class Kn extends w {
   async getStatus(e, t) {
     return (await this.get({ user: e, questId: t })).status;
   }
@@ -2056,17 +2056,17 @@ class Kn extends f {
   }
   async isStreaking(e, t) {
     const { lastCompletionDate: r } = await this.get({ user: e, questId: t });
-    return !!r && Oe(Y(), r);
+    return !!r && ve(G(), 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: q.COMPLETED })).length;
+    return (await this.getMany({ user: e, status: k.COMPLETED })).length;
   }
   async completeQuest(e, t = !1) {
-    const r = Y();
+    const r = G();
     r.setHours(0, 0, 0, 0);
     const a = /* @__PURE__ */ new Date();
     return a.setHours(0, 0, 0, 0), this.update(
@@ -2089,7 +2089,7 @@ class Kn extends f {
               }
             } : {},
             lastCompletionDate: /* @__PURE__ */ new Date(),
-            status: q.COMPLETED
+            status: k.COMPLETED
           }
         }
       ],
@@ -2105,7 +2105,7 @@ const Pn = async (n) => await C.create({
 });
 async function jn(n) {
   const e = await C.findOne(n).lean();
-  return e || p(await Pn(n));
+  return e || y(await Pn(n));
 }
 function zn(n, e, t) {
   return C.findOneAndUpdate(n, e, {
@@ -2138,7 +2138,7 @@ class Ln extends Kn {
   }
 }
 const be = new Ln();
-class Qn extends y {
+class Qn extends m {
   async randomMessageIncrement(e) {
     await this.update(e, { $inc: { randomMessageClaimed: 1 } });
   }
@@ -2156,14 +2156,14 @@ class Qn extends y {
     await this.update(e, { $inc: { totalMinutesInVoice: t } });
   }
 }
-const Yn = async (n) => await ne.create({
+const Yn = async (n) => await re.create({
   user: n
 });
 async function Gn(n) {
-  const e = await ne.findOne({ user: n }).lean();
-  return e || p(await Yn(n));
+  const e = await re.findOne({ user: n }).lean();
+  return e || y(await Yn(n));
 }
-const Wn = (n, e) => ne.findOneAndUpdate({ user: n }, e, {
+const Wn = (n, e) => re.findOneAndUpdate({ user: n }, e, {
   upsert: !0,
   returnDocument: "after"
 }).lean();
@@ -2187,11 +2187,11 @@ class Vn extends Qn {
   }
 }
 const $e = new Vn();
-class Xn extends y {
+class Xn extends m {
   async updateDailyReport(e) {
-    const t = await O.get(e), r = await we.get(e), a = await be.getMany({
+    const t = await v.get(e), r = await we.get(e), a = await be.getMany({
       user: e,
-      status: q.COMPLETED
+      status: k.COMPLETED
     }), s = await $e.get(e);
     await this.update(e, {
       $set: {
@@ -2214,22 +2214,22 @@ class Xn extends y {
       xpYesterday: a,
       berryYesterday: s,
       previousMessageSent: i
-    } = await this.get(e), u = await O.get(e), o = await be.getMany({
+    } = await this.get(e), u = await v.get(e), c = await be.getMany({
       user: e,
-      status: q.COMPLETED
-    }), h = await we.get(e), I = await $e.get(e), { berry: g, xp: $ } = u, { voice: he, amount: He } = $, { unlockedBadges: Pe, unlockedBackgrounds: je, unlockedTitles: ze } = h;
+      status: k.COMPLETED
+    }), f = await we.get(e), h = await $e.get(e), { berry: g, xp: S } = u, { voice: p, amount: He } = S, { unlockedBadges: Pe, unlockedBackgrounds: je, unlockedTitles: ze } = f;
     return {
       berry: g - s,
       xp: He - a,
-      message: I.messageSent - i,
-      voice: Oe(he.lastConnection, Y()) ? he.minutesInVoiceToday : 0,
-      quest: P(
-        o.map(({ questId: Le }) => Le),
+      message: h.messageSent - i,
+      voice: ve(p.lastConnection, G()) ? p.minutesInVoiceToday : 0,
+      quest: z(
+        c.map(({ questId: Le }) => Le),
         r
       ),
-      badge: P(Pe, t.unlockedBadges),
-      title: P(ze, t.unlockedTitles),
-      background: P(
+      badge: z(Pe, t.unlockedBadges),
+      title: z(ze, t.unlockedTitles),
+      background: z(
         je,
         t.unlockedBackgrounds
       )
@@ -2249,14 +2249,14 @@ class Xn extends y {
     );
   }
 }
-const Jn = (n) => V.create({
+const Jn = (n) => X.create({
   user: n
 });
 async function Zn(n) {
-  const e = await V.findOne({ user: n }).lean();
-  return e || p(await Jn(n));
+  const e = await X.findOne({ user: n }).lean();
+  return e || y(await Jn(n));
 }
-const er = (n, e) => V.findOneAndUpdate({ user: n }, e, {
+const er = (n, e) => X.findOneAndUpdate({ user: n }, e, {
   upsert: !0,
   returnDocument: "after"
 }).lean();
@@ -2278,7 +2278,7 @@ class tr extends Xn {
   }
 }
 const Ya = new tr();
-class nr extends y {
+class nr extends m {
   async setGuessGame(e, t, r, a) {
     await this.update(e, {
       $set: {
@@ -2309,14 +2309,14 @@ class nr extends y {
     });
   }
 }
-const rr = async (n) => await J.create({
+const rr = async (n) => await Z.create({
   user: n
 });
 async function ar(n) {
-  const e = await J.findOne({ user: n }).lean();
-  return e || p(await rr(n));
+  const e = await Z.findOne({ user: n }).lean();
+  return e || y(await rr(n));
 }
-const sr = (n, e) => J.findOneAndUpdate({ user: n }, e, {
+const sr = (n, e) => Z.findOneAndUpdate({ user: n }, e, {
   upsert: !0,
   returnDocument: "after"
 }).lean();
@@ -2337,9 +2337,9 @@ class ir extends nr {
     return sr(e, t);
   }
 }
-const Ga = new ir(), ur = new c({
+const Ga = new ir(), ur = new o({
   user: {
-    type: c.Types.ObjectId,
+    type: o.Types.ObjectId,
     required: !0,
     unique: !0,
     ref: "User"
@@ -2347,10 +2347,10 @@ const Ga = new ir(), ur = new c({
   xp: { type: Number, default: 0 },
   berry: { type: Number, default: 0 },
   faction: { type: Number, default: 0 }
-}), x = d?.UserRank || l("UserRank", ur);
-class cr extends y {
+}), A = d?.UserRank || l("UserRank", ur);
+class or extends m {
   async computeAllXpRanks() {
-    const t = (await v.aggregate([
+    const t = (await D.aggregate([
       {
         $setWindowFields: {
           sortBy: { "xp.amount": -1 },
@@ -2365,10 +2365,10 @@ class cr extends y {
         upsert: !0
       }
     }));
-    t.length > 0 && await x.bulkWrite(t), this.clearAll();
+    t.length > 0 && await A.bulkWrite(t), this.clearAll();
   }
   async computeAllBerryRanks() {
-    const t = (await v.aggregate([
+    const t = (await D.aggregate([
       {
         $setWindowFields: {
           sortBy: { berry: -1 },
@@ -2383,10 +2383,10 @@ class cr extends y {
         upsert: !0
       }
     }));
-    t.length > 0 && await x.bulkWrite(t), this.clearAll();
+    t.length > 0 && await A.bulkWrite(t), this.clearAll();
   }
   async computeAllFactionRanks() {
-    const t = (await b.aggregate([
+    const t = (await I.aggregate([
       {
         $lookup: {
           from: "usermetas",
@@ -2411,7 +2411,7 @@ class cr extends y {
         upsert: !0
       }
     }));
-    t.length > 0 && await x.bulkWrite(t), this.clearAll();
+    t.length > 0 && await A.bulkWrite(t), this.clearAll();
   }
   async computeAllRanks() {
     await Promise.all([
@@ -2421,18 +2421,18 @@ class cr extends y {
     ]);
   }
 }
-const or = async (n) => await x.create({
+const cr = async (n) => await A.create({
   user: n
 });
 async function dr(n) {
-  const e = await x.findOne({ user: n }).lean();
-  return e || p(await or(n));
+  const e = await A.findOne({ user: n }).lean();
+  return e || y(await cr(n));
 }
-const lr = (n, e) => x.findOneAndUpdate({ user: n }, e, {
+const lr = (n, e) => A.findOneAndUpdate({ user: n }, e, {
   returnDocument: "after",
   upsert: !0
 }).lean();
-class pr extends cr {
+class pr extends or {
   constructor() {
     super(300);
   }
@@ -2449,14 +2449,15 @@ class pr extends cr {
     return lr(e, t);
   }
 }
-const Wa = new pr(), yr = new c(
+const Wa = new pr(), yr = new o(
   {
     speakerId: { type: String, required: !0 },
     order: { type: Number },
+    index: { type: Number },
     args: { type: [String], enum: nt, default: void 0 }
   },
   { _id: !1 }
-), fr = new c(
+), fr = new o(
   {
     stepId: { type: String, required: !0 },
     type: {
@@ -2466,11 +2467,11 @@ const Wa = new pr(), yr = new c(
     },
     actionType: { type: String, enum: rt },
     messages: { type: [yr], default: void 0 },
-    payload: { type: c.Types.Mixed, default: void 0 },
+    payload: { type: o.Types.Mixed, default: void 0 },
     next: { type: String }
   },
   { _id: !1 }
-), mr = new c(
+), mr = new o(
   {
     sceneId: { type: String, required: !0 },
     steps: { type: Map, of: fr, required: !0 },
@@ -2478,7 +2479,7 @@ const Wa = new pr(), yr = new c(
     next: { type: String }
   },
   { _id: !1 }
-), hr = new c(
+), hr = new o(
   {
     chapterId: { type: String, required: !0 },
     scenes: { type: Map, of: mr, required: !0 },
@@ -2486,7 +2487,7 @@ const Wa = new pr(), yr = new c(
     next: { type: String }
   },
   { _id: !1 }
-), gr = new c(
+), gr = new o(
   {
     type: {
       type: String,
@@ -2496,7 +2497,7 @@ const Wa = new pr(), yr = new c(
     speakerId: { type: String, required: !0 }
   },
   { _id: !1 }
-), Ne = new c({
+), Ne = new o({
   storyId: {
     type: String,
     required: !0,
@@ -2509,20 +2510,24 @@ const Wa = new pr(), yr = new c(
 Ne.pre("findOneAndUpdate", function() {
   this.setOptions({ runValidators: !0 });
 });
-const ae = d?.Story || l("Story", Ne), Sr = async (n) => await ae.create(n), j = {
+const se = d?.Story || l("Story", Ne), Sr = async (n) => await se.create(n), _ = {
   storyId: "main",
   speakers: it,
   chapters: {
-    [oe.chapterId]: oe
+    [de.chapterId]: de
   },
-  entryChapterId: oe.chapterId
+  entryChapterId: de.chapterId
 };
-class wr extends f {
+class wr extends w {
   async seed() {
-    return await this.get(j.storyId) ? this.update({ storyId: j.storyId }, { $set: j }) : Sr(j);
+    return await this.get(_.storyId) ? this.update({ storyId: _.storyId }, { $set: _ }) : Sr(_);
+  }
+  async getStep(e, t, r) {
+    const a = await this.get(_.storyId);
+    return a ? a.chapters?.[e]?.scenes?.[t]?.steps?.[r] : null;
   }
 }
-const br = (n, e = {}) => ae.find(n, null, e).lean(), $r = (n) => ae.findOne({ storyId: n }).lean(), Ir = (n, e) => ae.findOneAndUpdate({ storyId: n }, e, {
+const br = (n, e = {}) => se.find(n, null, e).lean(), $r = (n) => se.findOne({ storyId: n }).lean(), Ir = (n, e) => se.findOneAndUpdate({ storyId: n }, e, {
   returnDocument: "after"
 }).lean();
 class Ur extends wr {
@@ -2546,7 +2551,7 @@ class Ur extends wr {
     return Ir(r, t);
   }
 }
-const T = new Ur(), Tr = new c(
+const E = new Ur(), Tr = new o(
   {
     chapterId: { type: String, required: !0 },
     sceneId: { type: String, required: !0 },
@@ -2554,9 +2559,9 @@ const T = new Ur(), Tr = new c(
     value: { type: String, required: !0 }
   },
   { _id: !1 }
-), Ke = new c({
+), Ke = new o({
   user: {
-    type: c.Types.ObjectId,
+    type: o.Types.ObjectId,
     required: !0,
     ref: "User",
     index: !0
@@ -2577,20 +2582,20 @@ const T = new Ur(), Tr = new c(
   choices: { type: [Tr], default: [] }
 });
 Ke.index({ user: 1, storyId: 1 }, { unique: !0 });
-const H = d?.UserStory || l("UserStory", Ke), Er = async (n, e, t, r, a) => await H.create({
+const j = d?.UserStory || l("UserStory", Ke), Er = async (n, e, t, r, a) => await j.create({
   user: n,
   storyId: e,
   currentChapterId: t,
   currentSceneId: r,
   currentStepId: a,
   status: "in_progress"
-}), Or = (n, e) => H.deleteOne({ user: n, storyId: e }).then(() => {
-}), Dr = (n, e, t, r) => {
+}), vr = (n, e) => j.deleteOne({ user: n, storyId: e }).then(() => {
+}), Or = (n, e, t, r) => {
   const a = n.chapters[e];
   if (!a) return null;
   const s = a.scenes[t];
   if (!s) return null;
-  if (s.steps[r])
+  if (r && s.steps[r])
     return { chapterId: e, sceneId: t, stepId: r };
   if (s.next) {
     const i = a.scenes[s.next];
@@ -2614,101 +2619,113 @@ const H = d?.UserStory || l("UserStory", Ke), Er = async (n, e, t, r, a) => awai
     }
   }
   return null;
-}, z = (n, e) => {
+}, L = (n, e) => {
   const t = n.chapters[e.currentChapterId];
   if (!t) return null;
   const r = t.scenes[e.currentSceneId];
   return r ? r.steps[e.currentStepId] ?? null : null;
-}, vr = (n, e, t, r, a) => {
+}, Dr = (n, e, t, r, a) => {
   const s = [], i = /* @__PURE__ */ new Set();
   let u = n.entryStepId;
   for (; u && !i.has(u); ) {
     i.add(u);
-    const o = n.steps[u];
-    if (!o) break;
-    if (o.type !== "action") {
-      if (s.push({ step: o }), u === a) break;
-      u = o.next;
+    const c = n.steps[u];
+    if (!c) break;
+    if (c.type !== "action") {
+      if (s.push({ step: c }), u === a) break;
+      u = c.next;
       continue;
     }
-    if (o.actionType === "button") {
-      const I = e.find(
-        ($) => $.chapterId === t && $.sceneId === r && $.stepId === u
+    if (c.actionType === "button") {
+      const f = e.find(
+        (g) => g.chapterId === t && g.sceneId === r && g.stepId === u
       );
-      if (!I) {
-        s.push({ step: o });
+      if (!f) {
+        s.push({ step: c });
         break;
       }
-      const g = o.payload.find(
-        ($) => $.actionId === I.value
+      const h = c.payload.find(
+        (g) => g.actionId === f.value
       );
-      if (!g || (s.push({ step: o, selectedAction: g }), u === a)) break;
-      u = g.next;
+      if (!h || (s.push({ step: c, selectedAction: h }), u === a)) break;
+      u = h.next;
       continue;
     }
-    if (s.push({ step: o }), u === a) break;
-    u = o.payload[0]?.next;
+    if (c.actionType === "command") {
+      const f = u, h = Array.from(
+        new Set(
+          e.filter(
+            (S) => S.chapterId === t && S.sceneId === r && S.stepId === f
+          ).map((S) => S.value)
+        )
+      );
+      if (s.push({ step: c, validatedActionIds: h }), !c.payload.every(
+        (S) => h.includes(S.actionId)
+      ) || u === a) break;
+      u = c.next;
+    }
   }
   return s;
 };
-class Mr extends f {
+class xr extends w {
   async getCurrentStep(e, t) {
     const r = await this.get({ user: e, storyId: t });
     if (!r) return null;
-    const a = await T.get(t);
-    return a ? z(a, r) : null;
+    const a = await E.get(t);
+    return a ? L(a, r) : null;
   }
   async getSceneSteps(e, t, r, a) {
     const s = await this.get({ user: e, storyId: t });
     if (!s) return null;
-    const i = await T.get(t);
+    const i = await E.get(t);
     if (!i) return null;
     const u = i.chapters[r];
     if (!u) return null;
-    const o = u.scenes[a];
-    if (!o) return null;
-    const h = s.status === "in_progress" && s.currentChapterId === r && s.currentSceneId === a;
-    return vr(
-      o,
+    const c = u.scenes[a];
+    if (!c) return null;
+    const f = s.status === "in_progress" && s.currentChapterId === r && s.currentSceneId === a;
+    return Dr(
+      c,
       s.choices,
       r,
       a,
-      h ? s.currentStepId : void 0
+      f ? s.currentStepId : void 0
     );
   }
   async start(e, t) {
-    const r = await T.get(t);
+    const r = await E.get(t);
     if (!r) return null;
     const a = r.chapters[r.entryChapterId];
     if (!a) return null;
     const s = a.scenes[a.entrySceneId];
     if (!s) return null;
-    await Or(e, t), this.invalidate({ user: e, storyId: t });
+    await vr(e, t), this.invalidate({ user: e, storyId: t });
     const i = await Er(
       e,
       t,
       r.entryChapterId,
       a.entrySceneId,
       s.entryStepId
-    ), u = p(i);
+    ), u = y(i);
     return this.cache.set(this.normalizeKey({ user: e, storyId: t }), u), u;
   }
   async advanceToNext(e, t) {
     const r = await this.get({ user: e, storyId: t });
-    if (!r) return { status: "error" };
+    if (!r) return { status: "error", message: "user story not found" };
     if (r.status === "completed") return { status: "completed" };
-    const a = await T.get(t);
-    if (!a) return { status: "error" };
-    const s = z(a, r);
-    if (!s) return { status: "error" };
+    const a = await E.get(t);
+    if (!a) return { status: "error", message: "story not found" };
+    const s = L(a, r);
+    if (!s) return { status: "error", message: "current step not found" };
     if (s.type === "action") return { status: "action_required" };
     if (!s.next) return { status: "scene_ended" };
     const i = a.chapters[r.currentChapterId];
-    if (!i) return { status: "error" };
+    if (!i)
+      return { status: "error", message: "current chapter not found" };
     const u = i.scenes[r.currentSceneId];
-    if (!u) return { status: "error" };
+    if (!u) return { status: "error", message: "current scene not found" };
     if (!u.steps[s.next]) return { status: "scene_ended" };
-    const o = await this.advanceTo(
+    const c = await this.advanceTo(
       e,
       t,
       a,
@@ -2716,12 +2733,12 @@ class Mr extends f {
       r.currentSceneId,
       s.next
     );
-    return o ? { status: "advanced", data: o } : { status: "error" };
+    return c ? { status: "advanced", data: c } : { status: "error", message: "failed to advance step" };
   }
   async advanceToNextScene(e, t) {
     const r = await this.get({ user: e, storyId: t });
     if (!r || r.status === "completed") return null;
-    const a = await T.get(t);
+    const a = await E.get(t);
     if (!a) return null;
     const s = a.chapters[r.currentChapterId];
     if (!s) return null;
@@ -2740,30 +2757,74 @@ class Mr extends f {
   }
   async validateCommandAndAdvance(e, t, r) {
     const a = await this.get({ user: e, storyId: t });
-    if (!a || a.status === "completed") return null;
-    const s = await T.get(t);
-    if (!s) return null;
-    const i = z(s, a);
+    if (!a || a.status === "completed")
+      return {
+        status: "error",
+        message: "user story not found or already completed"
+      };
+    const s = await E.get(t);
+    if (!s) return { status: "error", message: "story not found" };
+    const i = L(s, a);
     if (!i || i.type !== "action" || i.actionType !== "command")
-      return null;
-    const u = i.payload.find((o) => o.commandId === r);
-    return u ? this.advanceTo(
+      return {
+        status: "error",
+        message: "current step is not a command action"
+      };
+    const u = i.payload.find((p) => p.commandId === r);
+    if (!u)
+      return {
+        status: "error",
+        message: `command "${r}" not in step payload`
+      };
+    const c = {
+      chapterId: a.currentChapterId,
+      sceneId: a.currentSceneId,
+      stepId: a.currentStepId,
+      value: u.actionId
+    }, f = a.choices.some(
+      (p) => p.chapterId === c.chapterId && p.sceneId === c.sceneId && p.stepId === c.stepId && p.value === u.actionId
+    ), h = new Set(
+      a.choices.filter(
+        (p) => p.chapterId === c.chapterId && p.sceneId === c.sceneId && p.stepId === c.stepId
+      ).map((p) => p.value)
+    );
+    if (h.add(u.actionId), !i.payload.every(
+      (p) => h.has(p.actionId)
+    )) {
+      if (f)
+        return {
+          status: "partial",
+          data: a
+        };
+      const p = await this.update(
+        { user: e, storyId: t },
+        { $push: { choices: c } }
+      );
+      return p ? {
+        status: "partial",
+        data: p,
+        feedbackStepId: u.next
+      } : { status: "error", message: "failed to record command" };
+    }
+    const S = await this.advanceTo(
       e,
       t,
       s,
       a.currentChapterId,
       a.currentSceneId,
-      u.next
-    ) : null;
+      i.next,
+      f ? void 0 : c
+    );
+    return S ? { status: "advanced", data: S, feedbackStepId: u.next } : { status: "error", message: "failed to advance step" };
   }
   async validateActionAndAdvance(e, t, r) {
     const a = await this.get({ user: e, storyId: t });
     if (!a || a.status === "completed") return null;
-    const s = await T.get(t);
+    const s = await E.get(t);
     if (!s) return null;
-    const i = z(s, a);
+    const i = L(s, a);
     if (!i || i.type !== "action") return null;
-    const u = i.payload.find((o) => o.actionId === r);
+    const u = i.payload.find((c) => c.actionId === r);
     return u ? this.advanceTo(
       e,
       t,
@@ -2780,14 +2841,14 @@ class Mr extends f {
     ) : null;
   }
   async advanceTo(e, t, r, a, s, i, u) {
-    const o = Dr(r, a, s, i);
-    return o ? this.update(
+    const c = Or(r, a, s, i);
+    return c ? this.update(
       { user: e, storyId: t },
       {
         $set: {
-          currentChapterId: o.chapterId,
-          currentSceneId: o.sceneId,
-          currentStepId: o.stepId
+          currentChapterId: c.chapterId,
+          currentSceneId: c.sceneId,
+          currentStepId: c.stepId
         },
         ...u && { $push: { choices: u } }
       }
@@ -2800,12 +2861,12 @@ class Mr extends f {
     );
   }
 }
-const xr = (n, e = {}) => H.find(n, null, e).lean(), qr = (n, e) => H.findOne({ user: n, storyId: e }).lean(), Ar = (n, e) => H.findOneAndUpdate(n, e, {
+const Mr = (n, e = {}) => j.find(n, null, e).lean(), Ar = (n, e) => j.findOne({ user: n, storyId: e }).lean(), kr = (n, e) => j.findOneAndUpdate(n, e, {
   returnDocument: "after"
 }).lean();
-class kr extends Mr {
+class qr extends xr {
   constructor() {
-    super(120);
+    super(1800, { maxKeys: 5e4 });
   }
   normalizeKey(e) {
     return `${e.user.toString()}:${e.storyId}`;
@@ -2814,17 +2875,17 @@ class kr extends Mr {
     return { user: e.user, storyId: e.storyId };
   }
   fetchFromDb(e) {
-    return qr(e.user, e.storyId);
+    return Ar(e.user, e.storyId);
   }
   fetchManyFromDb(e, t) {
-    return xr(e, t);
+    return Mr(e, t);
   }
   updateInDb(e, t) {
-    return Ar(e, t);
+    return kr(e, t);
   }
 }
-const Va = new kr();
-class Rr extends y {
+const Va = new qr();
+class Rr extends m {
   async didSevenDoubleAtDoQ(e) {
     await this.update(e, {
       $inc: { "doubleOrQuit.sevenDoubleInARowCount": 1 }
@@ -2848,10 +2909,10 @@ class Rr extends y {
     await this.update(e, { $inc: { drawCount: 1 } });
   }
   async bet666(e) {
-    const t = Y();
+    const t = G();
     t.setHours(0, 0, 0, 0);
     const r = /* @__PURE__ */ new Date();
-    r.setHours(0, 0, 0, 0), await A.updateOne(
+    r.setHours(0, 0, 0, 0), await q.updateOne(
       {
         user: e,
         "bet666.last": {
@@ -2860,7 +2921,7 @@ class Rr extends y {
         }
       },
       { $inc: { "bet666.count": 1 }, $set: { "bet666.last": /* @__PURE__ */ new Date() } }
-    ), await A.updateOne(
+    ), await q.updateOne(
       {
         user: e,
         "bet666.last": {
@@ -2903,14 +2964,14 @@ class Rr extends y {
     await this.update(e, { $inc: { "dice.drawWithDoubleSixCount": 1 } });
   }
 }
-const Cr = async (n) => await A.create({
+const Cr = async (n) => await q.create({
   user: n
 });
-async function _r(n) {
-  const e = await A.findOne({ user: n }).lean();
-  return e || p(await Cr(n));
+async function Br(n) {
+  const e = await q.findOne({ user: n }).lean();
+  return e || y(await Cr(n));
 }
-const Br = (n, e) => A.findOneAndUpdate({ user: n }, e, {
+const _r = (n, e) => q.findOneAndUpdate({ user: n }, e, {
   upsert: !0,
   returnDocument: "after"
 }).lean();
@@ -2925,14 +2986,14 @@ class Fr extends Rr {
     return e;
   }
   fetchFromDb(e) {
-    return _r(e);
+    return Br(e);
   }
   updateInDb(e, t) {
-    return Br(e, t);
+    return _r(e, t);
   }
 }
 const Xa = new Fr();
-class Nr extends y {
+class Nr extends m {
   async workIncrement(e) {
     await this.update(e, { $inc: { workCount: 1 } });
   }
@@ -2944,14 +3005,14 @@ class Nr extends y {
     });
   }
 }
-const Kr = (n) => te.create({
+const Kr = (n) => ne.create({
   user: n
 });
 async function Hr(n) {
-  const e = await te.findOne({ user: n }).lean();
-  return e || p(await Kr(n));
+  const e = await ne.findOne({ user: n }).lean();
+  return e || y(await Kr(n));
 }
-const Pr = (n, e) => te.findOneAndUpdate({ user: n }, e, {
+const Pr = (n, e) => ne.findOneAndUpdate({ user: n }, e, {
   upsert: !0,
   returnDocument: "after"
 }).lean();
@@ -2973,7 +3034,7 @@ class jr extends Nr {
   }
 }
 const Ja = new jr();
-class zr extends y {
+class zr extends m {
   async hasReportedSomeone(e) {
     await this.update(e, { $set: { reportedSomeone: !0 } });
   }
@@ -3004,14 +3065,14 @@ class zr extends y {
     await this.update(e, { $set: { "gamblingFlags.lose10M": !0 } });
   }
 }
-const Lr = async (n) => await re.create({
+const Lr = async (n) => await ae.create({
   user: n
 });
 async function Qr(n) {
-  const e = await re.findOne({ user: n }).lean();
-  return e || p(await Lr(n));
+  const e = await ae.findOne({ user: n }).lean();
+  return e || y(await Lr(n));
 }
-const Yr = (n, e) => re.findOneAndUpdate({ user: n }, e, {
+const Yr = (n, e) => ae.findOneAndUpdate({ user: n }, e, {
   upsert: !0,
   returnDocument: "after"
 }).lean();
@@ -3033,10 +3094,10 @@ class Gr extends zr {
   }
 }
 const Za = new Gr();
-class Wr extends y {
+class Wr extends m {
   async readEdito(e) {
     const t = /* @__PURE__ */ new Date();
-    t.setHours(0, 0, 0, 0), await D.updateOne(
+    t.setHours(0, 0, 0, 0), await O.updateOne(
       {
         user: e,
         "edito.lastTimeRead": {
@@ -3047,7 +3108,7 @@ class Wr extends y {
         $inc: { "edito.readToday": 1 },
         $set: { "edito.lastTimeRead": /* @__PURE__ */ new Date() }
       }
-    ), await D.updateOne(
+    ), await O.updateOne(
       {
         user: e,
         "edito.lastTimeRead": {
@@ -3061,7 +3122,7 @@ class Wr extends y {
   }
   async getTotalEditoReadToday() {
     const e = /* @__PURE__ */ new Date();
-    return e.setHours(0, 0, 0, 0), (await D.aggregate([
+    return e.setHours(0, 0, 0, 0), (await O.aggregate([
       {
         $match: {
           "edito.lastTimeRead": { $gte: e },
@@ -3072,14 +3133,14 @@ class Wr extends y {
     ]))[0]?.total ?? 0;
   }
 }
-const Vr = async (n) => await D.create({
+const Vr = async (n) => await O.create({
   user: n
 });
 async function Xr(n) {
-  const e = await D.findOne({ user: n }).lean();
-  return e || p(await Vr(n));
+  const e = await O.findOne({ user: n }).lean();
+  return e || y(await Vr(n));
 }
-const Jr = (n, e) => D.findOneAndUpdate({ user: n }, e, {
+const Jr = (n, e) => O.findOneAndUpdate({ user: n }, e, {
   upsert: !0,
   returnDocument: "after"
 }).lean();
@@ -3101,10 +3162,10 @@ class Zr extends Wr {
   }
 }
 const es = new Zr();
-class ea extends y {
+class ea extends m {
   async updateCraftStats(e, t, r) {
-    const a = await m.get(r);
-    !a || !m.isItem(a) || await this.update(e, {
+    const a = await T.get(r);
+    !a || !T.isItem(a) || await this.update(e, {
       $inc: {
         "crafts.totalCrafted": t
       }
@@ -3122,7 +3183,7 @@ class ea extends y {
   }
   async incrementBottleUsedToday(e, t) {
     const r = /* @__PURE__ */ new Date();
-    r.setHours(0, 0, 0, 0), await k.updateOne(
+    r.setHours(0, 0, 0, 0), await R.updateOne(
       {
         user: e,
         "bottle.lastUsed": {
@@ -3133,7 +3194,7 @@ class ea extends y {
         $inc: { "bottle.usedToday": t },
         $set: { "bottle.lastUsed": /* @__PURE__ */ new Date() }
       }
-    ), await k.updateOne(
+    ), await R.updateOne(
       {
         user: e,
         "bottle.lastUsed": {
@@ -3159,14 +3220,14 @@ class ea extends y {
     });
   }
 }
-const ta = async (n) => await k.create({
+const ta = async (n) => await R.create({
   user: n
 });
 async function na(n) {
-  const e = await k.findOne({ user: n }).lean();
-  return e || p(await ta(n));
+  const e = await R.findOne({ user: n }).lean();
+  return e || y(await ta(n));
 }
-const ra = (n, e) => k.findOneAndUpdate({ user: n }, e, {
+const ra = (n, e) => R.findOneAndUpdate({ user: n }, e, {
   upsert: !0,
   returnDocument: "after"
 }).lean();
@@ -3188,73 +3249,62 @@ class aa extends ea {
   }
 }
 const ts = new aa();
-class sa extends f {
+class sa extends w {
   async maxCraftQuantity(e, t) {
-    const r = await E.get(e);
+    const r = await M.get(e);
     let a = 1 / 0;
     for (const s of t)
       a = Math.min(
         a,
         Math.floor(
-          (r.itemList[s.entityId] ?? 0) / s.size
+          (r.itemList[s.entityId] ?? 0) / (s.size ?? 1)
         )
       );
     return a;
   }
   async hasEnoughItemsForRecipe(e, t, r) {
-    const a = await E.get(e);
+    const a = await M.get(e);
     for (const s of t.entities)
-      if ((a.itemList[s.entityId] ?? 0) < s.size * r)
+      if ((a.itemList[s.entityId] ?? 0) < (s.size ?? 1) * r)
         return !1;
     return !0;
   }
-  decodeCraftId(e) {
-    return e.split(";").map((t, r) => ({
-      entityId: t === "null" ? null : t,
-      index: r
-    }));
-  }
-  encodeCraftId(e) {
-    return e.map(({ entityId: t }) => `${t}`).join(";");
-  }
   async isValidRecipe(e) {
-    return !!(await this.getAll()).find((r) => r.craftId === e);
+    return !!(await this.getAll()).find((r) => r.recipeId === e);
   }
   async getRecipeResult(e, t) {
-    const r = await E.get(e), a = (await R.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;
+    return t;
   }
 }
-const ia = new c(
+const ia = new o(
   {
     entityId: { type: String, required: !0 },
-    size: { type: Number, required: !0 }
+    size: { type: Number, default: 1 }
   },
   { _id: !1 }
-), ua = new c(
+), ua = new o(
   {
     entityId: { type: String, required: !0 },
-    size: { type: Number, required: !0 }
+    size: { type: Number }
   },
   { _id: !1 }
-), ca = new c(
+), oa = new o(
   {
-    craftId: { type: String, unique: !0, required: !0 },
-    name: { type: String, required: !0 },
+    recipeId: { type: String, unique: !0, required: !0 },
+    rankId: String,
+    type: { type: String, required: !0 },
     entities: { type: [ia], required: !0 },
     result: { type: ua, required: !0 }
   },
   { minimize: !1 }
-), se = d?.Recipes || l("Recipes", ca), oa = async (n) => await se.create({
+), ie = d?.Recipes || l("Recipes", oa), ca = async (n) => await ie.create({
   ...n
-}), da = async (n, e) => se.find(n, {}, e).lean();
+}), da = async (n, e) => ie.find(n, {}, e).lean();
 async function la(n) {
-  const e = await se.findOne({ craftId: n }).lean();
+  const e = await ie.findOne({ recipeId: n }).lean();
   return e || null;
 }
-const pa = (n, e) => se.findOneAndUpdate(n, e, {
+const pa = (n, e) => ie.findOneAndUpdate(n, e, {
   returnDocument: "after"
 }).lean();
 class ya extends sa {
@@ -3262,7 +3312,7 @@ class ya extends sa {
     super(3600);
   }
   createInDb(e) {
-    return oa(e);
+    return ca(e);
   }
   updateInDb(e, t) {
     return pa(e, t);
@@ -3277,17 +3327,17 @@ class ya extends sa {
     return e;
   }
   getKey(e) {
-    return e.craftId;
+    return e.recipeId;
   }
 }
-const ns = new ya(), fa = new c({
+const ns = new ya(), fa = new o({
   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 }
-}), ie = d?.Bans || l("Bans", fa), ma = (n, e) => ie.deleteOne({ bannedUserId: n, guildId: e });
-class ha extends f {
+}), ue = d?.Bans || l("Bans", fa), ma = (n, e) => ue.deleteOne({ bannedUserId: n, guildId: e });
+class ha extends w {
   async getUnbanUsers() {
     return this.getMany({
       unbannedTimestamp: { $lte: /* @__PURE__ */ new Date(), $ne: null }
@@ -3304,7 +3354,7 @@ class ha extends f {
     await ma(e, t), this.invalidate({ bannedUserId: e, guildId: t });
   }
 }
-const ga = (n) => ie.find(n).lean(), Sa = (n) => ie.findOne(n).lean(), wa = (n, e) => ie.findOneAndUpdate(n, e, {
+const ga = (n) => ue.find(n).lean(), Sa = (n) => ue.findOne(n).lean(), wa = (n, e) => ue.findOneAndUpdate(n, e, {
   returnDocument: "after",
   upsert: !0
 }).lean();
@@ -3328,14 +3378,14 @@ class ba extends ha {
     return wa(e, t);
   }
 }
-const rs = new ba(), $a = new c({
+const rs = new ba(), $a = new o({
   senderId: {
-    type: c.Types.ObjectId,
+    type: o.Types.ObjectId,
     required: !0,
     ref: "User"
   },
   receiverId: {
-    type: c.Types.ObjectId,
+    type: o.Types.ObjectId,
     required: !0,
     index: !0,
     ref: "User"
@@ -3345,14 +3395,14 @@ const rs = new ba(), $a = new c({
   meta: {
     rps: { type: String, default: void 0 }
   }
-}), ue = d?.Invitation || l("Invitation", $a), Ia = (n) => ue.create({
+}), oe = d?.Invitation || l("Invitation", $a), Ia = (n) => oe.create({
   ...n
 }), Ua = async (n) => {
-  await ue.deleteMany({
+  await oe.deleteMany({
     ...n
   });
 };
-class Ta extends y {
+class Ta extends m {
   async sendInvitation({
     senderId: e,
     receiverId: t,
@@ -3369,12 +3419,12 @@ class Ta extends y {
     await Ua({ senderId: e, gameMode: r, receiverId: t }), this.invalidate({ senderId: e, gameMode: r, receiverId: t });
   }
 }
-const Ea = (n) => ue.findOne({
+const Ea = (n) => oe.findOne({
   ...n
-}).lean(), Oa = (n, e) => ue.findOneAndUpdate(n, e, {
+}).lean(), va = (n, e) => oe.findOneAndUpdate(n, e, {
   returnDocument: "after"
 }).lean();
-class Da extends Ta {
+class Oa extends Ta {
   constructor() {
     super(3600);
   }
@@ -3392,11 +3442,11 @@ class Da extends Ta {
     return Ea(e);
   }
   updateInDb(e, t) {
-    return Oa(e, t);
+    return va(e, t);
   }
 }
-const as = new Da();
-class va extends y {
+const as = new Oa();
+class Da extends m {
   async randomizeEditoPrice(e) {
     const t = Ee(100, 1001);
     return await this.update({ guildId: e }, { $set: { "edito.price": t } }), t;
@@ -3442,7 +3492,7 @@ class va extends y {
     );
   }
 }
-const Ma = new c({
+const xa = new o({
   guildId: { type: String, required: !0, unique: !0 },
   ranking: {
     messageId: { type: String, default: null }
@@ -3490,16 +3540,16 @@ const Ma = new c({
       default: []
     }
   }
-}), me = d?.Settings || l("Settings", Ma), xa = (n) => me.create({
+}), he = d?.Settings || l("Settings", xa), Ma = (n) => he.create({
   guildId: n
-}), qa = async (n) => {
-  const e = await me.findOne({ guildId: n }).lean();
-  return e || p(await xa(n));
-}, Aa = (n, e) => me.findOneAndUpdate(n, e, {
+}), Aa = async (n) => {
+  const e = await he.findOne({ guildId: n }).lean();
+  return e || y(await Ma(n));
+}, ka = (n, e) => he.findOneAndUpdate(n, e, {
   upsert: !0,
   returnDocument: "after"
 }).lean();
-class ka extends va {
+class qa extends Da {
   constructor() {
     super(3600 * 24 * 30);
   }
@@ -3510,21 +3560,21 @@ class ka extends va {
     return e;
   }
   fetchFromDb(e) {
-    return qa(e);
+    return Aa(e);
   }
   updateInDb(e, t) {
-    return Aa(e, t);
+    return ka(e, t);
   }
 }
-const ss = new ka(), Ra = new c({
+const ss = new qa(), Ra = new o({
   warnedUserId: { type: String, required: !0, index: !0 },
   authorId: String,
   date: { type: Date, default: Date.now() },
   reason: { type: String, default: null }
-}), ce = d?.Warn || l("Warn", Ra), Ca = (n) => ce.countDocuments(n), _a = (n) => ce.create({
+}), ce = d?.Warn || l("Warn", Ra), Ca = (n) => ce.countDocuments(n), Ba = (n) => ce.create({
   ...n
-}), Ba = (n) => ce.findByIdAndDelete(n).lean();
-class Fa extends f {
+}), _a = (n) => ce.findByIdAndDelete(n).lean();
+class Fa extends w {
   getUserWarns(e) {
     return this.getMany({ warnedUserId: e });
   }
@@ -3532,10 +3582,10 @@ class Fa extends f {
     return Ca({ warnedUserId: e });
   }
   async createWarn(e) {
-    await _a(e);
+    await Ba(e);
   }
   async deleteWarn(e) {
-    const t = await Ba(e);
+    const t = await _a(e);
     return t && this.invalidate(this.getKey(t)), t;
   }
 }
@@ -3563,29 +3613,29 @@ class Ka extends Fa {
 const is = new Ka(), us = (n) => {
   Qe(n);
 };
-class cs extends Ye.ObjectId {
+class os extends Ye.ObjectId {
 }
 export {
-  cs as ObjectId,
-  w as QUEST_MIDDLEWARE_EVENT_NAME,
+  os as ObjectId,
+  $ as QUEST_MIDDLEWARE_EVENT_NAME,
   rs as banService,
   us as connectToServices,
-  S as emitQuestMiddlewareEvent,
-  m as entityService,
+  b as emitQuestMiddlewareEvent,
+  T as entityService,
   as as invitationService,
   U as ornamentService,
-  R as panoplyService,
+  N as panoplyService,
   ns as recipeService,
   La as registerQuestMiddlewareEvents,
   Rt as reminderService,
   ss as settingsService,
-  T as storyService,
+  E as storyService,
   Qa as userCooldownService,
   Ya as userDailyReportService,
-  le as userEncyclopediaService,
+  pe as userEncyclopediaService,
   Ga as userGamesService,
-  E as userInventoryService,
-  O as userMetaService,
+  M as userInventoryService,
+  v as userMetaService,
   we as userOrnamentService,
   be as userQuestService,
   Wa as userRankService,