Vault command progress

Author: Iapetus-11

discord/bot/cogs/commands/econ.py

@@ -494,42 +494,42 @@ async def inventory_farming(self, ctx: Ctx, user: discord.User | discord.Member
     async def vault_deposit(self, ctx: Ctx, emerald_blocks: str):
         """Deposits the given amount of emerald blocks into the vault"""
 
-        db_user = await self.db.fetch_user(ctx.author.id)
+        # db_user = await self.db.fetch_user(ctx.author.id)
 
-        if db_user.emeralds < 9:
-            await ctx.reply_embed(ctx.l.econ.dep.poor_loser)
-            return
+        # if db_user.emeralds < 9:
+        #     await ctx.reply_embed(ctx.l.econ.dep.poor_loser)
+        #     return
 
+        amount: int | Literal["Max"]
         if emerald_blocks.lower() in ("all", "max"):
-            amount = db_user.vault_max - db_user.vault_balance
-
-            if amount * 9 > db_user.emeralds:
-                amount = math.floor(db_user.emeralds / 9)
+            amount = "Max"
         else:
             try:
                 amount = int(emerald_blocks)
             except ValueError:
                 await ctx.reply_embed(ctx.l.econ.use_a_number_stupid)
                 return
 
-        if amount * 9 > db_user.emeralds:
-            await ctx.reply_embed(ctx.l.econ.dep.stupid_3)
-            return
+        # if amount * 9 > db_user.emeralds:
+        #     await ctx.reply_embed(ctx.l.econ.dep.stupid_3)
+        #     return
 
-        if amount < 1:
-            if emerald_blocks.lower() in ("all", "max"):
-                await ctx.reply_embed(ctx.l.econ.dep.stupid_2)
-            else:
-                await ctx.reply_embed(ctx.l.econ.dep.stupid_1)
+        # if amount < 1:
+        #     if emerald_blocks.lower() in ("all", "max"):
+        #         await ctx.reply_embed(ctx.l.econ.dep.stupid_2)
+        #     else:
+        #         await ctx.reply_embed(ctx.l.econ.dep.stupid_1)
 
-            return
+        #     return
 
-        if amount > db_user.vault_max - db_user.vault_balance:
-            await ctx.reply_embed(ctx.l.econ.dep.stupid_2)
-            return
+        # if amount > db_user.vault_max - db_user.vault_balance:
+        #     await ctx.reply_embed(ctx.l.econ.dep.stupid_2)
+        #     return
+
+        # await self.db.balance_sub(ctx.author.id, amount * 9)
+        # await self.db.set_vault(ctx.author.id, db_user.vault_balance + amount, db_user.vault_max)
 
-        await self.db.balance_sub(ctx.author.id, amount * 9)
-        await self.db.set_vault(ctx.author.id, db_user.vault_balance + amount, db_user.vault_max)
+        await self.karen.commands.vault.deposit(ctx.k.user.id, blocks=amount)
 
         await ctx.reply_embed(
             ctx.l.econ.dep.deposited.format(

discord/bot/services/karen/errors.py

@@ -0,0 +1,20 @@
+class KarenGameError(Exception):
+    def __init__(self, message: str) -> None:
+        super().__init__(message)
+
+        self.message = message
+
+
+class UserDoesNotExistError(KarenGameError):
+    def __init__(self) -> None:
+        super().__init__("User does not exist")
+
+
+class UserLockCannotBeAcquiredError(KarenGameError):
+    def __init__(self, lock: str) -> None:
+        super().__init__(f"User lock {lock!r} cannot be acquired")
+
+
+class NotEnoughEmeraldsError(KarenGameError):
+    def __init__(self) -> None:
+        super().__init__("User does not have enough emeralds")

discord/bot/services/karen/resources/command_executions.py

@@ -57,4 +57,5 @@ async def preflight(self, **kwargs: Unpack[CommandExecutionPreflightRequest]) ->
         )
         data = await response.read()
 
+        print(data)
         return CommandExecutionPreflightResponse.model_validate_json(data)

discord/bot/services/karen/resources/commands/__init__.py

@@ -3,7 +3,6 @@
 import aiohttp
 
 from bot.services.karen.client import KarenResourceBase
-from bot.services.karen.resources.commands.profile import ProfileCommandResource
 
 
 class CommandsResourceGroup(KarenResourceBase):
@@ -12,4 +11,8 @@ class CommandsResourceGroup(KarenResourceBase):
     def __init__(self, http: aiohttp.ClientSession):
         super().__init__(http)
 
+        from .profile import ProfileCommandResource
+        from .vault import VaultCommandResource
+
         self.profile = ProfileCommandResource(http)
+        self.vault = VaultCommandResource(http)

discord/bot/services/karen/resources/commands/vault.py

@@ -0,0 +1,31 @@
+from typing import ClassVar, Literal
+
+import aiohttp
+
+from bot.services.karen.client import KarenResourceBase
+from bot.utils.urls import url_join
+
+
+class VaultCommandResource(KarenResourceBase):
+    BASE_URL: ClassVar[str] = "/commands/vault/"
+
+    def __init__(self, http: aiohttp.ClientSession):
+        super().__init__(http)
+
+    async def deposit(self, user_id: str, *, blocks: int | Literal["Max"]) -> None:
+        await self._http.post(
+            url_join(self.BASE_URL, user_id, "deposit"),
+            json={
+                "blocks": blocks,
+            },
+            allow_redirects=False,
+        )
+
+    async def withdraw(self, user_id: str, *, blocks: int | Literal["Max"]) -> None:
+        await self._http.post(
+            url_join(self.BASE_URL, user_id, "withdraw"),
+            json={
+                "blocks": blocks,
+            },
+            allow_redirects=False,
+        )

karen/src/routes/command_executions.rs

@@ -35,7 +35,7 @@ struct CommandExecutionPreflightResponse {
 
 #[derive(Debug, Serialize)]
 #[cfg_attr(test, derive(Deserialize))]
-#[serde(tag = "error_type", content = "error")]
+#[serde(tag = "error_type")]
 enum PreflightErrorResponse {
     CommandOnCooldown { until: DateTime<Utc> },
 }