wip

Author: rozen03

bot_logic.py

@@ -36,7 +36,6 @@
 # Globals ...... yes, globals
 logger = logging.getLogger("DCUBABOT")
 admin_ids = [ROZEN_CHATID, DGARRO_CHATID]  # @Rozen, @dgarro
-command_handlers = {}
 bsasTz = pytz.timezone("America/Argentina/Buenos_Aires")
 
 
@@ -59,7 +58,7 @@ async def start(update: Update, context: ContextTypes.DEFAULT_TYPE):
         "Hola, ¿qué tal? ¡Mandame /help si no sabés qué puedo hacer!")
 
 
-async def help(update: Update, context: ContextTypes.DEFAULT_TYPE):
+async def help_command(update: Update, context: ContextTypes.DEFAULT_TYPE):
     message_text = "Comandos disponibles:\n"
     with get_session() as session:
         commands = session.query(Command).filter_by(enabled=True).order_by(Command.name).all()
@@ -324,7 +323,7 @@ async def button(update: Update, context: ContextTypes.DEFAULT_TYPE):
         'description': 'Inicia el bot.'
     },
     'help': {
-        'handler': help,
+        'handler': help_command,
         'description': 'Muestra este mensaje de ayuda.'
     },
     'estasvivo': {

main.py

@@ -1,25 +1,46 @@
 import telegram
 import os
-from telegram.ext import Application, CommandHandler, CallbackQueryHandler
-from bot_logic import COMMANDS, button  # Assuming 'button' is now in bot_logic
+import logging
+from telegram.ext import Application, CommandHandler, CallbackQueryHandler, MessageHandler, filters
+
+from bot_logic import COMMANDS, button
 from models import init_db
 
+async def log_update(update, context):
+    """Log every update received by the bot."""
+    logger = logging.getLogger("DCUBABOT")
+    user = update.effective_user
+    chat = update.effective_chat
+    
+    log_message = f"Update received. User: {user.id} ({user.username}) in chat: {chat.id} ({chat.title})."
+    if update.message and update.message.text:
+        log_message += f" Message: {update.message.text}"
+    elif update.callback_query:
+        log_message += f" Callback Query: {update.callback_query.data}"
+        
+    logger.info(log_message)
+
+
 def main():
     """Start the bot."""
+    logging.basicConfig(
+        level=logging.INFO,
+        format='[%(asctime)s] - [%(name)s] - [%(levelname)s] - %(message)s',
+        filename="bots.log"
+    )
+    
+    init_db()
 
     application = Application.builder().token(os.environ["TELEGRAM_BOT_TOKEN"]).build()
 
+    # Add the logging middleware handler with a high priority
+    application.add_handler(MessageHandler(filters.ALL, log_update), group=-1)
 
     for command_name, command_info in COMMANDS.items():
-            application.add_handler(CommandHandler(command_name, command_info['handler']))
+        application.add_handler(CommandHandler(command_name, command_info['handler']))
 
-    # Register the callback query handler for buttons
     application.add_handler(CallbackQueryHandler(button))
 
-
-    init_db()
-
-    # The WEBHOOK_URL is now guaranteed to be set by the CI/CD pipeline.
     webhook_url = os.environ["WEBHOOK_URL"]
 
     # Start the Bot

utils/logging.py

@@ -0,0 +1,18 @@
+import logging
+from functools import wraps
+
+def log_command(func):
+    """A decorator to log command usage."""
+    @wraps(func)
+    async def wrapper(update, context, *args, **kwargs):
+        logger = logging.getLogger("DCUBABOT")
+        command_name = func.__name__
+        user = update.effective_user
+        chat = update.effective_chat
+        logger.info(f"Command '{command_name}' triggered by user {user.id} ({user.username}) in chat {chat.id} ({chat.title})")
+        try:
+            return await func(update, context, *args, **kwargs)
+        except Exception as e:
+            logger.error(f"Error in command '{command_name}': {e}", exc_info=True)
+            raise
+    return wrapper