feat(chats): two-level inline keyboard for /chats command

- Refactor /chats: Level 1 shows one button per chat (name only), callback chatmenu:
- Add Level 2: tapping a chat sends a new message with 3 vertical buttons (Style, Prompt, Auto-reply)
- Add _build_chat_settings_keyboard() for Level 2 keyboard
- Add on_chat_menu_callback() handler, register chatmenu: pattern in bot.py
- Add _find_chat_name() helper to eliminate DRY violation (was repeated 3x)
- Add _refresh_chat_settings() to update Level 2 message after style/auto-reply/prompt changes
- Reuse settings_prompt_set/settings_prompt_empty keys instead of duplicate chats_prompt_* keys
- Move auto_reply_prefix emoji and colon into the message key itself
- Reorder AUTO_REPLY_OPTIONS: Ignore (-1) now second after OFF, before 1 min
- Remove prompt preview from /settings message (title only)
- Update README Per-chat Settings section for two-level UI
- Update test_styles.py and test_settings.py for new keyboard structure and carousel order

Author: oponfil

README.md

@@ -95,11 +95,13 @@ By default, `/connect` prompts for a phone number. A button below the message le
 
 ### Per-chat Settings (`/chats`)
 
-The `/chats` command shows only chats where the bot has actually set a draft or replied, as well as chats with custom settings. Each chat has three buttons:
+The `/chats` command shows only chats where the bot has actually set a draft or replied, as well as chats with custom settings. Each chat is shown as a single button with the chat name.
 
-- **Prompt** (`📝`) — tap to open the prompt editor for this chat. Shows the current prompt and lets you set a new one, clear it, or cancel. Per-chat prompt is appended to the global prompt (max 300 chars).
-- **Style** (`🦉 Name`) — tap to cycle through styles
-- **Auto-reply** (`⏰`) — tap to cycle through auto-reply timers for this chat. The last option in the cycle is **🔇 Ignore** — fully disables drafts, auto-replies, and message polling for that chat.
+Tapping a chat opens a **new message** with three vertical buttons:
+
+- **Style** (`🦉 Style: Userlike`) — tap to cycle through styles
+- **Prompt** (`📝 Prompt: ✅ ON`) — tap to open the prompt editor for this chat. Shows the current prompt and lets you set a new one, clear it, or cancel. Per-chat prompt is appended to the global prompt (max 300 chars).
+- **Auto-reply** (`⏰ Auto-reply: ✅ OFF`) — tap to cycle through auto-reply timers for this chat. The second option in the cycle is **🔇 Ignore** — fully disables drafts, auto-replies, and message polling for that chat.
 
 Per-chat settings override the global ones from `/settings`. If a per-chat value matches the global one, the override is automatically cleared. Available only to connected users.
 

bot.py

@@ -38,7 +38,8 @@
 from handlers.settings_handler import on_settings, on_settings_callback  # noqa: E402
 from handlers.poke_handler import on_poke  # noqa: E402
 from handlers.styles_handler import (  # noqa: E402
-    on_auto_reply_callback, on_chat_prompt_callback, on_chat_prompt_cancel_callback,
+    on_auto_reply_callback, on_chat_menu_callback, on_chat_prompt_callback,
+    on_chat_prompt_cancel_callback,
     on_chat_prompt_clear_callback, on_chats, on_chats_callback,
 )
 from utils.pyrogram_utils import restore_sessions  # noqa: E402
@@ -79,6 +80,7 @@ def main() -> None:
     app.add_handler(CommandHandler("poke", on_poke, filters=PRIVATE_ONLY_FILTER))
     app.add_handler(CallbackQueryHandler(on_settings_callback, pattern=r"^settings:"))
     app.add_handler(CallbackQueryHandler(on_chats_callback, pattern=r"^chats:"))
+    app.add_handler(CallbackQueryHandler(on_chat_menu_callback, pattern=r"^chatmenu:"))
     app.add_handler(CallbackQueryHandler(on_auto_reply_callback, pattern=r"^autoreply:"))
     app.add_handler(CallbackQueryHandler(on_chat_prompt_callback, pattern=r"^chatprompt:"))
     app.add_handler(CallbackQueryHandler(on_chat_prompt_cancel_callback, pattern=r"^chatprompt_cancel:"))

config.py

@@ -109,12 +109,12 @@
 CHAT_IGNORED_SENTINEL = -1  # Sentinel: чат полностью игнорируется (нет черновиков и автоответа)
 AUTO_REPLY_OPTIONS: dict[int | None, str] = {
     None: "auto_reply_off",
+    CHAT_IGNORED_SENTINEL: "auto_reply_ignore",
     60: "auto_reply_1m",
     300: "auto_reply_5m",
     900: "auto_reply_15m",
     3600: "auto_reply_1h",
     57600: "auto_reply_16h",
-    CHAT_IGNORED_SENTINEL: "auto_reply_ignore",
 }
 
 # Чаты, полностью игнорируемые ботом (не генерируются черновики и автоответы).

handlers/settings_handler.py

@@ -58,8 +58,8 @@ def _build_settings_keyboard(settings: dict, messages: dict) -> InlineKeyboardMa
     if ar_key == "auto_reply_ignore":
         auto_label = ar_base
     else:
-        ar_prefix = messages.get("auto_reply_prefix", "Auto-reply")
-        auto_label = f"⏰ {ar_prefix}: {ar_base}"
+        ar_prefix = messages.get("auto_reply_prefix", "⏰ Auto-reply:")
+        auto_label = f"{ar_prefix} {ar_base}"
     style_label = messages.get(STYLE_OPTIONS.get(settings.get("style"), "settings_style_userlike"))
 
     tz_offset = settings.get("tz_offset", 0) or 0
@@ -106,12 +106,8 @@ async def on_settings(update: Update, context: ContextTypes.DEFAULT_TYPE) -> Non
 
     messages = await get_system_messages(u.language_code)
 
-    # Добавляем превью промпта к заголовку
-    custom_prompt = settings.get("custom_prompt", "")
-    text = f"{title}\n\n📝 «{custom_prompt}»" if custom_prompt else title
-
     keyboard = _build_settings_keyboard(settings, messages)
-    await update.message.reply_text(text, reply_markup=keyboard)
+    await update.message.reply_text(title, reply_markup=keyboard)
 
     if DEBUG_PRINT:
         print(f"{get_timestamp()} [BOT] /settings from user {u.id}")
@@ -240,10 +236,7 @@ async def on_settings_callback(update: Update, context: ContextTypes.DEFAULT_TYP
     keyboard = _build_settings_keyboard(updated_settings, messages)
     title = messages.get("settings_title", "⚙️ Settings")
 
-    custom_prompt = updated_settings.get("custom_prompt", "")
-    text = f"{title}\n\n📝 «{custom_prompt}»" if custom_prompt else title
-
-    await query.edit_message_text(text=text, reply_markup=keyboard)
+    await query.edit_message_text(text=title, reply_markup=keyboard)
 
     if DEBUG_PRINT:
         print(f"{get_timestamp()} [BOT] Settings updated by user {u.id}: {action}")

handlers/styles_handler.py

@@ -41,7 +41,8 @@ def _auto_reply_label(seconds: int | None, messages: dict) -> str:
     ar_base = messages.get(ar_key, "")
     if ar_key == "auto_reply_ignore":
         return ar_base or "🔇"
-    return f"⏰: {ar_base}" if ar_base else "⏰"
+    ar_prefix = messages.get("auto_reply_prefix", "⏰ Auto-reply:")
+    return f"{ar_prefix} {ar_base}" if ar_base else "⏰"
 
 
 def _chat_display_name(dialog_info: dict) -> str:
@@ -58,46 +59,60 @@ def _chat_display_name(dialog_info: dict) -> str:
     return name or dialog_info.get("username", "") or "???"
 
 
+def _find_chat_name(context: ContextTypes.DEFAULT_TYPE, chat_id: int) -> str:
+    """Ищет имя чата в сохранённых диалогах."""
+    for d in context.user_data.get("chats_dialogs") or []:
+        if d["chat_id"] == chat_id:
+            return _chat_display_name(d)
+    return "???"
+
+
 def _build_styles_keyboard(
     dialogs: list[dict],
-    chat_styles: dict,
-    user_settings: dict,
-    messages: dict,
-    global_style: str | None = None,
 ) -> InlineKeyboardMarkup:
-    """Формирует inline-клавиатуру со списком чатов: стиль + автоответ + промпт."""
-    chat_prompts = user_settings.get("chat_prompts") or {}
+    """Формирует inline-клавиатуру: одна кнопка с именем чата на строку."""
     keyboard = []
     for d in dialogs:
         chat_id = d["chat_id"]
-        # Стиль
-        style = chat_styles.get(str(chat_id))
-        if style is None:
-            style = global_style
-        emoji = _style_emoji(style)
         name = _chat_display_name(d)
+        btn = InlineKeyboardButton(name, callback_data=f"chatmenu:{chat_id}")
+        keyboard.append([btn])
+    return InlineKeyboardMarkup(keyboard)
+
+
+def _build_chat_settings_keyboard(
+    chat_id: int,
+    user_settings: dict,
+    messages: dict,
+    global_style: str | None = None,
+) -> InlineKeyboardMarkup:
+    """Формирует inline-клавиатуру настроек чата: стиль + промпт + автоответ в столбец."""
+    chat_styles = user_settings.get("chat_styles") or {}
+    chat_prompts = user_settings.get("chat_prompts") or {}
+
+    # Стиль
+    style = chat_styles.get(str(chat_id))
+    if style is None:
+        style = global_style or DEFAULT_STYLE
+    style_msg_key = STYLE_OPTIONS.get(style, "settings_style_userlike")
+    style_label = messages.get(style_msg_key, f"{_style_emoji(style)} Style: {style}")
+
+    # Промпт
+    has_prompt = bool(chat_prompts.get(str(chat_id)))
+    prompt_label = messages.get(
+        "settings_prompt_set" if has_prompt else "settings_prompt_empty",
+        "📝",
+    )
+
+    # Автоответ
+    auto_reply = get_effective_auto_reply(user_settings, chat_id)
+    ar_label = _auto_reply_label(auto_reply, messages)
 
-        # Автоответ
-        auto_reply = get_effective_auto_reply(user_settings, chat_id)
-        ar_label = _auto_reply_label(auto_reply, messages)
-
-        # Per-chat промпт
-        has_prompt = bool(chat_prompts.get(str(chat_id)))
-        prompt_label = messages.get(
-            "chats_prompt_set" if has_prompt else "chats_prompt_empty",
-            "📝",
-        )
-
-        style_btn = InlineKeyboardButton(
-            f"{emoji} {name}", callback_data=f"chats:{chat_id}",
-        )
-        ar_btn = InlineKeyboardButton(
-            ar_label or "⏰", callback_data=f"autoreply:{chat_id}",
-        )
-        prompt_btn = InlineKeyboardButton(
-            prompt_label, callback_data=f"chatprompt:{chat_id}",
-        )
-        keyboard.append([prompt_btn, style_btn, ar_btn])
+    keyboard = [
+        [InlineKeyboardButton(style_label, callback_data=f"chats:{chat_id}")],
+        [InlineKeyboardButton(prompt_label, callback_data=f"chatprompt:{chat_id}")],
+        [InlineKeyboardButton(ar_label, callback_data=f"autoreply:{chat_id}")],
+    ]
     return InlineKeyboardMarkup(keyboard)
 
 
@@ -134,7 +149,6 @@ async def on_chats(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
     # Читаем настройки
     user = await get_user(u.id)
     user_settings = (user or {}).get("settings") or {}
-    chat_styles = user_settings.get("chat_styles") or {}
 
     # Получаем широкий список диалогов для фильтрации
     all_dialogs = await pyrogram_client.get_dialog_info(
@@ -153,35 +167,57 @@ async def on_chats(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
 
     messages = await get_system_messages(u.language_code)
     title = messages.get("chats_title", "🎭 Chats")
-    global_style = user_settings.get("style")
-    keyboard = _build_styles_keyboard(dialogs, chat_styles, user_settings, messages, global_style)
+    keyboard = _build_styles_keyboard(dialogs)
     await update.message.reply_text(title, reply_markup=keyboard)
 
     if DEBUG_PRINT:
         print(f"{get_timestamp()} [BOT] /chats from user {u.id}, {len(dialogs)} chats")
 
 
-async def _refresh_keyboard(
-    query, u, context, updated_settings: dict,
+async def _refresh_chat_settings(
+    query: object, u: object, context: ContextTypes.DEFAULT_TYPE,
+    chat_id: int, updated_settings: dict,
 ) -> None:
-    """Обновляет клавиатуру /chats после изменения настроек."""
-    dialogs = context.user_data.get("chats_dialogs") or []
-    if not dialogs:
-        all_dialogs = await pyrogram_client.get_dialog_info(
-            u.id, limit=CHATS_FETCH_LIMIT,
-        )
-        dialogs = _get_relevant_dialogs(all_dialogs, updated_settings, u.id)
-    else:
-        dialogs = _get_relevant_dialogs(dialogs, updated_settings, u.id)
+    """Обновляет клавиатуру настроек конкретного чата (Level 2 сообщение)."""
+    messages = await get_system_messages(u.language_code)
+    global_style = updated_settings.get("style")
+    keyboard = _build_chat_settings_keyboard(chat_id, updated_settings, messages, global_style)
 
-    context.user_data["chats_dialogs"] = dialogs
+    chat_name = _find_chat_name(context, chat_id)
+    title = messages.get("chats_chat_title", "⚙️ {chat_name}").format(chat_name=chat_name)
+    await query.edit_message_text(text=title, reply_markup=keyboard)
+
+
+@serialize_user_updates
+async def on_chat_menu_callback(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
+    """Обработчик нажатия на чат — отправляет новое сообщение с настройками чата."""
+    query = update.callback_query
+    u = update.effective_user
+    await query.answer()
+    await clear_pending_input(context, u.id, context.bot)
+
+    # Извлекаем chat_id из callback_data "chatmenu:123456"
+    try:
+        chat_id = int(query.data.split(":")[1])
+    except (IndexError, ValueError):
+        return
+
+    # Читаем текущие настройки
+    user = await get_user(u.id)
+    user_settings = (user or {}).get("settings") or {}
 
-    chat_styles = updated_settings.get("chat_styles") or {}
-    global_style = updated_settings.get("style")
     messages = await get_system_messages(u.language_code)
-    keyboard = _build_styles_keyboard(dialogs, chat_styles, updated_settings, messages, global_style)
-    title = messages.get("chats_title", "🎭 Chats")
-    await query.edit_message_text(text=title, reply_markup=keyboard)
+    global_style = user_settings.get("style")
+    keyboard = _build_chat_settings_keyboard(chat_id, user_settings, messages, global_style)
+
+    chat_name = _find_chat_name(context, chat_id)
+    title = messages.get("chats_chat_title", "⚙️ {chat_name}").format(chat_name=chat_name)
+    await context.bot.send_message(
+        chat_id=query.message.chat_id, text=title, reply_markup=keyboard,
+    )
+
+    if DEBUG_PRINT:
+        print(f"{get_timestamp()} [BOT] Chat menu opened for chat {chat_id} by user {u.id}")
 
 
 @serialize_user_updates
@@ -223,7 +259,7 @@ async def on_chats_callback(update: Update, context: ContextTypes.DEFAULT_TYPE)
         await query.edit_message_text(text=error_msg)
         return
 
-    await _refresh_keyboard(query, u, context, updated_settings)
+    await _refresh_chat_settings(query, u, context, chat_id, updated_settings)
 
     if DEBUG_PRINT:
         print(f"{get_timestamp()} [BOT] Style for chat {chat_id} changed to {next_value!r} by user {u.id}")
@@ -274,7 +310,7 @@ async def on_auto_reply_callback(update: Update, context: ContextTypes.DEFAULT_T
         await query.edit_message_text(text=error_msg)
         return
 
-    await _refresh_keyboard(query, u, context, updated_settings)
+    await _refresh_chat_settings(query, u, context, chat_id, updated_settings)
 
     if DEBUG_PRINT:
         print(f"{get_timestamp()} [BOT] Auto-reply for chat {chat_id} changed to {next_value!r} by user {u.id}")
@@ -299,13 +335,7 @@ async def on_chat_prompt_callback(update: Update, context: ContextTypes.DEFAULT_
     chat_prompts = user_settings.get("chat_prompts") or {}
     current_prompt = chat_prompts.get(str(chat_id), "")
 
-    # Имя чата из сохранённых диалогов
-    dialogs = context.user_data.get("chats_dialogs") or []
-    chat_name = "???"
-    for d in dialogs:
-        if d["chat_id"] == chat_id:
-            chat_name = _chat_display_name(d)
-            break
+    chat_name = _find_chat_name(context, chat_id)
 
     messages = await get_system_messages(u.language_code)
     if current_prompt:
@@ -327,21 +357,27 @@ async def on_chat_prompt_callback(update: Update, context: ContextTypes.DEFAULT_
 
 @serialize_user_updates
 async def on_chat_prompt_cancel_callback(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
-    """Отмена редактирования per-chat промпта — возврат к списку чатов."""
+    """Отмена редактирования per-chat промпта — возврат к настройкам чата."""
     query = update.callback_query
     u = update.effective_user
     await query.answer()
 
     await clear_pending_input(context, u.id, context.bot)
 
+    # Извлекаем chat_id из callback_data "chatprompt_cancel:123456"
+    try:
+        chat_id = int(query.data.split(":")[1])
+    except (IndexError, ValueError):
+        return
+
     user = await get_user(u.id)
     user_settings = (user or {}).get("settings") or {}
-    await _refresh_keyboard(query, u, context, user_settings)
+    await _refresh_chat_settings(query, u, context, chat_id, user_settings)
 
 
 @serialize_user_updates
 async def on_chat_prompt_clear_callback(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
-    """Очистка per-chat промпта и возврат к списку чатов."""
+    """Очистка per-chat промпта и возврат к настройкам чата."""
     query = update.callback_query
     u = update.effective_user
     await query.answer()
@@ -359,8 +395,7 @@ async def on_chat_prompt_clear_callback(update: Update, context: ContextTypes.DE
         await query.edit_message_text(text=error_msg)
         return
 
-    await _refresh_keyboard(query, u, context, updated_settings)
+    await _refresh_chat_settings(query, u, context, chat_id, updated_settings)
 
     if DEBUG_PRINT:
         print(f"{get_timestamp()} [BOT] Chat prompt cleared for chat {chat_id} by user {u.id}")
-

system_messages.py

@@ -100,7 +100,7 @@
     "settings_prompt_current": f"📝 Global prompt (all chats):\n«{{prompt}}»\n\nSend a new prompt to replace it (Max length: {USER_PROMPT_MAX_LENGTH} chars):",
     "settings_prompt_no_prompt": f"📝 Global prompt (all chats): not set.\n\nSend a prompt to set it (Max length: {USER_PROMPT_MAX_LENGTH} chars):",
     # — Auto-reply labels (base, without prefix) —
-    "auto_reply_prefix": "Auto-reply",
+    "auto_reply_prefix": "⏰ Auto-reply:",
     "auto_reply_off": "✅ OFF",
     "auto_reply_1m": "⚠️ 1 min",
     "auto_reply_5m": "⚠️ 5 min",
@@ -118,10 +118,9 @@
 
     # — Chats (per-chat settings) —
     "menu_chats": "Chat settings",
-    "chats_title": "🎭 Chats\nTap to change prompt, style, or auto-reply timer.",
+    "chats_title": "🎭 Chats",
+    "chats_chat_title": "⚙️ {chat_name}",
     "chats_no_chats": "No active chats found. Start a conversation first.",
-    "chats_prompt_set": "📝✅",
-    "chats_prompt_empty": "📝",
 
 
     # — Chats: per-chat prompt —