Update app.py

app.py

@@ -92,26 +92,26 @@ def save_data_to_webdav():
     try:
         data = {
             'chatHistories': chatHistories,
-            'GROUP_SETTINGS': GROUP_SETTINGS,
-            'USER_SETTINGS': USER_SETTINGS,
+            'GROUP_SETTINGS': {str(k): v for k, v in GROUP_SETTINGS.items()},
+            'USER_SETTINGS': {str(k): v for k, v in USER_SETTINGS.items()},
             '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()} 
+                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, indent=4)
-        
+
         response = requests.put(
-            f"{WEBDAV_URL}/tg_bot/bot_data.json", 
-            data=json_data, 
+            f"{WEBDAV_URL}/tg_bot/bot_data.json",
+            data=json_data,
             auth=HTTPBasicAuth(WEBDAV_USERNAME, WEBDAV_PASSWORD),
             timeout=30
         )
-        
+
         if response.status_code in [200, 201, 204]:
             print(f"数据已成功保存到WebDAV: {datetime.now()}")
         else:
@@ -121,24 +121,25 @@ def save_data_to_webdav():
 
 def load_data_from_webdav():
     global chatHistories, GROUP_SETTINGS, USER_SETTINGS, USER_LAST_ACTIVE, GROUP_ACTIVE_USERS, GROUP_INFO, BANNED_USERS
-    
+
     print(f"开始从WebDAV加载数据: {datetime.now()}")
     try:
-        response = requests.get(f"{WEBDAV_URL}/tg_bot/bot_data.json", 
+        response = requests.get(f"{WEBDAV_URL}/tg_bot/bot_data.json",
                                 auth=HTTPBasicAuth(WEBDAV_USERNAME, WEBDAV_PASSWORD),
                                 timeout=30)
-        
+
         if response.status_code == 200:
             data = json.loads(response.text)
-            
+
             chatHistories = data['chatHistories']
-            GROUP_SETTINGS = {int(k): v for k, v in data['GROUP_SETTINGS'].items()}
-            USER_SETTINGS = {int(k): v for k, v in data['USER_SETTINGS'].items()}
-            USER_LAST_ACTIVE = {int(k): datetime.fromisoformat(v) for k, v in data['USER_LAST_ACTIVE'].items()}
-            GROUP_ACTIVE_USERS = {int(k): set(v) for k, v in data['GROUP_ACTIVE_USERS'].items()}
-            GROUP_INFO = {int(k): {**v, 'last_active': datetime.fromisoformat(v['last_active'])} for k, v in data['GROUP_INFO'].items()}
-            BANNED_USERS = {int(k): datetime.fromisoformat(v) for k, v in data['BANNED_USERS'].items()}
-            
+            GROUP_SETTINGS = {int(k): v for k, v in data.get('GROUP_SETTINGS', {}).items()}
+            USER_SETTINGS = {int(k): v for k, v in data.get('USER_SETTINGS', {}).items()}
+            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()}
+
+
             print(f"数据已从WebDAV成功加载: {datetime.now()}")
         else:
             print(f"从WebDAV加载数据失败: {response.status_code}, {response.text}")
@@ -146,6 +147,8 @@ def load_data_from_webdav():
         print(f"加载数据时发生错误: {e}")
         print("使用初始值")
 
+
+
 def periodic_save():
     print("定期保存线程已启动")
     while True:
@@ -599,8 +602,9 @@ async def banUser(chatId, userId):
 async def unbanUser(chatId, userId):
     if userId in BANNED_USERS:
         del BANNED_USERS[userId]
+        
         await sendTelegramMessage(chatId, f"用户 {userId} 已被解禁。")
         print(f"用户 {userId} 在群组 {chatId} 中被解禁。")
 
 if __name__ == '__main__':
-    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)))