bot/response.py

@@ -7,12 +7,14 @@ from config import GACHA_ROLL_INTERVAL
 from custom_types import BotResponse, ParsedNotification
 
 
-def do_roll(full_user: str) -> BotResponse:
+def do_roll(author: str) -> BotResponse:
     '''Determines whether the user can roll, then pulls a random character'''
-    user_id = get_player(full_user)
-
+    user_id = get_player(author)
     if not user_id:
-        return f'@{full_user} 🛑 You haven’t signed up yet! Use the `signup` command to start playing.'
+        return {
+        'message':f'{author} 🛑 You haven’t signed up yet! Use the `signup` command to start playing.',
+        'attachment_urls': None
+        }
     # Get date of user's last roll
     date = get_last_rolled_at(user_id)
 
@@ -38,7 +40,7 @@ def do_roll(full_user: str) -> BotResponse:
                 remaining_duration = f'{duration.seconds} seconds'
 
             return {
-                'message': f'{full_user} ⏱️ Please wait another \
+                'message': f'{author} ⏱️ Please wait another \
 {remaining_duration} before rolling again.',
                 'attachment_urls': None
             }
@@ -47,7 +49,7 @@ def do_roll(full_user: str) -> BotResponse:
 
     if not character:
         return {
-            'message': f'{full_user} Uwaaa... something went wrong! No \
+            'message': f'{author} Uwaaa... something went wrong! No \
 characters found. 😿',
             'attachment_urls': None
         }
@@ -55,7 +57,7 @@ characters found. 😿',
     insert_pull(user_id, character['id'])
     stars = '⭐️' * character['rarity']
     return {
-        'message': f'@{full_user} 🎲 Congrats! You rolled {stars} \
+        'message': f'{author} 🎲 Congrats! You rolled {stars} \
 **{character['name']}**\nShe\'s all yours now~ 💖✨',
         'attachment_urls': [character['image_url']]
     }
@@ -66,13 +68,13 @@ def do_signup(author: str) -> BotResponse:
 
     if user_id:
         return {
-            f'@{author} 👀 You’re already signed up! Let the rolling begin~ 🎲',
+            'message':f'{author} 👀 You’re already signed up! Let the rolling begin~ 🎲',
             'attachment_urls': None
         }
 
     new_user_id = insert_player(author)
     return {
-            'message': f'@{author} ✅ Signed up successfully! Your gacha destiny begins now... ✨ Use the roll command to start!',
+            'message': f'{author} ✅ Signed up successfully! Your gacha destiny begins now... ✨ Use the roll command to start!',
             'attachment_urls': None
         }
 
@@ -86,7 +88,7 @@ def is_float(val: Any) -> bool:
 
 
 def do_create(
-        full_user: str,
+        author: str,
         arguments: List[str],
         note_obj: Dict[str, Any]) -> BotResponse:
     '''Creates a character'''
@@ -96,27 +98,27 @@ def do_create(
 
     if not image_url:
         return {
-            'message': f'{full_user} You need an image to create a character, \
+            'message': f'{author} You need an image to create a character, \
 dumbass.',
             'attachment_urls': None
         }
 
     if len(arguments) != 3:
         return {
-            'message': f'{full_user} Please specify the following attributes \
+            'message': f'{author} Please specify the following attributes \
 in order: name, rarity, drop weighting',
             'attachment_urls': None
         }
 
     if not (arguments[1].isnumeric() and 1 <= int(arguments[1]) <= 5):
         return {
-            'message': f'{full_user} Invalid rarity: \'{arguments[1]}\' must \
+            'message': f'{author} Invalid rarity: \'{arguments[1]}\' must \
 be a number between 1 and 5',
             'attachment_urls': None
         }
     if not (is_float(arguments[2]) and 0.0 < float(arguments[2]) <= 1.0):
         return {
-            'message': f'{full_user} Invalid drop weight: \'{arguments[2]}\' \
+            'message': f'{author} Invalid drop weight: \'{arguments[2]}\' \
 must be a decimal value between 0.0 and 1.0',
             'attachment_urls': None
         }
@@ -128,7 +130,7 @@ must be a decimal value between 0.0 and 1.0',
         image_url=image_url
     )
     return {
-        'message': f'{full_user} Added {arguments[0]}, ID {character_id}.',
+        'message': f'{author} Added {arguments[0]}, ID {character_id}.',
         'attachment_urls': [file_id]
     }
 
@@ -136,7 +138,7 @@ must be a decimal value between 0.0 and 1.0',
 def do_help(author: str) -> BotResponse:
     '''Provides a list of commands that the bot can do.'''
     return {
-        'message':f'{full_user} Here\'s what I can do:\n \
+        'message':f'{author} Here\'s what I can do:\n \
             - `roll` Pulls a random character.\
             - `create <name> <rarity> <weight>` Creates a character using a given image.\
             - `signup` Registers your account.\
@@ -147,7 +149,7 @@ def do_help(author: str) -> BotResponse:
             
 def delete_account(author: str) -> BotResponse:
     return {
-        'message':f'@{author} ⚠️ This will permanently delete your account and all your cards.\n'
+        'message':f'{author} ⚠️ This will permanently delete your account and all your cards.\n'
         'If you’re sure, reply with `confirm_delete` to proceed.\n\n'
         '**There is no undo.** Your gacha luck will be lost to the void... 💀✨',
         'attachment_urls': None
@@ -164,7 +166,7 @@ def confirm_delete(author: str) -> BotResponse:
         }
 
     return {
-        'message':f'@{author} 🧼 Your account and all your cards have been deleted. RIP your gacha history 🕊️✨',
+        'message':f'{author} 🧼 Your account and all your cards have been deleted. RIP your gacha history 🕊️✨',
         'attachment_urls': None
     }
 
@@ -177,7 +179,7 @@ def generate_response(notification: ParsedNotification) -> BotResponse | None:
     res: BotResponse | None = None
     # TODO: Check if the user has an account
     author = notification['author']
-    user_id = get_or_create_user(author)
+    user_id = get_player(author)
     command = notification['command']
     # Check if the user is an administrator
     # user_is_administrator = user_is_administrator()
@@ -185,11 +187,11 @@ def generate_response(notification: ParsedNotification) -> BotResponse | None:
     # Unrestricted commands
     match command:
         case 'signup':
-            res = do_signup()
+            res = do_signup(author)
         case 'help':
             res = do_help(author)
-
-            
+        case 'roll':
+            res = do_roll(author)
         case _:
             pass
 
@@ -198,10 +200,6 @@ def generate_response(notification: ParsedNotification) -> BotResponse | None:
 
     # User commands
     match command:
-        case 'delete_account':
-            pass
-        case 'roll':
-            res = do_roll(author)
         case 'create':
             res = do_create(
                 author,