Update app.py

app.py

@@ -83,6 +83,66 @@ BAN_TRIGGER_PHRASES = [
 ]
 UNBAN_PHRASE = "close username"
 
+WEBDAV_URL = os.environ.get('WEBDAV_URL')
+WEBDAV_USERNAME = os.environ.get('WEBDAV_USERNAME')
+WEBDAV_PASSWORD = os.environ.get('WEBDAV_PASSWORD')
+
+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)
+    
+    response = requests.put(f"{WEBDAV_URL}/tg_bot/bot_data.json", 
+                            data=json_data, 
+                            auth=HTTPBasicAuth(WEBDAV_USERNAME, WEBDAV_PASSWORD))
+    
+    if response.status_code in [200, 201, 204]:
+        print("数据已保存到WebDAV")
+    else:
+        print(f"保存到WebDAV失败: {response.status_code}")
+
+def load_data_from_webdav():
+    global chatHistories, GROUP_SETTINGS, USER_SETTINGS, USER_LAST_ACTIVE, GROUP_ACTIVE_USERS, GROUP_INFO, BANNED_USERS
+    
+    response = requests.get(f"{WEBDAV_URL}/tg_bot/bot_data.json", 
+                            auth=HTTPBasicAuth(WEBDAV_USERNAME, WEBDAV_PASSWORD))
+    
+    if response.status_code == 200:
+        data = json.loads(response.text)
+        
+        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(10)  # 等待60秒
+        save_data_to_webdav()
+
+# 在程序启动时加载数据
+load_data_from_webdav()
+
+# 启动定期保存的线程
+save_thread = threading.Thread(target=periodic_save)
+save_thread.daemon = True
+save_thread.start()
+
 def make_telegram_request(method, data=None):
     url = f"https://api.telegram.org/bot{TELEGRAM_BOT_TOKEN}/{method}"
     if PHP_PROXY_URL:
@@ -475,65 +535,5 @@ async def unbanUser(chatId, userId):
         await sendTelegramMessage(chatId, f"用户 {userId} 已被解禁。")
         print(f"用户 {userId} 在群组 {chatId} 中被解禁。")
 
-WEBDAV_URL = os.environ.get('WEBDAV_URL')
-WEBDAV_USERNAME = os.environ.get('WEBDAV_USERNAME')
-WEBDAV_PASSWORD = os.environ.get('WEBDAV_PASSWORD')
-
-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)
-    
-    response = requests.put(f"{WEBDAV_URL}/tg_bot/bot_data.json", 
-                            data=json_data, 
-                            auth=HTTPBasicAuth(WEBDAV_USERNAME, WEBDAV_PASSWORD))
-    
-    if response.status_code in [200, 201, 204]:
-        print("数据已保存到WebDAV")
-    else:
-        print(f"保存到WebDAV失败: {response.status_code}")
-
-def load_data_from_webdav():
-    global chatHistories, GROUP_SETTINGS, USER_SETTINGS, USER_LAST_ACTIVE, GROUP_ACTIVE_USERS, GROUP_INFO, BANNED_USERS
-    
-    response = requests.get(f"{WEBDAV_URL}/tg_bot/bot_data.json", 
-                            auth=HTTPBasicAuth(WEBDAV_USERNAME, WEBDAV_PASSWORD))
-    
-    if response.status_code == 200:
-        data = json.loads(response.text)
-        
-        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__':
     app.run(host='0.0.0.0', port=int(os.environ.get('PORT', 7860)))