From 63a134a37dc53eddc90bae8dafa0c748d26ae1fb Mon Sep 17 00:00:00 2001
From: yshtcn <k.yshtcn+github@gmail.com>
Date: Thu, 21 Sep 2023 18:57:36 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E6=8A=8Aget=E6=96=B9=E6=B3=95=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E6=95=B0=E6=8D=AE=E6=94=B9=E6=88=90=E4=BA=86post?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Diary Assistant.py | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/Diary Assistant.py b/Diary Assistant.py
index 2c7e25b..2d14570 100644
--- a/Diary Assistant.py	
+++ b/Diary Assistant.py	
@@ -68,7 +68,6 @@ def set_bot_commands():
     except Exception as err:
         return f"An error occurred: {err}"
 
-set_bot_commands()
 
 # 尝试从文件中加载黑名单
 try:
@@ -120,23 +119,28 @@ def process_message_queue():
             message_queue = json.load(f)
     except FileNotFoundError:
         message_queue = []
-    
+        
     # 遍历消息队列，尝试发送消息
+    remaining_messages = []
     for message in message_queue:
         chat_id = message['chat_id']
         text = message['text']
         try:
             url = URL + "sendMessage"
-            params = {'chat_id': chat_id, 'text': text}
-            r = requests.get(url, params=params, proxies=proxies)
+            payload = {'chat_id': chat_id, 'text': text}
+            r = requests.post(url, json=payload, proxies=proxies)
             if r.status_code == 200:
-                message_queue.remove(message)
+                continue
+            else:
+                remaining_messages.append(message)
         except Exception as e:
             print(f"Error sending message: {e}")
-    
-    # 将更新后的消息队列保存回文件
+            remaining_messages.append(message)
+
+    # 将更新后（或未成功发送的）消息队列保存回文件
     with open('message_queue.json', 'w') as f:
-        json.dump(message_queue, f)
+        json.dump(remaining_messages, f)
+
 
 
 # 主程序逻辑