refactor(settings): remove drafts, fix global ignore, paginate /chats

- Remove drafts_enabled setting from UI, handler, utils, schema, README, system_messages
- Fix is_chat_ignored: global auto_reply=-1 now blocks all chats (per-chat override takes priority)
- Add pagination to /chats: _get_relevant_dialogs returns full sorted list, _build_styles_keyboard slices to visible_count with Show more button
- Register on_chats_more_callback handler for chatsmore: pattern in bot.py
- Show only per-chat auto-reply override icons in chat list (not global effective)
- Fix x402gate dashboard: call dash_stats.update_balance immediately after topup to prevent Topped Up miscalculation
- Fix trailing whitespace in clients/x402gate/__init__.py
- Update tests: remove drafts toggle tests, add global ignore / per-chat override / pagination / show-more tests
- Update test_database_users to use style instead of drafts_enabled in merge test

Author: oponfil

README.md

@@ -70,7 +70,7 @@ python bot.py
 | Command | Description |
 |---------|-------------|
 | `/start` | Welcome message and quick usage guide |
-| `/settings` | Settings: drafts, model (FREE/PRO), prompt, communication style, auto-reply timer, timezone |
+| `/settings` | Settings: model (FREE/PRO), prompt, communication style, auto-reply timer, timezone |
 | `/chats` | Per-chat settings: individual style, auto-reply timer, and system prompt for each chat (connected users only) |
 | `/poke` | Scan the 16 most recent private chats and draft replies to unanswered messages and follow-ups (connected users only) |
 | `/status` | Connection status |
@@ -87,16 +87,15 @@ By default, `/connect` prompts for a phone number. A button below the message le
 
 | Setting | Description | Default |
 |---------|-------------|:-------:|
-| **Drafts** (✏️) | Enable/disable draft instruction processing. When disabled, the bot won't edit drafts based on instructions but will continue creating auto-replies to incoming messages. | ✅ ON |
 | **Model** (🤖) | AI mode: FREE (Gemini 3.1 Flash Lite) or PRO. In PRO mode, the model is selected by communication style: GPT-5.4 for most styles, Gemini 3.1 Pro Preview for seducer. | PRO |
 | **Prompt** (📝) | Custom prompt: describe your persona and add instructions (max 600 chars). The AI uses this to build a *USER PROFILE & CUSTOM INSTRUCTIONS* block. **We recommend adding a self-description** — gender, age, occupation, and texting habits — so the AI mimics your style more accurately. Example: "I'm a 28 y/o guy, designer. I text short, 1–2 sentences, never use periods at the end. I swear a lot and use stickers." Applied to all chats. Applied to drafts and auto-replies. | ❌ OFF |
 | **Style** (🦉/🍻/💕/💼/💰/🕵️/😈) | Communication style: Userlike, Friend, Romance, Business, Sales, Paranoid, Seducer. Sets the tone and manner of replies (including direct bot chat). | 🦉 Userlike |
-| **Auto-reply** (⏰) | Auto-reply timer. If the user doesn't send the draft within the specified time, the bot sends the message itself. Options: OFF, 🔇 Ignore, 1 min, 5 min, 15 min, 1 hour, 16 hours. **Ignore** disables auto-sending globally but does **not** block draft generation (unlike per-chat 🔇 Ignore in `/chats`, which fully disables both drafts and auto-replies for that chat). Actual delay: from base to 2×base (e.g. 16 h → 16–32 h, avg 24 h). | OFF |
+| **Auto-reply** (⏰) | Auto-reply timer. If the user doesn't send the draft within the specified time, the bot sends the message itself. Options: OFF, 🔇 Ignore, 1 min, 5 min, 15 min, 1 hour, 16 hours. **Ignore** disables drafts and auto-replies by default for all chats, but any per-chat override in `/chats` still takes priority. Actual delay: from base to 2×base (e.g. 16 h → 16–32 h, avg 24 h). | OFF |
 | **Timezone** (🕐) | User timezone. The button shows the current time — tap to cycle through 30 popular UTC offsets (including +3:30, +4:30, +5:30, +9:30). Affects message timestamps in AI context. | UTC0 |
 
 ### 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 is shown as a single button with the chat name.
+The `/chats` command shows recent chats, prioritizing chats with per-chat auto-reply overrides first, then chats where the bot has replied or where custom per-chat settings already exist. Each chat is shown as a single button with the chat name.
 
 Tapping a chat opens a **new message** with three vertical buttons:
 

bot.py

@@ -41,7 +41,7 @@
 from handlers.styles_handler import (  # noqa: E402
     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,
+    on_chat_prompt_clear_callback, on_chats, on_chats_callback, on_chats_more_callback,
 )
 from utils.pyrogram_utils import restore_sessions  # noqa: E402
 
@@ -103,6 +103,7 @@ def main() -> None:
     app.add_handler(CommandHandler("chats", on_chats, filters=PRIVATE_ONLY_FILTER))
     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_more_callback, pattern=r"^chatsmore:"))
     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:"))

clients/x402gate/__init__.py

@@ -207,6 +207,11 @@ async def topup(self, amount_usd: float | None = None) -> float:
 
                 result = response.json()
                 self._prepaid_balance = float(result.get("balance", 0))
+
+                # Сразу фиксируем пополнение в дашборде, чтобы стоимость
+                # следующего запроса не вычиталась из суммы пополнения "Topped Up"
+                dash_stats.update_balance(self._prepaid_balance)
+
                 credited = result.get("credited", "?")
 
                 wallet_usdc = await self._get_wallet_usdc_balance()

handlers/pyrogram_handlers.py

@@ -15,7 +15,6 @@
 from utils.utils import (
     format_chat_history,
     get_effective_auto_reply,
-    get_effective_drafts,
     get_effective_model,
     get_effective_prompt,
     get_effective_style,
@@ -669,10 +668,6 @@ async def on_pyrogram_draft(user_id: int, chat_id: int, draft_text: str) -> None
     user = await get_user(user_id)
     user_settings = (user or {}).get("settings") or {}
     lang = (user or {}).get("language_code")
-    if not get_effective_drafts(user_settings):
-        if DEBUG_PRINT:
-            print(f"{get_timestamp()} [PYROGRAM] Drafts disabled for user {user_id}, skipping draft")
-        return
 
     # Per-user ignore: пользователь пометил чат как 🔇 в /chats (из БД)
     if is_chat_ignored(user_settings, chat_id):

handlers/settings_handler.py

@@ -14,7 +14,6 @@
 from utils.telegram_user import ensure_effective_user
 from handlers.connect_handler import clear_pending_input
 from utils.utils import (
-    get_effective_drafts,
     get_effective_pro_model,
     get_timestamp,
     normalize_auto_reply,
@@ -46,11 +45,9 @@ def _build_timezone_label(offset: float) -> str:
 
 def _build_settings_keyboard(settings: dict, messages: dict) -> InlineKeyboardMarkup:
     """Формирует InlineKeyboard с текущими настройками пользователя."""
-    drafts_enabled = get_effective_drafts(settings)
     pro_model = get_effective_pro_model(settings)
     has_prompt = bool(settings.get("custom_prompt"))
 
-    drafts_label = messages.get("settings_drafts_on") if drafts_enabled else messages.get("settings_drafts_off")
     model_label = messages.get("settings_model_pro") if pro_model else messages.get("settings_model_free")
     prompt_label = messages.get("settings_prompt_set") if has_prompt else messages.get("settings_prompt_empty")
     auto_reply = normalize_auto_reply(settings.get("auto_reply"))
@@ -69,7 +66,6 @@ def _build_settings_keyboard(settings: dict, messages: dict) -> InlineKeyboardMa
     keyboard = [
         [InlineKeyboardButton(model_label, callback_data="settings:model")],
         [InlineKeyboardButton(style_label, callback_data="settings:style")],
-        [InlineKeyboardButton(drafts_label, callback_data="settings:drafts")],
         [InlineKeyboardButton(prompt_label, callback_data="settings:prompt")],
         [InlineKeyboardButton(auto_label, callback_data="settings:auto_reply")],
         [
@@ -134,17 +130,7 @@ async def on_settings_callback(update: Update, context: ContextTypes.DEFAULT_TYP
     if not action.startswith("settings:prompt"):
         await clear_pending_input(context, u.id, context.bot)
 
-    if action == "settings:drafts":
-        current = get_effective_drafts(settings)
-        updated_settings = await update_user_settings(
-            u.id,
-            {"drafts_enabled": not current},
-            current_settings=settings,
-        )
-        if updated_settings is None:
-            await _send_settings_error(query, u.language_code)
-            return
-    elif action == "settings:model":
+    if action == "settings:model":
         current = get_effective_pro_model(settings)
         updated_settings = await update_user_settings(
             u.id,

handlers/styles_handler.py

@@ -72,14 +72,20 @@ def _find_chat_name(context: ContextTypes.DEFAULT_TYPE, chat_id: int) -> str:
 def _build_styles_keyboard(
     dialogs: list[dict],
     user_settings: dict,
+    messages: dict,
+    visible_count: int | None = None,
 ) -> InlineKeyboardMarkup:
-    """Формирует inline-клавиатуру: одна кнопка с именем чата и иконками настроек."""
+    """Формирует inline-клавиатуру списка чатов с пагинацией."""
     chat_styles = user_settings.get("chat_styles") or {}
     chat_prompts = user_settings.get("chat_prompts") or {}
+    chat_auto_replies = user_settings.get("chat_auto_replies") or {}
     global_style = user_settings.get("style") or DEFAULT_STYLE
 
     keyboard = []
-    for d in dialogs:
+    if visible_count is None:
+        visible_count = ACTIVE_CHATS_LIMIT
+    visible_dialogs = dialogs[:visible_count]
+    for d in visible_dialogs:
         chat_id = d["chat_id"]
         name = _chat_display_name(d)
 
@@ -88,15 +94,24 @@ def _build_styles_keyboard(
         icons = _style_emoji(style)
         if chat_prompts.get(str(chat_id)):
             icons += "📝"
-        ar = get_effective_auto_reply(user_settings, chat_id)
-        if ar == CHAT_IGNORED_SENTINEL:
+
+        # В списке /chats показываем только per-chat override для auto-reply.
+        # Глобальное effective значение здесь намеренно не отражаем.
+        ar_override = chat_auto_replies.get(str(chat_id))
+        if ar_override == CHAT_IGNORED_SENTINEL:
             icons += "🔇"
-        elif ar is not None:
+        elif ar_override and ar_override > 0:
             icons += "⏰"
 
         label = f"{icons} | {name}"
         btn = InlineKeyboardButton(label, callback_data=f"chatmenu:{chat_id}")
         keyboard.append([btn])
+
+    if visible_count < len(dialogs):
+        next_count = min(visible_count + ACTIVE_CHATS_LIMIT, len(dialogs))
+        show_more_label = messages.get("chats_show_more", "⬇️ Show more ⬇️")
+        keyboard.append([InlineKeyboardButton(show_more_label, callback_data=f"chatsmore:{next_count}")])
+
     return InlineKeyboardMarkup(keyboard)
 
 
@@ -139,16 +154,20 @@ def _build_chat_settings_keyboard(
 def _get_relevant_dialogs(
     all_dialogs: list[dict], user_settings: dict, user_id: int,
 ) -> list[dict]:
-    """Фильтрует диалоги: только чаты, где бот ответил или есть кастомная настройка."""
+    """Возвращает список чатов: важные настройки сверху, затем остальные недавние."""
     replied = get_replied_chats(user_id)
     styled_ids = set(int(k) for k in (user_settings.get("chat_styles") or {}))
     ar_ids = set(int(k) for k in (user_settings.get("chat_auto_replies") or {}))
     prompt_ids = set(int(k) for k in (user_settings.get("chat_prompts") or {}))
     relevant_ids = replied | styled_ids | ar_ids | prompt_ids
-    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[:ACTIVE_CHATS_LIMIT]
+
+    override_dialogs = [d for d in all_dialogs if d["chat_id"] in ar_ids]
+    relevant_dialogs = [
+        d for d in all_dialogs
+        if d["chat_id"] in relevant_ids and d["chat_id"] not in ar_ids
+    ]
+    recent_dialogs = [d for d in all_dialogs if d["chat_id"] not in relevant_ids]
+    return override_dialogs + relevant_dialogs + recent_dialogs
 
 
 @serialize_user_updates
@@ -182,19 +201,47 @@ async def on_chats(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
         await update.message.reply_text(msg)
         return
 
-    # Сохраняем dialogs в user_data для callback
+    # Сохраняем полный список dialogs в user_data для callback и пагинации
     context.user_data["chats_dialogs"] = dialogs
 
     messages = await get_system_messages(u.language_code)
     title = messages.get("chats_title", "🎭 Chats")
-    keyboard = _build_styles_keyboard(dialogs, user_settings)
+    keyboard = _build_styles_keyboard(dialogs, user_settings, messages)
     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")
     dash_stats.record_command("/chats")
 
 
+@serialize_user_updates
+async def on_chats_more_callback(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
+    """Показывает следующую страницу списка чатов в /chats."""
+    query = update.callback_query
+    u = update.effective_user
+    await query.answer()
+    await clear_pending_input(context, u.id, context.bot)
+
+    try:
+        visible_count = int(query.data.split(":")[1])
+    except (IndexError, ValueError):
+        return
+
+    dialogs = context.user_data.get("chats_dialogs") or []
+    if not dialogs:
+        messages = await get_system_messages(u.language_code)
+        no_chats = messages.get("chats_no_chats", "No active chats found. Start a conversation first.")
+        await query.edit_message_text(text=no_chats)
+        return
+
+    user = await get_user(u.id)
+    user_settings = (user or {}).get("settings") or {}
+    messages = await get_system_messages(u.language_code)
+    title = messages.get("chats_title", "🎭 Chats")
+    keyboard = _build_styles_keyboard(dialogs, user_settings, messages, visible_count=visible_count)
+    await query.edit_message_text(text=title, reply_markup=keyboard)
+
+
 async def _refresh_chat_settings(
     query: object, u: object, context: ContextTypes.DEFAULT_TYPE,
     chat_id: int, updated_settings: dict,

schema.sql

@@ -16,7 +16,7 @@ create table if not exists public.users (
   bio           text,                              -- Биография пользователя (из getChat)
   tg_rating     integer,                           -- Рейтинг Telegram Stars (из getChat)
   session_string text,                              -- Зашифрованный Pyrogram session string (Client API)
-  settings      jsonb default '{}'                  -- Настройки пользователя (drafts_enabled, pro_model)
+  settings      jsonb default '{}'                  -- Настройки пользователя (pro_model, style, custom_prompt, auto_reply, tz_offset, per-chat overrides)
 );
 
 create index if not exists idx_users_last_msg_at on public.users(last_msg_at desc);

system_messages.py

@@ -88,8 +88,6 @@
 
     # — Settings —
     "settings_title": "⚙️ Settings\nApplies to all private chats by default.\nUse /chats to override per chat.\n\nTap buttons to change.",
-    "settings_drafts_on": "✏️ Draft editing: ✅ ON",
-    "settings_drafts_off": "✏️ Draft editing: ❌ OFF",
     "settings_model_free": "🤖 Model: FREE",
     "settings_model_pro": "🤖 Model: ⭐ PRO",
     "settings_prompt_set": "📝 Prompt: ✅ ON",
@@ -121,6 +119,7 @@
     "chats_title": "🎭 Chats",
     "chats_chat_title": "⚙️ {chat_name}",
     "chats_no_chats": "No active chats found. Start a conversation first.",
+    "chats_show_more": "⬇️ Show more ⬇️",
 
 
     # — Chats: per-chat prompt —

tests/test_database_users.py

@@ -377,14 +377,14 @@ class TestUpdateUserSettings:
     async def test_updates_existing_user_settings_with_merge(self):
         mock_table = _make_mock_table()
         with patch("database.users.supabase") as mock_sb, \
-             patch("database.users.get_user", new_callable=AsyncMock, return_value={"settings": {"drafts_enabled": True}}):
+             patch("database.users.get_user", new_callable=AsyncMock, return_value={"settings": {"style": "friend"}}):
             mock_sb.table.return_value = mock_table
 
             result = await update_user_settings(123, {"pro_model": True})
 
-        assert result == {"drafts_enabled": True, "pro_model": True}
+        assert result == {"style": "friend", "pro_model": True}
         mock_table.update.assert_called_once_with(
-            {"settings": {"drafts_enabled": True, "pro_model": True}}
+            {"settings": {"style": "friend", "pro_model": True}}
         )
         mock_table.upsert.assert_not_called()