GithubBackup/MoviePilot
1
0
Fork 0
mirror of https://github.com/jxxghp/MoviePilot.git synced 2026-09-07 00:16:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix:更新Telegram解析模式为MarkdownV2；Telegram发送的内容按 Telegram V2 规则转义特殊字符

Browse Source
This commit is contained in:
noone
2025-09-24 14:14:11 +08:00
parent b6720a19f7
commit 765fb9c05f
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/modules/telegram/telegram.py
+18 -11
View File
@@ -31,7 +31,8 @@ class Telegram:
_callback_handlers: Dict[str, Callable] = {} # 存储回调处理器 _callback_handlers: Dict[str, Callable] = {} # 存储回调处理器
_user_chat_mapping: Dict[str, str] = {} # userid -> chat_id mapping for reply targeting _user_chat_mapping: Dict[str, str] = {} # userid -> chat_id mapping for reply targeting
_bot_username: Optional[str] = None # Bot username for mention detection _bot_username: Optional[str] = None # Bot username for mention detection
_escape_chars = r'_*[]()~`>#+-=|{}.!' # Telegram MarkdownV2
_markdown_escape_pattern = re.compile(f'([{re.escape(_escape_chars)}])') #Telegram MarkdownV2 规则转义特殊字符正则pattern
def __init__(self, TELEGRAM_TOKEN: Optional[str] = None, TELEGRAM_CHAT_ID: Optional[str] = None, **kwargs): def __init__(self, TELEGRAM_TOKEN: Optional[str] = None, TELEGRAM_CHAT_ID: Optional[str] = None, **kwargs):
""" """
初始化参数 初始化参数
@@ -52,7 +53,7 @@ class Telegram:
else: else:
apihelper.proxy = settings.PROXY apihelper.proxy = settings.PROXY
# bot # bot
_bot = telebot.TeleBot(self._telegram_token, parse_mode="Markdown") _bot = telebot.TeleBot(self._telegram_token, parse_mode="MarkdownV2")
# 记录句柄 # 记录句柄
self._bot = _bot self._bot = _bot
# 获取并存储bot用户名用于@检测 # 获取并存储bot用户名用于@检测
@@ -238,7 +239,7 @@ class Telegram:
try: try:
if text: if text:
# 对text进行Markdown特殊字符转义 # 对text进行Markdown特殊字符转义
text = re.sub(r"([_`])", r"\\\1", text) text = self.escape_markdown(text)
caption = f"*{title}*\n{text}" caption = f"*{title}*\n{text}"
else: else:
caption = f"*{title}*" caption = f"*{title}*"
@@ -499,7 +500,7 @@ class Telegram:
if image: if image:
# 如果有图片，使用edit_message_media # 如果有图片，使用edit_message_media
media = InputMediaPhoto(media=image, caption=text, parse_mode="Markdown") media = InputMediaPhoto(media=image, caption=text, parse_mode="MarkdownV2")
self._bot.edit_message_media( self._bot.edit_message_media(
chat_id=chat_id, chat_id=chat_id,
message_id=message_id, message_id=message_id,
@@ -512,7 +513,7 @@ class Telegram:
chat_id=chat_id, chat_id=chat_id,
message_id=message_id, message_id=message_id,
text=text, text=text,
parse_mode="Markdown", parse_mode="MarkdownV2",
reply_markup=reply_markup reply_markup=reply_markup
) )
return True return True
@@ -541,8 +542,8 @@ class Telegram:
# 发送图片到Telegram # 发送图片到Telegram
ret = self._bot.send_photo(chat_id=userid or self._telegram_chat_id, ret = self._bot.send_photo(chat_id=userid or self._telegram_chat_id,
photo=photo, photo=photo,
caption=caption, caption=self.escape_markdown(caption),
parse_mode="Markdown", parse_mode="MarkdownV2",
reply_markup=reply_markup) reply_markup=reply_markup)
if ret is None: if ret is None:
raise RetryException("发送图片消息失败") raise RetryException("发送图片消息失败")
@@ -552,13 +553,13 @@ class Telegram:
if len(caption) > 4095: if len(caption) > 4095:
for i in range(0, len(caption), 4095): for i in range(0, len(caption), 4095):
ret = self._bot.send_message(chat_id=userid or self._telegram_chat_id, ret = self._bot.send_message(chat_id=userid or self._telegram_chat_id,
text=caption[i:i + 4095], text=self.escape_markdown(caption[i:i + 4095]),
parse_mode="Markdown", parse_mode="MarkdownV2",
reply_markup=reply_markup if i == 0 else None) reply_markup=reply_markup if i == 0 else None)
else: else:
ret = self._bot.send_message(chat_id=userid or self._telegram_chat_id, ret = self._bot.send_message(chat_id=userid or self._telegram_chat_id,
text=caption, text=self.escape_markdown(caption),
parse_mode="Markdown", parse_mode="MarkdownV2",
reply_markup=reply_markup) reply_markup=reply_markup)
if ret is None: if ret is None:
raise RetryException("发送文本消息失败") raise RetryException("发送文本消息失败")
@@ -597,3 +598,9 @@ class Telegram:
self._bot.stop_polling() self._bot.stop_polling()
self._polling_thread.join() self._polling_thread.join()
logger.info("Telegram消息接收服务已停止") logger.info("Telegram消息接收服务已停止")
def escape_markdown(self, text: str) -> str:
# 按 Telegram MarkdownV2 规则转义特殊字符
if not isinstance(text, str):
return str(text) if text is not None else ""
return self._markdown_escape_pattern.sub(r'\\\1', text)