Created At: 2026-11-19T09:16:18Z Completed At: 2026-11-19T09:16:19Z Command exited with code 0. Command output: diff --git a/apps/api/routes/webhooks.py b/apps/api/routes/webhooks.py index ee53297..ce19cdf 100644 --- a/apps/api/routes/webhooks.py +++ b/apps/api/routes/webhooks.py @@ -87,7 +87,8 @@ async def receive_telegram_webhook( except NotFoundError as exc: raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=str(exc.message)) except Exception as exc: - logger.error("webhook_processing_error", bot_id=str(bot_id), error=str(exc)) + import traceback + logger.error("webhook_processing_error", bot_id=str(bot_id), error=str(exc), traceback=traceback.format_exc()) return {"ok": False, "error": str(exc)} diff --git a/infrastructure/telegram/service.py b/infrastructure/telegram/service.py index 3e0e527..ff5594f 100644 --- a/infrastructure/telegram/service.py +++ b/infrastructure/telegram/service.py @@ -217,17 +217,17 @@ class TelegramApiService: if resp.status_code == 200: return resp.json() - if resp.status_code == 429: - # Rate limit flood control - error_data = resp.json().get("parameters", {}) - retry_after = min(error_data.get("retry_after", 1), 5) - logger.warning("telegram_rate_limited", attempt=attempt, retry_after=retry_after) - await asyncio.sleep(retry_after) - continue - - # Non-retryable error - logger.error("send_message_telegram_error", status=resp.status_code, body=resp.text) - return resp.json() + if resp.status_code == 429: + # Rate limit flood control + error_data = resp.json().get("parameters", {}) + retry_after = min(error_data.get("retry_after", 1), 5) + logger.warning("telegram_rate_limited", attempt=attempt, retry_after=retry_after) + await asyncio.sleep(retry_after) + continue + + # Non-retryable error + logger.error("send_message_telegram_error", status=resp.status_code, body=resp.text) + return resp.json() except httpx.RequestError as exc: logger.warning("send_message_attempt_failed", attempt=attempt, error=str(exc)) if attempt == max_retries: diff --git a/modules/bots/modular_engine.py b/modules/bots/modular_engine.py index c51bcdb..4453f82 100644 --- a/modules/bots/modular_engine.py +++ b/modules/bots/modular_engine.py @@ -1065,12 +1065,34 @@ class BotModuleService: invite_link = f"https://t.me/{bot_username}?start=ref_{user_id}" template = config.get("invite_message", "") - formatted_message = template.format( - bot_username=bot_username, - user_id=user_id, - referral_count=total_invites, - referral_points=total_points, - ) + replacements = { + "bot_username": str(bot_username), + "user_id": str(user_id), + "referral_count": str(total_invites), + "total_invites": str(total_invites), + "referral_points": str(total_points), + "balance_points": str(total_points), + "points_balance": str(total_points), + "invite_link": invite_link, + "referral_link": invite_link, + } + + try: + # Safe formatter replacing all known tags and keeping unknown tags intact + formatted_message = template + for k, v in replacements.items(): + formatted_message = formatted_message.replace(f"{{{k}}}", v) + if not formatted_message.strip(): + raise ValueError("Empty template") + except Exception: + formatted_message = ( + f"🎁 Your Referral Portal\n\n" + f"Share your unique invite link with friends:\n" + f"{invite_link}\n\n" + f"👥 Total Invited: {total_invites} users\n" + f"💎 Points Balance: {total_points} pts\n\n" + f"Earn points for every verified member who joins!" + ) return { "user_id": user_id, diff --git a/modules/bots/service.py b/modules/bots/service.py index c875f48..992a0cb 100644 --- a/modules/bots/service.py +++ b/modules/bots/service.py @@ -282,6 +282,14 @@ class BotService: detected_lang = from_user.get("language_code") normalized_initial_locale = LocaleManager.normalize_locale(detected_lang) if detected_lang else bot.default_locale + logger.info( + "incoming_telegram_update", + update_type="callback_query" if callback_query else "message", + user_id=tg_uid, + chat_id=chat_id, + text=text, + ) + user_record = await self.repo.upsert_bot_user( bot_id=bot_id, telegram_user_id=tg_uid, @@ -1188,5 +1196,41 @@ class BotService: parse_mode="HTML", ) + elif text.startswith("/menu") or text in ("⚡ Menu", "📋 Menu", "⚡ Command Menu"): + reply_menu = await module_service.build_dynamic_reply_menu(bot_id) + inline_menu = await module_service.build_dynamic_inline_menu(bot_id) + if reply_menu: + await TelegramApiService.send_message_with_retry( + raw_token=raw_token, + chat_id=chat_id, + text="⚡ Mayagram Command Menu Active", + reply_markup=reply_menu, + parse_mode="HTML", + ) + await TelegramApiService.send_message_with_retry( + raw_token=raw_token, + chat_id=chat_id, + text="🌟 Feature Hub: Select an option below to interact with the bot:", + reply_markup=inline_menu, + parse_mode="HTML", + ) + + else: + # Fallback for unrecognized messages or conversational chat + if text: + inline_menu = await module_service.build_dynamic_inline_menu(bot_id) + reply_menu = await module_service.build_dynamic_reply_menu(bot_id) + if await module_service.is_module_active(bot_id, "ai_assistant"): + ai_reply = f"🤖 AI Assistant:\n\nI received your query: \"{text}\"\n\nHow can I help you today? Tap any feature button below or type /help." + else: + ai_reply = "⚡ Mayagram Feature Hub\n\nPlease select an option below:" + + await TelegramApiService.send_message_with_retry( + raw_token=raw_token, + chat_id=chat_id, + text=ai_reply, + reply_markup=inline_menu, + parse_mode="HTML", + ) return {"ok": True, "processed": True}