Updating all handlers except turns.py

commands.py

@@ -1,10 +1,10 @@
-from roll import handler as roll_handler
-from charsheet import handler as charsheet_handler
-from character import handler as character_handler
-from turns import handler as turn_handler
-from dm import handler as dm_handler
-from campaign import handler as campaign_handler
 from exceptions import CommandNotFound, NotACommand
+from handlers.roll import handler as roll_handler
+from handlers.charsheet import handler as charsheet_handler
+from handlers.character import handler as character_handler
+from handlers.turns import handler as turn_handler
+from handlers.dm import handler as dm_handler
+from handlers.campaign import handler as campaign_handler
 
 # Each command should be defined using the expression below:
 #
@@ -39,11 +39,10 @@
     "/link_char": (character_handler, ["<char_id>", "(username)"], "links character to target username or self username"),
     "/status": (character_handler, ["<username|character>"], "shows the list of weapons of a character"),
     "/weapons": (character_handler, ["<username|character>"], "shows the list of weapons of a character"),
-    "/attack_roll": (character_handler, ["<character>", "<weapon>", "<melee|range>", "(distance)", "(adv|disadv)"], "performs an attack roll on a character"),
+    "/attack_roll": (character_handler, ["<weapon>", "<melee|range>", "(distance)", "(adv|disadv)"], "performs an attack roll on a character"),
     "/initiative_roll": (character_handler, ["<character>"], "performs an initiative roll for a character"),
     "/short_rest_roll": (character_handler, ["<username|character>"], "performs an short rest roll for a character"),
-    "/talk": (character_handler, ["<message>"], "prints a message using in-game conversation format"),
-    "/say": (character_handler, ["<message>"], "prints a normal message using in-game conversation format"),
+    "/say": (character_handler, ["<message>"], "prints a message using in-game conversation format"),
     "/whisper": (character_handler, ["<message>"], "prints a whisper message using in-game conversation format"),
     "/yell": (character_handler, ["<message>"], "prints a yell message using in-game conversation format"),
 }

database.py

@@ -71,7 +71,7 @@ def get_character_id(self, campaign_id, username):
             return None
 
         return result[username]
-        
+
     def get_character(self, character, find_by_id):
         if find_by_id:
             result = self.firebase_db.get('/', f'/characters/{character}', params={'auth': FIREBASE_API_SECRET})

exceptions.py

@@ -5,3 +5,6 @@ class CommandNotFound(Exception):
 class NotACommand(Exception):
     """Raised when the message from the chat is not a command"""
     pass
+
+class CharacterNotFound(Exception):
+    pass

campaign.py → handlers/campaign.py

@@ -1,24 +1,22 @@
 from database import Database
 
-def handler(bot, update):
+def handler(bot, update, command, txt_args):
     db = Database()
     chat_id = update.message.chat.id
     text = update.message.text
-    response = "Invalid command"
-    if text.startswith('/start_campaign'):
-        response = start_campaign(chat_id, text, db)
-    elif text.startswith('/close_campaign'):
+    if command == '/start_campaign':
+        response = start_campaign(chat_id, txt_args, db)
+    elif command == '/close_campaign':
         response = close_campaign(chat_id, db)
 
     bot.send_message(chat_id=update.message.chat_id, text=response, parse_mode="Markdown")
 
 def start_campaign(chat_id, text, db):
-    name = text.replace('/start_campaign', '').strip()
     campaign_id, campaign = db.get_campaign(chat_id)
     if campaign_id != None or campaign != None:
         return 'There is an active campaign for this group. Close the active campaign before creating a new one'
 
-    db.create_campaign(chat_id, name)
+    db.create_campaign(chat_id, text)
     return "Campaign created successfully!"
 
 def close_campaign(chat_id, db):