feat(poke,connect): add poke stats, rename constant, fix message cleanup

oponfil · oponfil · commit 0c0a1c7fbcba · 2026-03-19T23:22:54.000+07:00
- Rename CHAT_STYLES_DIALOGS_LIMIT to ACTIVE_CHATS_LIMIT in config.py, styles_handler.py, poke_handler.py
- Remove poke_scanning message; add poke_result/poke_result_none with {checked}/{drafts} placeholders
- Add checked/drafts counters to on_poke; send result message after scan loop
- Move checked increment before draft/lock check so chats with existing drafts are still counted
- Add keep_typing to on_connect_qr_callback for typing indicator during QR generation
- Fix untracked connect_phone_invalid message in on_confirm_phone_callback PhoneNumberInvalid handler
- Update tests: test_poke.py (side_effect for get_system_message, result assertions), test_connect_flow.py (expect error msg ID in sensitive_msg_ids)
diff --git a/config.py b/config.py
@@ -154,7 +154,7 @@ def style_display_name(style: str) -> str:
 }
 
 # Количество чатов в /styles для отображения
-CHAT_STYLES_DIALOGS_LIMIT = 16
+ACTIVE_CHATS_LIMIT = 16
 
 # ====== ЧАСОВОЙ ПОЯС ======
 # 30 популярных UTC-смещений (часы); дробные: +3.5 Иран, +4.5 Афганистан,
diff --git a/handlers/connect_handler.py b/handlers/connect_handler.py
@@ -357,9 +357,10 @@ async def on_connect_qr_callback(update: Update, context: ContextTypes.DEFAULT_T
         await query.edit_message_text(msg)
         return
 
-    await _start_qr_flow(
-        u.id, u.language_code, context.bot, update.effective_chat.id,
-    )
+    async with keep_typing(context.bot, update.effective_chat.id):
+        await _start_qr_flow(
+            u.id, u.language_code, context.bot, update.effective_chat.id,
+        )
 
 
 # ====== Phone flow text handlers ======
@@ -533,14 +534,15 @@ async def on_confirm_phone_callback(update: Update, context: ContextTypes.DEFAUL
 
             if "PhoneNumberInvalid" in error_name:
                 # Возвращаем в awaiting_phone — пользователь может ввести повторно
+                msg = await get_system_message(language_code, "connect_phone_invalid")
+                sent_err = await context.bot.send_message(chat_id=chat_id, text=msg)
+                sensitive_msg_ids.append(sent_err.message_id)
                 _put_pending_phone(u.id, {
                     "state": "awaiting_phone",
                     "language_code": language_code,
                     "chat_id": chat_id,
-                    "sensitive_msg_ids": pending.get("sensitive_msg_ids") or [],
+                    "sensitive_msg_ids": sensitive_msg_ids,
                 })
-                msg = await get_system_message(language_code, "connect_phone_invalid")
-                await context.bot.send_message(chat_id=chat_id, text=msg)
                 if client is not None:
                     await _safe_disconnect_temp_client(client, u.id)
                 return
diff --git a/handlers/poke_handler.py b/handlers/poke_handler.py
@@ -7,7 +7,7 @@
 from telegram.ext import ContextTypes
 
 from config import (
-    CHAT_STYLES_DIALOGS_LIMIT,
+    ACTIVE_CHATS_LIMIT,
     DEBUG_PRINT,
     IGNORED_CHAT_IDS,
     POKE_FOLLOW_UP_TIMEOUT,
@@ -51,21 +51,19 @@ async def on_poke(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
         await update.message.reply_text(msg)
         return
 
-    # Одно сообщение — «проверяю»
-    msg = await get_system_message(language_code, "poke_scanning")
-    await update.message.reply_text(msg)
-
     if DEBUG_PRINT:
         print(f"{get_timestamp()} [POKE] /poke from user {u.id}")
 
     # Получаем список чатов
-    chat_ids = await pyrogram_client.get_private_dialogs(u.id, limit=CHAT_STYLES_DIALOGS_LIMIT)
+    chat_ids = await pyrogram_client.get_private_dialogs(u.id, limit=ACTIVE_CHATS_LIMIT)
 
     user = await get_user(u.id)
     user_settings = (user or {}).get("settings") or {}
     lang = (user or {}).get("language_code")
 
     now = datetime.now(tz=timezone.utc)
+    checked = 0
+    drafts = 0
 
     for chat_id in chat_ids:
         # Global ignore
@@ -78,10 +76,13 @@ async def on_poke(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
 
         key = (u.id, chat_id)
 
+        checked += 1
+
         # Уже есть черновик или идёт генерация — пропускаем
         if _reply_locks.get(key) or _bot_drafts.get(key):
             continue
 
+        # Пустой чат или ошибка чтения — нечего анализировать
         last_msg = await pyrogram_client.get_last_message(u.id, chat_id)
         if not last_msg:
             continue
@@ -114,10 +115,16 @@ async def on_poke(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
         _bot_draft_echoes[key] = probe_text
         await pyrogram_client.set_draft(u.id, chat_id, probe_text)
 
+        drafts += 1
         asyncio.create_task(
             _generate_reply_for_chat(u.id, chat_id, user, user_settings, lang)
         )
 
         if DEBUG_PRINT:
             direction = "follow-up" if last_msg.outgoing else "unanswered"
             print(f"{get_timestamp()} [POKE] Generating {direction} draft for user {u.id} in chat {chat_id}")
+
+    # Итоговое сообщение с конкретными цифрами
+    result_key = "poke_result" if drafts else "poke_result_none"
+    result_msg = await get_system_message(language_code, result_key)
+    await update.message.reply_text(result_msg.format(checked=checked, drafts=drafts))
diff --git a/handlers/styles_handler.py b/handlers/styles_handler.py
@@ -8,7 +8,7 @@
 from clients import pyrogram_client
 from config import (
     AUTO_REPLY_OPTIONS,
-    CHAT_STYLES_DIALOGS_LIMIT,
+    ACTIVE_CHATS_LIMIT,
     DEBUG_PRINT,
     DEFAULT_STYLE,
     STYLE_OPTIONS,
@@ -112,7 +112,7 @@ def _get_relevant_dialogs(
     dialogs = [d for d in all_dialogs if d["chat_id"] in relevant_ids]
     # Чаты с per-chat auto-reply/ignore — сверху
     dialogs.sort(key=lambda d: d["chat_id"] not in ar_ids)
-    return dialogs[:CHAT_STYLES_DIALOGS_LIMIT]
+    return dialogs[:ACTIVE_CHATS_LIMIT]
 
 
 @serialize_user_updates
@@ -137,7 +137,7 @@ async def on_chats(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
 
     # Получаем широкий список диалогов для фильтрации
     all_dialogs = await pyrogram_client.get_dialog_info(
-        u.id, limit=CHAT_STYLES_DIALOGS_LIMIT * 10,
+        u.id, limit=ACTIVE_CHATS_LIMIT * 10,
     )
 
     dialogs = _get_relevant_dialogs(all_dialogs, user_settings, u.id)
@@ -167,7 +167,7 @@ async def _refresh_keyboard(
     dialogs = context.user_data.get("chats_dialogs") or []
     if not dialogs:
         all_dialogs = await pyrogram_client.get_dialog_info(
-            u.id, limit=CHAT_STYLES_DIALOGS_LIMIT * 10,
+            u.id, limit=ACTIVE_CHATS_LIMIT * 10,
         )
         dialogs = _get_relevant_dialogs(all_dialogs, updated_settings, u.id)
     else:
diff --git a/system_messages.py b/system_messages.py
@@ -133,7 +133,8 @@
     "prompt_clear": "🗑 Clear",
 
     # — Poke (/poke) —
-    "poke_scanning": "🔍 Started checking active chats…",
+    "poke_result": "✅ Checked {checked} chats — generating {drafts} drafts.",
+    "poke_result_none": "✅ Checked {checked} chats — no drafts needed right now.",
     "menu_poke": "Poke active chats",
 }
 
diff --git a/tests/test_connect_flow.py b/tests/test_connect_flow.py
@@ -266,7 +266,10 @@ class PhoneNumberInvalid(Exception):
             await on_confirm_phone_callback(update, context)
 
         assert _pending_phone[user_id]["state"] == "awaiting_phone"
-        assert _pending_phone[user_id]["sensitive_msg_ids"] == [42]
+        # sensitive_msg_ids: оригинальный (42) + ошибка PhoneNumberInvalid
+        ids = _pending_phone[user_id]["sensitive_msg_ids"]
+        assert 42 in ids
+        assert len(ids) == 2
 
     @pytest.mark.asyncio
     async def test_floodwait_deletes_sensitive_messages(self):
diff --git a/tests/test_poke.py b/tests/test_poke.py
@@ -36,6 +36,18 @@ def _make_message(outgoing: bool = False, age_seconds: int = 0, from_bot: bool =
     return msg
 
 
+def _sys_msg_side_effect(*args, **kwargs):
+    """Side-effect для get_system_message: возвращает разные строки по ключу."""
+    key = args[1] if len(args) > 1 else kwargs.get("key", "")
+    mapping = {
+        "status_disconnected": "Connect first",
+        "poke_result": "Checked {checked} chats — generating {drafts} drafts.",
+        "poke_result_none": "Checked {checked} chats — no drafts needed.",
+        "draft_typing": "{emoji} is typing...",
+    }
+    return mapping.get(key, key)
+
+
 class TestOnPoke:
     """Тесты для on_poke()."""
 
@@ -48,7 +60,7 @@ async def test_not_connected_shows_message(self):
         with patch("handlers.poke_handler.pyrogram_client") as mock_pc, \
              patch("handlers.poke_handler.ensure_effective_user", new_callable=AsyncMock), \
              patch("handlers.poke_handler.update_last_msg_at", new_callable=AsyncMock), \
-             patch("handlers.poke_handler.get_system_message", new_callable=AsyncMock, return_value="Connect first"):
+             patch("handlers.poke_handler.get_system_message", new_callable=AsyncMock, side_effect=_sys_msg_side_effect):
             mock_pc.is_active = MagicMock(return_value=False)
 
             await on_poke(update, context)
@@ -57,7 +69,7 @@ async def test_not_connected_shows_message(self):
 
     @pytest.mark.asyncio
     async def test_unanswered_incoming_generates_draft(self):
-        """Входящее сообщение без черновика → генерация."""
+        """Входящее сообщение без черновика → генерация + результат с drafts=1."""
         user_id = 123
         chat_id = 456
         update = _make_update(user_id=user_id)
@@ -68,7 +80,7 @@ async def test_unanswered_incoming_generates_draft(self):
         with patch("handlers.poke_handler.pyrogram_client") as mock_pc, \
              patch("handlers.poke_handler.ensure_effective_user", new_callable=AsyncMock), \
              patch("handlers.poke_handler.update_last_msg_at", new_callable=AsyncMock), \
-             patch("handlers.poke_handler.get_system_message", new_callable=AsyncMock, return_value="Scanning"), \
+             patch("handlers.poke_handler.get_system_message", new_callable=AsyncMock, side_effect=_sys_msg_side_effect), \
              patch("handlers.poke_handler.get_user", new_callable=AsyncMock, return_value={"settings": {}}), \
              patch("handlers.poke_handler._is_user_typing", new_callable=AsyncMock, return_value=False), \
              patch("handlers.poke_handler._generate_reply_for_chat", new_callable=AsyncMock) as mock_gen:
@@ -83,10 +95,15 @@ async def test_unanswered_incoming_generates_draft(self):
             await on_poke(update, context)
 
         mock_gen.assert_called_once_with(user_id, chat_id, {"settings": {}}, {}, None)
+        # result only
+        update.message.reply_text.assert_called_once()
+        result_call = update.message.reply_text.call_args_list[-1]
+        assert "1 chats" in result_call.args[0]
+        assert "1 drafts" in result_call.args[0]
 
     @pytest.mark.asyncio
     async def test_incoming_with_existing_draft_skipped(self):
-        """Входящее с существующим черновиком → пропуск."""
+        """Входящее с существующим черновиком → пропуск, drafts=0."""
         user_id = 123
         chat_id = 456
         update = _make_update(user_id=user_id)
@@ -95,7 +112,7 @@ async def test_incoming_with_existing_draft_skipped(self):
         with patch("handlers.poke_handler.pyrogram_client") as mock_pc, \
              patch("handlers.poke_handler.ensure_effective_user", new_callable=AsyncMock), \
              patch("handlers.poke_handler.update_last_msg_at", new_callable=AsyncMock), \
-             patch("handlers.poke_handler.get_system_message", new_callable=AsyncMock, return_value="Scanning"), \
+             patch("handlers.poke_handler.get_system_message", new_callable=AsyncMock, side_effect=_sys_msg_side_effect), \
              patch("handlers.poke_handler.get_user", new_callable=AsyncMock, return_value={"settings": {}}), \
              patch("handlers.poke_handler._is_user_typing", new_callable=AsyncMock, return_value=False), \
              patch("handlers.poke_handler._generate_reply_for_chat", new_callable=AsyncMock) as mock_gen:
@@ -107,11 +124,15 @@ async def test_incoming_with_existing_draft_skipped(self):
             await on_poke(update, context)
 
         mock_gen.assert_not_called()
+        # result_none only
+        update.message.reply_text.assert_called_once()
+        result_call = update.message.reply_text.call_args_list[-1]
+        assert "no drafts needed" in result_call.args[0]
         _bot_drafts.pop((user_id, chat_id), None)
 
     @pytest.mark.asyncio
     async def test_outgoing_fresh_skipped(self):
-        """Исходящее свежее (< 12ч) → пропуск."""
+        """Исходящее свежее (< 12ч) → пропуск, drafts=0."""
         user_id = 123
         chat_id = 456
         update = _make_update(user_id=user_id)
@@ -122,7 +143,7 @@ async def test_outgoing_fresh_skipped(self):
         with patch("handlers.poke_handler.pyrogram_client") as mock_pc, \
              patch("handlers.poke_handler.ensure_effective_user", new_callable=AsyncMock), \
              patch("handlers.poke_handler.update_last_msg_at", new_callable=AsyncMock), \
-             patch("handlers.poke_handler.get_system_message", new_callable=AsyncMock, return_value="Scanning"), \
+             patch("handlers.poke_handler.get_system_message", new_callable=AsyncMock, side_effect=_sys_msg_side_effect), \
              patch("handlers.poke_handler.get_user", new_callable=AsyncMock, return_value={"settings": {}}), \
              patch("handlers.poke_handler._is_user_typing", new_callable=AsyncMock, return_value=False), \
              patch("handlers.poke_handler._generate_reply_for_chat", new_callable=AsyncMock) as mock_gen:
@@ -136,10 +157,15 @@ async def test_outgoing_fresh_skipped(self):
             await on_poke(update, context)
 
         mock_gen.assert_not_called()
+        # result_none only (checked=1, drafts=0)
+        update.message.reply_text.assert_called_once()
+        result_call = update.message.reply_text.call_args_list[-1]
+        assert "1 chats" in result_call.args[0]
+        assert "no drafts needed" in result_call.args[0]
 
     @pytest.mark.asyncio
     async def test_outgoing_old_generates_followup(self):
-        """Исходящее старое (> 12ч) → follow-up генерация."""
+        """Исходящее старое (> 12ч) → follow-up генерация, drafts=1."""
         user_id = 123
         chat_id = 456
         update = _make_update(user_id=user_id)
@@ -150,7 +176,7 @@ async def test_outgoing_old_generates_followup(self):
         with patch("handlers.poke_handler.pyrogram_client") as mock_pc, \
              patch("handlers.poke_handler.ensure_effective_user", new_callable=AsyncMock), \
              patch("handlers.poke_handler.update_last_msg_at", new_callable=AsyncMock), \
-             patch("handlers.poke_handler.get_system_message", new_callable=AsyncMock, return_value="Scanning"), \
+             patch("handlers.poke_handler.get_system_message", new_callable=AsyncMock, side_effect=_sys_msg_side_effect), \
              patch("handlers.poke_handler.get_user", new_callable=AsyncMock, return_value={"settings": {}}), \
              patch("handlers.poke_handler._is_user_typing", new_callable=AsyncMock, return_value=False), \
              patch("handlers.poke_handler._generate_reply_for_chat", new_callable=AsyncMock) as mock_gen:
@@ -165,6 +191,10 @@ async def test_outgoing_old_generates_followup(self):
             await on_poke(update, context)
 
         mock_gen.assert_called_once()
+        # result only
+        update.message.reply_text.assert_called_once()
+        result_call = update.message.reply_text.call_args_list[-1]
+        assert "1 drafts" in result_call.args[0]
 
     @pytest.mark.asyncio
     async def test_ignored_chat_skipped(self):
@@ -179,7 +209,7 @@ async def test_ignored_chat_skipped(self):
         with patch("handlers.poke_handler.pyrogram_client") as mock_pc, \
              patch("handlers.poke_handler.ensure_effective_user", new_callable=AsyncMock), \
              patch("handlers.poke_handler.update_last_msg_at", new_callable=AsyncMock), \
-             patch("handlers.poke_handler.get_system_message", new_callable=AsyncMock, return_value="Scanning"), \
+             patch("handlers.poke_handler.get_system_message", new_callable=AsyncMock, side_effect=_sys_msg_side_effect), \
              patch("handlers.poke_handler.get_user", new_callable=AsyncMock, return_value={"settings": settings}), \
              patch("handlers.poke_handler._is_user_typing", new_callable=AsyncMock, return_value=False), \
              patch("handlers.poke_handler._generate_reply_for_chat", new_callable=AsyncMock) as mock_gen:
@@ -203,7 +233,7 @@ async def test_bot_message_skipped(self):
         with patch("handlers.poke_handler.pyrogram_client") as mock_pc, \
              patch("handlers.poke_handler.ensure_effective_user", new_callable=AsyncMock), \
              patch("handlers.poke_handler.update_last_msg_at", new_callable=AsyncMock), \
-             patch("handlers.poke_handler.get_system_message", new_callable=AsyncMock, return_value="Scanning"), \
+             patch("handlers.poke_handler.get_system_message", new_callable=AsyncMock, side_effect=_sys_msg_side_effect), \
              patch("handlers.poke_handler.get_user", new_callable=AsyncMock, return_value={"settings": {}}), \
              patch("handlers.poke_handler._is_user_typing", new_callable=AsyncMock, return_value=False), \
              patch("handlers.poke_handler._generate_reply_for_chat", new_callable=AsyncMock) as mock_gen:
@@ -231,7 +261,7 @@ async def test_user_typing_skipped(self):
         with patch("handlers.poke_handler.pyrogram_client") as mock_pc, \
              patch("handlers.poke_handler.ensure_effective_user", new_callable=AsyncMock), \
              patch("handlers.poke_handler.update_last_msg_at", new_callable=AsyncMock), \
-             patch("handlers.poke_handler.get_system_message", new_callable=AsyncMock, return_value="Scanning"), \
+             patch("handlers.poke_handler.get_system_message", new_callable=AsyncMock, side_effect=_sys_msg_side_effect), \
              patch("handlers.poke_handler.get_user", new_callable=AsyncMock, return_value={"settings": {}}), \
              patch("handlers.poke_handler._is_user_typing", new_callable=AsyncMock, return_value=True) as mock_typing, \
              patch("handlers.poke_handler._generate_reply_for_chat", new_callable=AsyncMock) as mock_gen:

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ def style_display_name(style: str) -> str:`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`# Количество чатов в /styles для отображения`
`157`		`-CHAT_STYLES_DIALOGS_LIMIT = 16`
	`157`	`+ACTIVE_CHATS_LIMIT = 16`
`158`	`158`
`159`	`159`	`# ====== ЧАСОВОЙ ПОЯС ======`
`160`	`160`	`# 30 популярных UTC-смещений (часы); дробные: +3.5 Иран, +4.5 Афганистан,`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,8 @@`
`133`	`133`	`"prompt_clear": "🗑 Clear",`
`134`	`134`
`135`	`135`	`# — Poke (/poke) —`
`136`		`- "poke_scanning": "🔍 Started checking active chats…",`
	`136`	`+ "poke_result": "✅ Checked {checked} chats — generating {drafts} drafts.",`
	`137`	`+ "poke_result_none": "✅ Checked {checked} chats — no drafts needed right now.",`
`137`	`138`	`"menu_poke": "Poke active chats",`
`138`	`139`	`}`
`139`	`140`