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

修复了一些bug，是目前服务器的稳定版本

Browse Source
This commit is contained in:
yshtcn 2023-09-05 21:43:17 +08:00
parent 97d0699efc
commit 8da6ebe1f5
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ServerChanPush2TelegramBot.py
View File

@ -63,36 +63,35 @@ def write_pending_messages(messages):
# 发送 Telegram 消息 # 发送 Telegram 消息
def send_telegram_message(bot_id, chat_id, title, desp=None, url=None): def send_telegram_message(bot_id, chat_id, title, desp=None, url=None):
# 重新读取配置文件 # 重新读取配置文件
all_bots_config = load_config() all_bots_config = load_config()
# 用于标记是否找到匹配的关键词 # 用于标记是否找到匹配的关键词
found = False found = False
# 遍历所有主 bot_id 的配置 # 遍历所有主 bot_id 的配置
for config in all_bots_config: for config in all_bots_config:
main_bot_id = config['main_bot_id'] main_bot_id = config['main_bot_id']
main_chat_id = config.get('main_chat_id', '') # 如果没有main_chat_id，默认为空字符串
sub_bots = config['sub_bots'] sub_bots = config['sub_bots']
# 如果传入的 bot_id 和 chat_id 匹配某个主 bot_id 和主 chat_id
# 如果传入的 bot_id 匹配某个主 bot_id if bot_id == main_bot_id and chat_id == main_chat_id:
if bot_id == main_bot_id: # 检查关键词，如果匹配则替换 bot_id 和 chat_id
# 检查关键词，如果匹配则替换 bot_id
for sub_bot in sub_bots: for sub_bot in sub_bots:
for keyword in sub_bot['keywords']: for keyword in sub_bot['keywords']:
keyword_decode = keyword.decode('utf-8') if isinstance(keyword, bytes) else keyword keyword_decode = keyword.decode('utf-8') if isinstance(keyword, bytes) else keyword
title_decode = title.decode('utf-8') if isinstance(title, bytes) else title title_decode = title.decode('utf-8') if isinstance(title, bytes) else title
if keyword_decode.lower() in title_decode.lower(): if keyword_decode.lower() in title_decode.lower():
bot_id = sub_bot['bot_id'] bot_id = sub_bot['bot_id']
chat_id = sub_bot['chat_id'] # 新增：替换 chat_id
found = True found = True
break break
if found: if found:
break break
# 一旦找到匹配的主 bot_id，就跳出循环 # 一旦找到匹配的主 bot_id 和主 chat_id，就跳出循环
if found: if found:
break break
api_url = f"https://api.telegram.org/bot{bot_id}/sendMessage" api_url = f"https://api.telegram.org/bot{bot_id}/sendMessage"
proxies = { proxies = {
'http': 'http://127.0.0.1:7890', 'http': 'http://127.0.0.1:7890',
@ -158,6 +157,7 @@ def index():
#unescaped_desp = json.loads(f'"{escaped_desp}"') #unescaped_desp = json.loads(f'"{escaped_desp}"')
bot_id = request.args.get('bot_id') or (received_data.get('bot_id') if received_data else None) bot_id = request.args.get('bot_id') or (received_data.get('bot_id') if received_data else None)
chat_id = request.args.get('chat_id') or (received_data.get('chat_id') if received_data else None) chat_id = request.args.get('chat_id') or (received_data.get('chat_id') if received_data else None)
title = request.args.get('title') or (received_data.get('title') if received_data else None) title = request.args.get('title') or (received_data.get('title') if received_data else None)
@ -177,7 +177,11 @@ def index():
# 如果 error_list 不为空，返回错误信息和 400 状态码 # 如果 error_list 不为空，返回错误信息和 400 状态码
if error_list: if error_list:
TestStatus=request.args.get('TestStatus') or (received_data.get('TestStatus') if received_data else None)
if TestStatus is None:
return jsonify({"error": error_list}), 400 return jsonify({"error": error_list}), 400
else:
return jsonify({"ok": "the test passed"}), 200
pending_messages = read_pending_messages() pending_messages = read_pending_messages()
@ -194,6 +198,12 @@ def index():
write_pending_messages(new_pending_messages) write_pending_messages(new_pending_messages)
return jsonify(response), 200 return jsonify(response), 200
else: else:
if "【This is a delayed message】" not in desp:
if desp is None:
desp = f"【This is a delayed message】"
else:
desp = desp + f"\n\n【This is a delayed message】"
pending_messages.append({ pending_messages.append({
'bot_id': bot_id, 'bot_id': bot_id,
'chat_id': chat_id, 'chat_id': chat_id,