功能完善

- 实现发送队列持久化
- bottoken配置分离

Diary Assistant.py

@@ -5,6 +5,8 @@ import json
 import requests
 import time
 from datetime import datetime
+import os
+import json
 
 # 配置代理
 proxies = {
@@ -12,17 +14,46 @@ proxies = {
     'https': 'http://127.0.0.1:7890'
 }
 
-# Bot Token
+TOKEN = None
-TOKEN = "demo"
+
+# 示范Token
+example_token = "Your_Token_Here"
+
+# 定义配置文件名
+config_filename = "bot_config.json"
+
+# 检查配置文件是否存在
+config_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), config_filename)
+
+if os.path.exists(config_path):
+    # 读取配置文件
+    with open(config_path, 'r') as f:
+        config = json.load(f)
+    TOKEN = config.get("TOKEN", "")
+    
+    # 检查Token是否已设置
+    if TOKEN == example_token:
+        print("Please update your bot token in the config file.")
+        exit(1)
+else:
+    # 如果配置文件不存在，则创建一个新的配置文件并写入示范Token
+    config = {"TOKEN": example_token}
+    with open(config_path, 'w') as f:
+        json.dump(config, f)
+    print(f"Config file created at {config_path}. Please update your bot token.")
+    exit(1)
+
 URL = f"https://api.telegram.org/bot{TOKEN}/"
 
 # 尝试从文件中加载已有数据
 try:
     with open('user_data.json', 'r') as f:
         user_data = json.load(f)
-except FileNotFoundError:
+except (FileNotFoundError, json.JSONDecodeError):
     user_data = {}
 
+
+
 # 尝试从文件中加载黑名单
 try:
     with open('blacklist.json', 'r') as f:
@@ -30,6 +61,7 @@ try:
 except FileNotFoundError:
     blacklist = []
 
+
 # 获取更新
 def get_updates(offset=None):
     try:
@@ -44,18 +76,54 @@ def get_updates(offset=None):
 # 发送消息
 def send_message(chat_id, text):
     try:
-        url = URL + "sendMessage"
+        # 尝试从文件中加载消息队列
-        params = {'chat_id': chat_id, 'text': text}
+        try:
-        r = requests.get(url, params=params, proxies=proxies)
+            with open('message_queue.json', 'r') as f:
+                message_queue = json.load(f)
+        except FileNotFoundError:
+            message_queue = []
+        
+        # 将新消息添加到队列
+        message_queue.append({'chat_id': chat_id, 'text': text})
+        
+        # 将更新后的消息队列保存回文件
+        with open('message_queue.json', 'w') as f:
+            json.dump(message_queue, f)
     except Exception as e:
-        print(f"Error sending message: {e}")
+        print(f"Error queuing message: {e}")
+
+def process_message_queue():
+    # 尝试从文件中加载消息队列
+    try:
+        with open('message_queue.json', 'r') as f:
+            message_queue = json.load(f)
+    except FileNotFoundError:
+        message_queue = []
+    
+    # 遍历消息队列，尝试发送消息
+    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)
+            if r.status_code == 200:
+                message_queue.remove(message)
+        except Exception as e:
+            print(f"Error sending message: {e}")
+    
+    # 将更新后的消息队列保存回文件
+    with open('message_queue.json', 'w') as f:
+        json.dump(message_queue, f)
+
+
 
 # 主程序逻辑
 def main():
     print("Program started")  # Debugging line
     last_update_id = None
-    while True:
+    while True:     
-        
 
         print("Checking for updates...")  # Debugging line
         updates = get_updates(last_update_id)
@@ -73,34 +141,44 @@ def main():
                 message_text_with_datetime = f"【记录时间：{current_datetime}】\n{message_text}"
 
                 # 创建唯一标识符
-                unique_id = f"{chat_id}_{message_id}"
+                unique_id = f"{TOKEN}_{chat_id}_{message_id}"            
-                
+
-                # 初始化用户数据
+            
-                if chat_id not in user_data:
+
-                    user_data[chat_id] = []
-                
-                # 检查黑名单
                 if unique_id not in blacklist:
                     # 处理“done”命令
-                    if message_text.lower() == "todaydone":
+                    if message_text.lower() == "/todaydone":
                         send_message(chat_id, "\n".join(user_data[chat_id]))
                         user_data[chat_id] = []
                     else:
                         send_message(chat_id, f"{message_text_with_datetime}")
+                        if chat_id not in user_data:
+                            user_data[chat_id] = []
                         user_data[chat_id].append(message_text)
                         blacklist.append(unique_id)  # 添加到黑名单
+
+                    # 保存数据到文件
+                    with open('user_data.json', 'w') as f:
+                        json.dump(user_data, f)
+                    with open('blacklist.json', 'w') as f:
+                        json.dump(blacklist, f)
+
                 
                 # 保存数据到文件
                 with open('user_data.json', 'w') as f:
                     json.dump(user_data, f)
                 with open('blacklist.json', 'w') as f:
                     json.dump(blacklist, f)
+
+                process_message_queue()
         else:
+            print(f"{URL}Received updates: {updates}")
             print("Error or no updates; retrying in 5 seconds...")
             time.sleep(5)  # 等待5秒再重试
-
+        
+        
         # 每1分钟检查一次
-        time.sleep(30)
+        time.sleep(15)
 
 # 运行主函数
 if __name__ == '__main__':