Added debug logging to s!claim

sooch/commands/base.py

@@ -44,4 +44,20 @@ async def claim(client: discord.Client,
     result = discord.Embed()
     # Embed here needs to be modular since we have a lot of claim info. Do later todo
 
+    debug_data = (
+        "hours",
+        "spare_mins",
+        "this_claim_mult",
+        "basic_income",
+        "trans_income",
+        "crit_success",
+        "items_gained",
+        "tax_loss",
+        "event_currency"
+    )
+
+    result.add_field(name="Result test", value="```\n" + "\n".join("{:20} {}".format(
+        d + ":", getattr(claim_result, d)
+    ) for d in debug_data) + "\n```")
+
     return result

sooch/database.py

@@ -59,6 +59,7 @@ def migrate(self):
             """
             CREATE TABLE IF NOT EXISTS `player` (
                 `discord_id` BIGINT PRIMARY KEY,
+                `name` VARCHAR(32),
                 `sooch_skin` VARCHAR(50),
                 `embed_color` INT,
                 `sooch` DOUBLE PRECISION NOT NULL DEFAULT 0,

sooch/message.py

@@ -2,7 +2,7 @@
 Handles incoming messages and dispatches them to the appropriate handler.
 """
 from dataclasses import dataclass, field
-from typing import Callable, Optional, List, Dict, Coroutine
+from typing import Callable, Optional, List, Dict, Coroutine, Any
 
 import discord
 from sooch.commands import base, misc, help
@@ -12,11 +12,11 @@
 class Command:
     """Class representing a command that can be executed."""
     handler: Callable[[discord.Client, discord.Message, List[str]],
-                      Coroutine[Optional[discord.Embed]]]
+                      Coroutine[Any, Any, Optional[discord.Embed]]]
     name: str = "s!invalid"
     description: str = "No description provided"
     syntax: Optional[str] = None
-    aliases: List[str] = field(default_factory=List[str])
+    aliases: List[str] = field(default_factory=list)
 
 
 valid_prefix = {

sooch/services/claiming.py

@@ -26,8 +26,9 @@ class ClaimResult:
 
 def determine_times(player: sooch.player.Player):
     # Get base difference (in seconds) from the last stored claim time. Multiply by time acceleration.
-    base_diff = time.time() - player.last_claim_time
-    diff = base_diff * player.time_mult
+    base_diff = time.time() - player.last_claim
+    # diff = base_diff * player.time_mult TODO add calculated stats like this
+    diff = base_diff
 
     minutes = diff // 60
     hours = minutes // 60

sooch/services/players_load.py

@@ -39,7 +39,7 @@ async def add_player(self, player: "Player"):
             ("INSERT INTO `player`"
              "(`name`, `discord_id`, `sooch_skin`, `embed_color`,"
              "`sooch`, `tsooch`, `csooch`, `last_claim`)"
-             "VALUES(?, ?, ?, ?, ?, ?, ?)"),
+             "VALUES(?, ?, ?, ?, ?, ?, ?, ?)"),
             (player.name, player.discord_id, player.sooch_skin, player.embed_color,
              player.sooch, player.tsooch, player.csooch, player.last_claim)
         )

sooch/sooch_bot.py

@@ -110,4 +110,5 @@ def main():
     sooch_bot.start_sooching()
 
 
-main()
+if __name__ == "__main__":
+    main()