telepost-bot 2.78.1__tar.gz → 2.80.0__tar.gz

{telepost_bot-2.78.1 → telepost_bot-2.80.0}/CHANGELOG.md

@@ -8,6 +8,25 @@
 > 发布说明面向普通用户：写「对用户有什么改变」，不写内部实现细节（模块名、函数名、配置键）；
 > 技术细节放进代码注释或 `docs/`。每个 Release 的正文由本文件对应版本段自动生成。
 
+## [2.80.0](https://github.com/redtidev1918/TelePost/compare/v2.79.0...v2.80.0) (2026-10-04)
+
+
+### Features
+
+* **webapp:** add a mobile presentation kit and design tokens ([b1aab32](https://github.com/redtidev1918/TelePost/commit/b1aab325043ad5830bd0e7022980654c53633ddd))
+* **webapp:** improve submission experience ([308c3d5](https://github.com/redtidev1918/TelePost/commit/308c3d5e872114898a7458b58b6346c1ffdb6267))
+* **webapp:** make home a dashboard, hot a content browser, mine a history ([8edd729](https://github.com/redtidev1918/TelePost/commit/8edd72903030eafa412cfdd62df3102aa271c21e))
+* **webapp:** redesign mobile mini app navigation ([7a5d141](https://github.com/redtidev1918/TelePost/commit/7a5d141f081f262f62e616fcc56b4eeb968ea3a7))
+* **webapp:** redesign the Mini App for mobile (navigation, browsing, submit, review) ([46d6238](https://github.com/redtidev1918/TelePost/commit/46d6238173a7103f30afc25d0428e0dadf50c758))
+* **webapp:** simplify reviewer workspace and review actions ([ba2d8aa](https://github.com/redtidev1918/TelePost/commit/ba2d8aa85a8772270d8c6841c26b6240a4195f9a))
+
+## [2.79.0](https://github.com/redtidev1918/TelePost/compare/v2.78.1...v2.79.0) (2026-10-03)
+
+
+### Features
+
+* **search:** tell users when search is disabled on this bot ([896a8e2](https://github.com/redtidev1918/TelePost/commit/896a8e281af8904c6c750a5b18675227699e845a))
+
 ## [2.78.1](https://github.com/redtidev1918/TelePost/compare/v2.78.0...v2.78.1) (2026-10-03)
 
 

{telepost_bot-2.78.1/telepost_bot.egg-info → telepost_bot-2.80.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: telepost-bot
-Version: 2.78.1
+Version: 2.80.0
 Summary: Telegram submission, review, and publication bot with a Mini App, HTTP API, and multi-bot supervisor.
 Author: redtidev1918
 License-Expression: MIT

{telepost_bot-2.78.1 → telepost_bot-2.80.0}/handlers/callback_handlers.py

@@ -11,7 +11,9 @@ from ui.messages import MessageFormatter
 from database.db_manager import get_db
 from utils.blacklist import remove_from_blacklist, is_owner
 from handlers.stats_handlers import get_hot_posts
-from handlers.search_handlers import search_posts_by_tag
+from handlers.search_handlers import (
+    reply_search_disabled, search_enabled, search_posts_by_tag,
+)
 
 logger = logging.getLogger(__name__)
 
@@ -104,6 +106,9 @@ async def handle_callback_query(update: Update, context: CallbackContext):
         # 搜索-时间筛选
         elif data.startswith("time_"):
             # 记录时间筛选并提示输入关键词
+            if not search_enabled():
+                await reply_search_disabled(update, edit=True)
+                return
             mapping = {
                 'time_day': 'day',
                 'time_week': 'week',
@@ -216,6 +221,11 @@ async def handle_search_action(update: Update, context: CallbackContext):
     query = update.callback_query
     await _safe_answer(query)
     action = query.data.replace("search_", "")
+
+    # search_myposts 走数据库，不依赖搜索引擎，不受 SEARCH_ENABLED 影响。
+    if action != "myposts" and not search_enabled():
+        await reply_search_disabled(update, edit=True)
+        return
     
     if action == "fulltext":
         await query.edit_message_text(
@@ -247,6 +257,11 @@ async def handle_search_action(update: Update, context: CallbackContext):
 async def handle_tag_search(update: Update, context: CallbackContext):
     """处理标签搜索"""
     query = update.callback_query
+
+    if not search_enabled():
+        await reply_search_disabled(update, edit=True)
+        return
+
     tag = query.data.replace("tag_search_", "")
     
     await _safe_answer(query, f"正在搜索标签: {tag}")

{telepost_bot-2.78.1 → telepost_bot-2.80.0}/handlers/command_handlers.py

@@ -142,10 +142,16 @@ async def handle_menu_shortcuts(update: Update, context: CallbackContext) -> Non
             handled = True
         # 搜索
         elif text.endswith("搜索"):
-            await update.message.reply_text(
-                "🔍 请输入搜索关键词，或点击下方选项：",
-                reply_markup=Keyboards.search_options()
+            from handlers.search_handlers import (
+                reply_search_disabled, search_enabled,
             )
+            if not search_enabled():
+                await reply_search_disabled(update)
+            else:
+                await update.message.reply_text(
+                    "🔍 请输入搜索关键词，或点击下方选项：",
+                    reply_markup=Keyboards.search_options()
+                )
             handled = True
         # 帮助
         elif text.endswith("帮助"):

{telepost_bot-2.78.1 → telepost_bot-2.80.0}/handlers/search_handlers.py

@@ -21,12 +21,53 @@ logger = logging.getLogger(__name__)
 # 简单缓存：标签云 60s
 _tag_cloud_cache = TTLCache(default_ttl=60, max_size=16)
 
+# 搜索未启用时的统一提示（与 Mini App 未启用的文案风格保持一致）。
+# 只拦依赖搜索引擎的入口；「我的投稿 / 标签云 / 热门内容」走数据库，不受
+# SEARCH_ENABLED 影响，因此提示里把它们作为仍然可用的替代路径。
+SEARCH_DISABLED_MESSAGE = (
+    "ℹ️ 搜索功能在当前机器人尚未启用。\n\n"
+    "你仍然可以：\n"
+    "• 📋 我的投稿 —— 查看自己发布过的内容\n"
+    "• 🏷️ 标签云 —— 按标签浏览\n"
+    "• 🔥 热门内容 —— 看看最近的热门\n\n"
+    "如需使用搜索，请联系频道管理员开启后再试。"
+)
+
 
 def is_owner(user_id: int) -> bool:
     """检查用户是否是 OWNER"""
     return OWNER_ID and user_id == OWNER_ID
 
 
+def search_enabled() -> bool:
+    """当前 bot 是否启用搜索。
+
+    多 bot 部署下 SEARCH_ENABLED 可被 ``BOT{n}_SEARCH_ENABLED`` 逐 bot 覆盖，
+    所以必须从 config.settings 现读，不能在模块导入时缓存。
+    """
+    from config.settings import SEARCH_ENABLED
+    return bool(SEARCH_ENABLED)
+
+
+async def reply_search_disabled(update: Update, *, edit: bool = False) -> None:
+    """回复「搜索未启用」提示，命令 / 菜单 / 回调三种入口通用。"""
+    # 回调应答由调用方负责（每个 callback query 只能应答一次）。
+    query = getattr(update, "callback_query", None)
+    if query is not None:
+        try:
+            if edit:
+                await query.edit_message_text(SEARCH_DISABLED_MESSAGE)
+            else:
+                await query.message.reply_text(SEARCH_DISABLED_MESSAGE)
+            return
+        except Exception:
+            logger.warning("搜索未启用提示（回调）发送失败", exc_info=True)
+            return
+    message = getattr(update, "message", None) or getattr(update, "effective_message", None)
+    if message is not None:
+        await message.reply_text(SEARCH_DISABLED_MESSAGE)
+
+
 async def search_posts(update: Update, context: CallbackContext):
     """
     搜索已发布的帖子 - 使用全文搜索引擎（支持中文分词）
@@ -49,6 +90,11 @@ async def search_posts(update: Update, context: CallbackContext):
         update: Telegram 更新对象
         context: 回调上下文
     """
+    # 搜索未启用时不再进入帮助/检索流程，直接给出明确说明。
+    if not search_enabled():
+        await reply_search_disabled(update)
+        return
+
     try:
         # 解析参数
         if not context.args:
@@ -320,6 +366,14 @@ async def handle_search_input(update: Update, context: CallbackContext):
     mode = context.user_data.get('search_mode')
     if not mode:
         return  # 未处于搜索输入模式，交给其他处理器
+
+    # 开关可能在用户进入搜索模式之后才被关掉（例如 bot 重启换配置），此时
+    # 明确提示并退出搜索模式，避免用户一直停在「等待输入关键词」的状态。
+    if not search_enabled():
+        context.user_data['search_mode'] = None
+        await reply_search_disabled(update)
+        return
+
     text = (update.message.text or '').strip()
     if not text:
         await update.message.reply_text("❌ 请输入搜索关键词")
@@ -350,6 +404,10 @@ async def search_posts_by_tag(update: Update, context: CallbackContext, tag: str
         context: 回调上下文
         tag: 要搜索的标签
     """
+    if not search_enabled():
+        await reply_search_disabled(update)
+        return
+
     # 如果没有提供标签，从context.args获取
     if tag is None:
         if not context.args:

{telepost_bot-2.78.1 → telepost_bot-2.80.0}/telepost/build_info.py

@@ -8,7 +8,7 @@ to the entry points; when present it overrides these committed defaults.
 # Bumped automatically by release-please (extra-files in
 # release-please-config.json). Release bundles and images override it at build
 # time with the exact version/commit; this constant is the local-dev fallback.
-RELEASE_VERSION = "2.78.1"  # x-release-please-version
+RELEASE_VERSION = "2.80.0"  # x-release-please-version
 RELEASE_COMMIT = "dev"
 BUILD_DATE = "dev"
 SERVICE = "telepost"

{telepost_bot-2.78.1 → telepost_bot-2.80.0/telepost_bot.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: telepost-bot
-Version: 2.78.1
+Version: 2.80.0
 Summary: Telegram submission, review, and publication bot with a Mini App, HTTP API, and multi-bot supervisor.
 Author: redtidev1918
 License-Expression: MIT

{telepost_bot-2.78.1 → telepost_bot-2.80.0}/telepost_bot.egg-info/SOURCES.txt

@@ -232,6 +232,7 @@ tests/test_run_dispatcher.py
 tests/test_run_mode.py
 tests/test_run_supervisor.py
 tests/test_schedule_outcomes.py
+tests/test_search_disabled_hint.py
 tests/test_search_recovery.py
 tests/test_security.py
 tests/test_shutdown.py
@@ -273,5 +274,5 @@ utils/webhook_server.py
 webapp/__init__.py
 webapp/dist/index.html
 webapp/dist/assets/2d82b92e720462f8dd3b-Bh4Fahcw.svg
-webapp/dist/assets/index-C-xxEN9W.js
-webapp/dist/assets/index-DJgL81We.css
+webapp/dist/assets/index-BxUwEgTT.css
+webapp/dist/assets/index-CM9sCW78.js

telepost_bot-2.80.0/tests/test_search_disabled_hint.py

@@ -0,0 +1,247 @@
+"""搜索关闭时，所有搜索入口都要给出「尚未启用」提示，而不是静默或报错。
+
+背景：``SEARCH_ENABLED=false``（多 bot 下是 ``BOT{n}_SEARCH_ENABLED=false``）
+时搜索引擎根本不会初始化，但 ``/search`` 和底部菜单「🔍 搜索」此前仍会照常
+进入流程：命令会打到 ``get_search_engine()``，菜单则会弹出一组点了也没用的
+搜索选项键盘。用户看到的是卡住或空结果，而不是「这个功能没开」。
+
+本文件锁死两件事：
+1. 关闭时，命令 / 菜单 / 内联搜索按钮都只回一条「尚未启用」说明；
+2. 不牵连不依赖搜索引擎的入口——「我的投稿 / 标签云 / 热门内容」照旧可用，
+   且搜索输入模式不会被无限期留在 user_data 里。
+"""
+from unittest.mock import AsyncMock, MagicMock
+
+import pytest
+from telegram import Chat, Message, MessageEntity, Update, User
+from telegram.ext import Application, ApplicationHandlerStop, MessageHandler, filters
+
+from handlers import command_handlers
+from handlers.callback_handlers import handle_search_action, handle_tag_search
+from handlers.search_handlers import (
+    SEARCH_DISABLED_MESSAGE,
+    search_posts,
+    handle_search_input,
+)
+
+
+def _message_update(text, user_id=42):
+    user = User(id=user_id, is_bot=False, first_name="T", username="tester")
+    chat = Chat(id=user_id, type="private")
+    kw = dict(message_id=1, date=0, chat=chat, from_user=user, text=text)
+    if text.startswith("/"):
+        kw["entities"] = (
+            MessageEntity(type="bot_command", offset=0, length=len(text.split()[0])),
+        )
+    return Update(update_id=1, message=Message(**kw))
+
+
+def _command_update(args=None):
+    """/search 命令：message 用 AsyncMock，避免真的走 Bot API。"""
+    update = MagicMock()
+    update.callback_query = None
+    update.message = AsyncMock()
+    update.message.text = "/search" + (" " + " ".join(args) if args else "")
+    update.message.chat.type = "private"
+    update.channel_post = None
+    update.edited_channel_post = None
+    update.effective_user = MagicMock(id=42)
+    return update
+
+
+def _callback_update(data):
+    query = AsyncMock()
+    query.data = data
+    query.message = AsyncMock()
+    update = MagicMock()
+    update.callback_query = query
+    update.message = None
+    return update, query
+
+
+class _RecordingBot:
+    """记录出站文本的最小 Bot 替身（与菜单回归测试同一套路）。"""
+
+    def __init__(self):
+        self.outbox = []
+        self._mid = 1000
+        self.id = 777
+        self.username = "testbot"
+        self.name = "testbot"
+
+    async def initialize(self):
+        pass
+
+    async def shutdown(self):
+        pass
+
+    async def send_message(self, chat_id, text, **kw):
+        self.outbox.append(text)
+        return MagicMock(message_id=self._mid)
+
+    async def edit_message_text(self, *a, **kw):
+        return MagicMock(message_id=self._mid)
+
+
+def _menu_app(bot):
+    app = Application.builder().bot(bot).build()
+    app.add_handler(
+        MessageHandler(filters.TEXT & ~filters.COMMAND, command_handlers.handle_menu_shortcuts),
+        group=998,
+    )
+    return app
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize("args", [None, ["python"]])
+async def test_search_command_when_disabled(monkeypatch, args):
+    """/search（带不带关键词都一样）只回一条未启用提示，且不碰搜索引擎。"""
+    monkeypatch.setattr("config.settings.SEARCH_ENABLED", False)
+    engine_calls = []
+    monkeypatch.setattr(
+        "handlers.search_handlers.get_search_engine",
+        lambda *a, **kw: engine_calls.append(1),
+    )
+
+    update = _command_update(args)
+    await search_posts(update, MagicMock(args=args or []))
+
+    update.message.reply_text.assert_awaited_once()
+    assert update.message.reply_text.await_args.args[0] == SEARCH_DISABLED_MESSAGE
+    assert "尚未启用" in update.message.reply_text.await_args.args[0]
+    assert engine_calls == [], "关闭时不该再去取搜索引擎实例"
+
+
+@pytest.mark.asyncio
+async def test_search_command_when_enabled_still_answers_help(monkeypatch):
+    """开启时保持原行为：无参数仍给搜索帮助，不是未启用提示。"""
+    monkeypatch.setattr("config.settings.SEARCH_ENABLED", True)
+
+    update = _command_update(None)
+    await search_posts(update, MagicMock(args=[]))
+
+    sent = update.message.reply_text.await_args.args[0]
+    assert "尚未启用" not in sent
+    assert "搜索帮助" in sent
+
+
+@pytest.mark.asyncio
+async def test_menu_search_button_when_disabled(monkeypatch):
+    """底部菜单「🔍 搜索」关闭时只回一条未启用提示（不落到 catch_all 兜底）。"""
+    monkeypatch.setattr("config.settings.SEARCH_ENABLED", False)
+    bot = _RecordingBot()
+    app = _menu_app(bot)
+    await app.initialize()
+    try:
+        update = _message_update("🔍 搜索")
+        update.set_bot(bot)
+        update.message.set_bot(bot)
+        await app.process_update(update)
+    finally:
+        await app.shutdown()
+
+    assert len(bot.outbox) == 1, f"应只回一条，实际 {bot.outbox}"
+    assert "尚未启用" in bot.outbox[0]
+    assert "我没看懂" not in bot.outbox[0]
+
+
+@pytest.mark.asyncio
+async def test_menu_search_button_when_enabled(monkeypatch):
+    """开启时菜单照旧引导输入关键词。"""
+    monkeypatch.setattr("config.settings.SEARCH_ENABLED", True)
+    bot = _RecordingBot()
+    app = _menu_app(bot)
+    await app.initialize()
+    try:
+        update = _message_update("🔍 搜索")
+        update.set_bot(bot)
+        update.message.set_bot(bot)
+        await app.process_update(update)
+    finally:
+        await app.shutdown()
+
+    assert len(bot.outbox) == 1
+    assert "请输入搜索关键词" in bot.outbox[0]
+    assert "尚未启用" not in bot.outbox[0]
+
+
+@pytest.mark.asyncio
+async def test_menu_search_button_raises_handler_stop_when_disabled(monkeypatch):
+    """提示之后仍然要中断后续 group，否则用户会额外收到兜底文案。"""
+    monkeypatch.setattr("config.settings.SEARCH_ENABLED", False)
+    bot = _RecordingBot()
+    update = _message_update("🔍 搜索")
+    update.set_bot(bot)
+    update.message.set_bot(bot)
+    context = MagicMock()
+    context.user_data = {}
+
+    with pytest.raises(ApplicationHandlerStop):
+        await command_handlers.handle_menu_shortcuts(update, context)
+
+    assert bot.outbox == [SEARCH_DISABLED_MESSAGE]
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize("data", ["search_fulltext", "search_tag", "search_time"])
+async def test_inline_search_actions_when_disabled(monkeypatch, data):
+    """内联搜索按钮关闭时原地改写为未启用提示。"""
+    monkeypatch.setattr("config.settings.SEARCH_ENABLED", False)
+    update, query = _callback_update(data)
+
+    await handle_search_action(update, MagicMock(user_data={}))
+
+    query.edit_message_text.assert_awaited_once()
+    assert query.edit_message_text.await_args.args[0] == SEARCH_DISABLED_MESSAGE
+
+
+@pytest.mark.asyncio
+async def test_inline_myposts_unaffected_when_disabled(monkeypatch):
+    """「我的投稿」走数据库，搜索关闭时也必须照常可用。"""
+    monkeypatch.setattr("config.settings.SEARCH_ENABLED", False)
+    called = {}
+
+    async def _fake_myposts(update, context):
+        called["ok"] = True
+
+    # handle_search_action 内部是函数级 import，patch 源头即可。
+    monkeypatch.setattr("handlers.search_handlers.get_my_posts", _fake_myposts)
+
+    update, query = _callback_update("search_myposts")
+    await handle_search_action(update, MagicMock(user_data={}))
+
+    assert called.get("ok"), "我的投稿不应被搜索开关拦下"
+    query.edit_message_text.assert_not_awaited()
+
+
+@pytest.mark.asyncio
+async def test_tag_search_callback_when_disabled(monkeypatch):
+    """标签搜索回调关闭时给提示，不去取搜索引擎。"""
+    monkeypatch.setattr("config.settings.SEARCH_ENABLED", False)
+    update, query = _callback_update("tag_search_python")
+
+    await handle_tag_search(update, MagicMock(user_data={}))
+
+    query.edit_message_text.assert_awaited_once()
+    assert query.edit_message_text.await_args.args[0] == SEARCH_DISABLED_MESSAGE
+
+
+@pytest.mark.asyncio
+async def test_search_input_exits_mode_when_disabled(monkeypatch):
+    """开关在用户进入搜索模式后才关闭时：提示并退出搜索模式，避免卡住。"""
+    monkeypatch.setattr("config.settings.SEARCH_ENABLED", False)
+    update = MagicMock()
+    update.callback_query = None
+    update.message = AsyncMock()
+    update.message.text = "python"
+    update.message.chat.type = "private"
+    update.channel_post = None
+    update.edited_channel_post = None
+    context = MagicMock()
+    context.user_data = {"search_mode": "fulltext"}
+
+    await handle_search_input(update, context)
+
+    assert context.user_data["search_mode"] is None, "必须退出搜索输入模式"
+    update.message.reply_text.assert_awaited_once()
+    assert update.message.reply_text.await_args.args[0] == SEARCH_DISABLED_MESSAGE