Update app.py

app.py

@@ -5,9 +5,6 @@ from flask import Flask, request, jsonify
 from datetime import datetime, timedelta
 import asyncio
 import re
-import webdavclient.client as wc # 修改这里
-import time
-import threading
 
 app = Flask(__name__)
 
@@ -16,11 +13,8 @@ AI_API_ENDPOINT = os.environ.get('AI_API_ENDPOINT')
 AI_API_KEY = os.environ.get('AI_API_KEY')
 AI_MODEL = os.environ.get('AI_MODEL')
 PHP_PROXY_URL = os.environ.get('PHP_PROXY_URL')
-WEBDAV_HOSTNAME = os.environ.get('WEBDAV_HOSTNAME')
-WEBDAV_LOGIN = os.environ.get('WEBDAV_LOGIN')
-WEBDAV_PASSWORD = os.environ.get('WEBDAV_PASSWORD')
 
-if not all([TELEGRAM_BOT_TOKEN, AI_API_ENDPOINT, AI_API_KEY, AI_MODEL, WEBDAV_HOSTNAME, WEBDAV_LOGIN, WEBDAV_PASSWORD]):
+if not all([TELEGRAM_BOT_TOKEN, AI_API_ENDPOINT, AI_API_KEY, AI_MODEL]):
     raise ValueError("请设置所有必要的环境变量")
 
 AI_API_HEADERS = {
@@ -86,53 +80,6 @@ BAN_TRIGGER_PHRASES = [
 ]
 UNBAN_PHRASE = "close username"
 
-webdav_options = {
- 'webdav_hostname': WEBDAV_HOSTNAME,
- 'webdav_login':    WEBDAV_LOGIN,
- 'webdav_password': WEBDAV_PASSWORD
-}
-client = wc.Client(webdav_options)
-
-def save_data_to_webdav():
-    data = {
-        'chatHistories': chatHistories,
-        'GROUP_SETTINGS': GROUP_SETTINGS,
-        'USER_SETTINGS': USER_SETTINGS,
-        'USER_LAST_ACTIVE': {str(k): v.isoformat() for k, v in USER_LAST_ACTIVE.items()},
-        'GROUP_ACTIVE_USERS': {str(k): list(v) for k, v in GROUP_ACTIVE_USERS.items()},
-        'GROUP_INFO': {str(k): {**v, 'last_active': v['last_active'].isoformat()} for k, v in GROUP_INFO.items()},
-        'BANNED_USERS': {str(k): v.isoformat() for k, v in BANNED_USERS.items()}
-    }
-    json_data = json.dumps(data)
-    try:
-        client.upload_to('/tg_bot/bot_data.json', json_data)
-    except Exception as e:
-         print(f"Error uploading data to WebDAV: {e}")
-
-def load_data_from_webdav():
-    global chatHistories, GROUP_SETTINGS, USER_SETTINGS, USER_LAST_ACTIVE, GROUP_ACTIVE_USERS, GROUP_INFO, BANNED_USERS
-    try:
-       if client.check('/tg_bot/bot_data.json'):
-          json_data = client.download('/tg_bot/bot_data.json')
-          data = json.loads(json_data)
-          chatHistories = data.get('chatHistories', {})
-          GROUP_SETTINGS = data.get('GROUP_SETTINGS', {})
-          USER_SETTINGS = data.get('USER_SETTINGS', {})
-          USER_LAST_ACTIVE = {int(k): datetime.fromisoformat(v) for k, v in data.get('USER_LAST_ACTIVE', {}).items()}
-          GROUP_ACTIVE_USERS = {int(k): set(v) for k, v in data.get('GROUP_ACTIVE_USERS', {}).items()}
-          GROUP_INFO = {int(k): {**v, 'last_active': datetime.fromisoformat(v['last_active'])} for k, v in data.get('GROUP_INFO', {}).items()}
-          BANNED_USERS = {int(k): datetime.fromisoformat(v) for k, v in data.get('BANNED_USERS', {}).items()}
-       else:
-           print("No existing data found on WebDAV. Initializing with empty data.")
-    except Exception as e:
-         print(f"Error loading data from WebDAV: {e}")
-
-def periodic_save():
-    while True:
-        time.sleep(60)  # 等待1分钟
-        save_data_to_webdav()
-        print("Data saved to WebDAV")
-
 def make_telegram_request(method, data=None):
     url = f"https://api.telegram.org/bot{TELEGRAM_BOT_TOKEN}/{method}"
     if PHP_PROXY_URL:
@@ -525,9 +472,64 @@ async def unbanUser(chatId, userId):
         await sendTelegramMessage(chatId, f"用户 {userId} 已被解禁。")
         print(f"用户 {userId} 在群组 {chatId} 中被解禁。")
 
+WEBDAV_HOSTNAME = os.environ.get('WEBDAV_HOSTNAME')
+WEBDAV_USERNAME = os.environ.get('WEBDAV_USERNAME')
+WEBDAV_PASSWORD = os.environ.get('WEBDAV_PASSWORD')
+
+webdav_options = {
+ 'webdav_hostname': WEBDAV_HOSTNAME,
+ 'webdav_login':    WEBDAV_USERNAME,
+ 'webdav_password': WEBDAV_PASSWORD
+}
+
+webdav_client = wc.Client(webdav_options)
+
+def save_data_to_webdav():
+    data = {
+        'chatHistories': chatHistories,
+        'GROUP_SETTINGS': GROUP_SETTINGS,
+        'USER_SETTINGS': USER_SETTINGS,
+        'USER_LAST_ACTIVE': {k: v.isoformat() for k, v in USER_LAST_ACTIVE.items()},
+        'GROUP_ACTIVE_USERS': {k: list(v) for k, v in GROUP_ACTIVE_USERS.items()},
+        'GROUP_INFO': {k: {**v, 'last_active': v['last_active'].isoformat()} for k, v in GROUP_INFO.items()},
+        'BANNED_USERS': {k: v.isoformat() for k, v in BANNED_USERS.items()}
+    }
+    
+    json_data = json.dumps(data)
+    webdav_client.upload_content(json_data, '/tg_bot/bot_data.json')
+    print("数据已保存到WebDAV")
+
+def load_data_from_webdav():
+    global chatHistories, GROUP_SETTINGS, USER_SETTINGS, USER_LAST_ACTIVE, GROUP_ACTIVE_USERS, GROUP_INFO, BANNED_USERS
+    
+    if webdav_client.check('/tg_bot/bot_data.json'):
+        json_data = webdav_client.download_content('/tg_bot/bot_data.json')
+        data = json.loads(json_data)
+        
+        chatHistories = data['chatHistories']
+        GROUP_SETTINGS = data['GROUP_SETTINGS']
+        USER_SETTINGS = data['USER_SETTINGS']
+        USER_LAST_ACTIVE = {k: datetime.fromisoformat(v) for k, v in data['USER_LAST_ACTIVE'].items()}
+        GROUP_ACTIVE_USERS = {k: set(v) for k, v in data['GROUP_ACTIVE_USERS'].items()}
+        GROUP_INFO = {k: {**v, 'last_active': datetime.fromisoformat(v['last_active'])} for k, v in data['GROUP_INFO'].items()}
+        BANNED_USERS = {k: datetime.fromisoformat(v) for k, v in data['BANNED_USERS'].items()}
+        
+        print("数据已从WebDAV加载")
+    else:
+        print("WebDAV中没有找到数据,使用初始值")
+
+def periodic_save():
+    while True:
+        time.sleep(60)  # 等待60秒
+        save_data_to_webdav()
+
+# 在程序启动时加载数据
+load_data_from_webdav()
+
+# 启动定期保存的线程
+save_thread = threading.Thread(target=periodic_save)
+save_thread.daemon = True
+save_thread.start()
+
 if __name__ == '__main__':
-    load_data_from_webdav()
-    save_thread = threading.Thread(target=periodic_save)
-    save_thread.daemon = True
-    save_thread.start()
-    app.run(host='0.0.0.0', port=int(os.environ.get('PORT', 7860)))
+    app.run(host='0.0.0.0', port=int(os.environ.get('PORT', 7860)))