mirror of
https://github.com/yshtcn/ServerChanPush2TelegramBot.git
synced 2025-12-13 17:50:22 +08:00
解决重复发送
This commit is contained in:
parent
6b5457bb86
commit
3a4c7c80a5
@ -243,17 +243,12 @@ def index():
|
|||||||
success, _ = send_telegram_message(msg['bot_id'], msg['chat_id'], msg['title'], msg['desp'], msg.get('url'))
|
success, _ = send_telegram_message(msg['bot_id'], msg['chat_id'], msg['title'], msg['desp'], msg.get('url'))
|
||||||
if not success:
|
if not success:
|
||||||
new_pending_messages.append(msg)
|
new_pending_messages.append(msg)
|
||||||
# 将失败的消息重新放在队尾
|
# 更新待发送消息列表,只包含失败的消息
|
||||||
new_pending_messages.extend(pending_messages)
|
|
||||||
write_pending_messages(new_pending_messages)
|
write_pending_messages(new_pending_messages)
|
||||||
return jsonify({"ok": "re-sent pending messages", "pending_messages_count": pending_count, "remaining_pending_messages_count": len(new_pending_messages)}), 200
|
return jsonify({"ok": "re-sent pending messages", "pending_messages_count": pending_count, "remaining_pending_messages_count": len(new_pending_messages)}), 200
|
||||||
else:
|
else:
|
||||||
return jsonify({"ok": "no pending messages to re-send", "pending_messages_count": pending_count}), 200
|
return jsonify({"ok": "no pending messages to re-send", "pending_messages_count": pending_count}), 200
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# 原始的消息发送逻辑
|
# 原始的消息发送逻辑
|
||||||
pending_messages = read_pending_messages()
|
pending_messages = read_pending_messages()
|
||||||
|
|
||||||
@ -265,8 +260,7 @@ def index():
|
|||||||
success, _ = send_telegram_message(msg['bot_id'], msg['chat_id'], msg['title'], msg['desp'], msg.get('url'))
|
success, _ = send_telegram_message(msg['bot_id'], msg['chat_id'], msg['title'], msg['desp'], msg.get('url'))
|
||||||
if not success:
|
if not success:
|
||||||
new_pending_messages.append(msg)
|
new_pending_messages.append(msg)
|
||||||
# 将失败的消息重新放在队尾
|
# 更新待发送消息列表,只包含失败的消息
|
||||||
new_pending_messages.extend(pending_messages)
|
|
||||||
write_pending_messages(new_pending_messages)
|
write_pending_messages(new_pending_messages)
|
||||||
return jsonify(response), 200
|
return jsonify(response), 200
|
||||||
else:
|
else:
|
||||||
@ -289,4 +283,5 @@ def index():
|
|||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
config = load_config()
|
config = load_config()
|
||||||
port = config[0].get("port", 5000)
|
port = config[0].get("port", 5000)
|
||||||
app.run(host='0.0.0.0', port=port)
|
app.run(host='0.0.0.0', port=port)
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user