Update bot/ui/keyboards.py

bot/ui/keyboards.py

@@ -38,6 +38,15 @@ def auth_menu_keyboard() -> InlineKeyboardMarkup:
 
 
 def profiles_keyboard(profiles: list[dict], default_profile_id: str = "") -> InlineKeyboardMarkup:
+    """
+    Must match handlers.py:
+      profiles_keyboard(profiles, default_id)
+
+    Expected callback actions:
+      pdef:<profile_id>  set default
+      plog:<profile_id>  get login url
+      pdel:<profile_id>  delete profile (confirm by YES message)
+    """
     rows: list[list[InlineKeyboardButton]] = []
 
     default_profile_id = str(default_profile_id or "")
@@ -56,17 +65,19 @@ def profiles_keyboard(profiles: list[dict], default_profile_id: str = "") -> Inl
         status = "✅" if is_connected else ("🔑" if not has_refresh else "⚠️")
         title = f"{prefix}{status} [{i}] {label}"[:50]
 
-        rows.append([InlineKeyboardButton(title, callback_data=make("noop", pid[:8]))])
+        # Title/info row (noop)
+        rows.append([InlineKeyboardButton(title, callback_data=make("noop", pid[:8] or "p"))])
 
+        # Action row
         btns: list[InlineKeyboardButton] = []
         if pid:
             btns.append(InlineKeyboardButton("✅ Set default", callback_data=make("pdef", pid)))
             btns.append(InlineKeyboardButton("🔗 Login", callback_data=make("plog", pid)))
             btns.append(InlineKeyboardButton("🗑 Delete", callback_data=make("pdel", pid)))
-
         if btns:
             rows.append(btns)
 
+        # Optional error row
         if last_error:
             rows.append([InlineKeyboardButton(f"⚠️ {last_error[:48]}", callback_data=make("noop", "err"))])
 
@@ -74,23 +85,12 @@ def profiles_keyboard(profiles: list[dict], default_profile_id: str = "") -> Inl
     return InlineKeyboardMarkup(rows)
 
 
-def upload_confirm_keyboard(privacy: str, title_mode: str = "caption") -> InlineKeyboardMarkup:
+def upload_confirm_keyboard(privacy: str) -> InlineKeyboardMarkup:
     priv_label = {"private": "🔒 Private", "unlisted": "🔗 Unlisted", "public": "🌍 Public"}.get(
         (privacy or "private").lower(), "🔒 Private"
     )
-
-    tm = (title_mode or "").lower().strip()
-    b1 = "✅ Filename" if tm == "filename" else "Filename"
-    b2 = "✅ Caption" if tm == "caption" else "Caption"
-    b3 = "✅ Custom" if tm == "custom" else "Custom"
-
     return InlineKeyboardMarkup(
         [
-            [
-                InlineKeyboardButton(b1, callback_data=make(NAME_ORIGINAL)),
-                InlineKeyboardButton(b2, callback_data=make(NAME_CAPTION)),
-                InlineKeyboardButton(b3, callback_data=make(NAME_CUSTOM)),
-            ],
             [InlineKeyboardButton("✅ Upload", callback_data=make(UP_GO))],
             [
                 InlineKeyboardButton("✏️ Edit title/desc", callback_data=make(UP_EDIT)),
@@ -101,4 +101,21 @@ def upload_confirm_keyboard(privacy: str, title_mode: str = "caption") -> Inline
                 InlineKeyboardButton("⬅️ Back", callback_data=make(BACK)),
             ],
         ]
+    )
+
+
+def filename_keyboard() -> InlineKeyboardMarkup:
+    """
+    Used before upload to let user pick title source:
+      - Original filename
+      - Caption
+      - Custom
+    """
+    return InlineKeyboardMarkup(
+        [
+            [InlineKeyboardButton("📄 Original filename", callback_data=make(NAME_ORIGINAL))],
+            [InlineKeyboardButton("📝 From caption", callback_data=make(NAME_CAPTION))],
+            [InlineKeyboardButton("✍️ Custom name", callback_data=make(NAME_CUSTOM))],
+            [InlineKeyboardButton("❌ Cancel", callback_data=make(CANCEL))],
+        ]
     )