Update app.py

app.py

@@ -524,38 +524,46 @@ async def unbanUser(chatId, userId):
         await sendTelegramMessage(chatId, f"用户 {userId} 已被解禁。")
         print(f"用户 {userId} 在群组 {chatId} 中被解禁。")
 
+async def unbanUser(chatId, userId):
+    if userId in BANNED_USERS:
+        del BANNED_USERS[userId]
+        await sendTelegramMessage(chatId, f"用户 {userId} 已被解禁。")
+        print(f"用户 {userId} 在群组 {chatId} 中被解禁。")
+
 def webdav_upload(filename, data):
     url = urljoin(WEBDAV_URL, f"{WEBDAV_DIR}{filename}")
-    headers = {'Content-Type': 'application/json'}
     
     try:
         #尝试创建目录
         dir_url = urljoin(WEBDAV_URL, f"{WEBDAV_DIR}")
-        response = requests.request('MKCOL', dir_url, auth=(WEBDAV_USERNAME, WEBDAV_PASSWORD))
-        if response.status_code == 201:
-            print(f"WebDAV 目录创建成功: {WEBDAV_DIR}")
-        elif response.status_code == 405:
+        subprocess.run(['curl', '-X', 'MKCOL', '-u', f'{WEBDAV_USERNAME}:{WEBDAV_PASSWORD}', dir_url], check=True, capture_output=True)
+        print(f"WebDAV 目录创建成功: {WEBDAV_DIR}")
+    except subprocess.CalledProcessError as e:
+        if b'405' in e.stderr:
             print(f"WebDAV 目录已存在: {WEBDAV_DIR}")
-        elif response.status_code != 409:
-            response.raise_for_status()
+        else:
+            print(f"WebDAV 目录创建失败: {WEBDAV_DIR}, {e.stderr.decode()}")
+            return
 
-        # 直接尝试PUT上传文件
-        response = requests.put(url, auth=(WEBDAV_USERNAME, WEBDAV_PASSWORD), data=json.dumps(data, default=str), headers=headers)
-        response.raise_for_status()
+    try:
+        # 上传文件
+        json_data = json.dumps(data, default=str)
+        process = subprocess.run(['curl', '-X', 'PUT', '-u', f'{WEBDAV_USERNAME}:{WEBDAV_PASSWORD}', '-H', 'Content-Type: application/json', '--data', json_data, url], check=True, capture_output=True)
         print(f"WebDAV 上传成功: {filename}")
-
-    except requests.exceptions.RequestException as e:
-        print(f"WebDAV 上传失败: {filename}, {e}")
+    except subprocess.CalledProcessError as e:
+        print(f"WebDAV 上传失败: {filename}, {e.stderr.decode()}")
 
 def webdav_download(filename):
     url = urljoin(WEBDAV_URL, f"{WEBDAV_DIR}{filename}")
     try:
-        response = requests.get(url, auth=(WEBDAV_USERNAME, WEBDAV_PASSWORD))
-        response.raise_for_status()
+        process = subprocess.run(['curl', '-u', f'{WEBDAV_USERNAME}:{WEBDAV_PASSWORD}', '-H', 'Accept: application/json', url], capture_output=True, check=True)
         print(f"WebDAV 下载成功: {filename}")
-        return response.json()
-    except requests.exceptions.RequestException as e:
-        print(f"WebDAV 下载失败: {filename}, {e}")
+        if process.stdout:
+            return json.loads(process.stdout.decode())
+        else:
+             return None
+    except subprocess.CalledProcessError as e:
+        print(f"WebDAV 下载失败: {filename}, {e.stderr.decode()}")
         return None
 
 def sync_data_to_webdav():
@@ -570,7 +578,7 @@ def sync_data_to_webdav():
             webdav_upload('BANNED_USERS.json', BANNED_USERS)
         except Exception as e:
             print(f"WebDAV 同步失败: {e}")
-        time.sleep(10)
+        time.sleep(60)
 
 def load_data_from_webdav():
     global chatHistories, GROUP_SETTINGS, USER_SETTINGS, USER_LAST_ACTIVE, GROUP_ACTIVE_USERS, GROUP_INFO, BANNED_USERS