yshtcn/ServerChanPush2TelegramBot
1
0
Fork 0
mirror of https://github.com/yshtcn/ServerChanPush2TelegramBot.git synced 2025-12-14 02:00:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9 from yshtcn/main

Browse Source 
2023.9.8.2
This commit is contained in:
yshtcn 2023-09-08 16:49:19 +08:00 committed by GitHub
commit 037d036a02
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ServerChanPush2TelegramBot.py
View File

@ -119,7 +119,7 @@ def send_telegram_message(bot_id, chat_id, title, desp=None, url=None):
text = title # 初始化 text 为 title text = title # 初始化 text 为 title
text += f"\n\n{(desp.split(delimiter)[0] if delimiter and desp else desp) if desp else ''}" text += f"\n\n{(desp.split(delimiter)[0] if delimiter and desp else desp) if desp else ''}"
text =text.rstrip()
# 使用正则表达式来识别受影响的链接 # 使用正则表达式来识别受影响的链接
@ -131,7 +131,7 @@ def send_telegram_message(bot_id, chat_id, title, desp=None, url=None):
text = text.replace(affected_url, corrected_url) text = text.replace(affected_url, corrected_url)
if url: # 如果有 url，添加到 text if url: # 如果有 url，添加到 text
text += f"\n\n[详情]({url})" text += f"\n\n<a href=\"{url}\">详情：</a>"
text += f"{url}" # 直接添加 URL，Telegram 会自动处理预览 text += f"{url}" # 直接添加 URL，Telegram 会自动处理预览
text=unescape_url(text) text=unescape_url(text)
@ -140,17 +140,17 @@ def send_telegram_message(bot_id, chat_id, title, desp=None, url=None):
payload = { payload = {
'chat_id': chat_id, 'chat_id': chat_id,
'text': text, 'text': text,
'parse_mode': 'markdown', 'parse_mode': 'HTML',
'disable_web_page_preview': False # 启用网页预览 'disable_web_page_preview': False # 启用网页预览
} }
try: try:
response = requests.post(api_url, data=payload, proxies=proxies, timeout=2) response = requests.post(api_url, data=payload, proxies=proxies, timeout=2)
logging.info(f"response: {response.text}")
if response.status_code == 200 and response.json().get("ok"): if response.status_code == 200 and response.json().get("ok"):
# 保存发送的请求数据 # 保存发送的请求数据
converted_sent_data = convert_str_gbk_to_utf8(str(payload)) converted_sent_data = convert_str_gbk_to_utf8(str(payload))
save_sent_data(api_url,converted_sent_data) save_sent_data(api_url,converted_sent_data)
return True, response.json() return True, response.json()
else: else:
return False, response.json() return False, response.json()
except requests.RequestException as e: except requests.RequestException as e: