Update app.py

app.py

@@ -84,7 +84,6 @@ BAN_TRIGGER_PHRASES = [
     r"(?:AI|bot|机器人).*(?:真|真是|简直|太).*(?:垃圾|废物|没用|蠢|笨|傻|弱)",
 ]
 UNBAN_PHRASE = "close username"
-BACKUP_INTERVAL = 60  # 1分钟
 
 def make_telegram_request(method, data=None):
     url = f"https://api.telegram.org/bot{TELEGRAM_BOT_TOKEN}/{method}"
@@ -478,96 +477,73 @@ async def unbanUser(chatId, userId):
         await sendTelegramMessage(chatId, f"用户 {userId} 已被解禁。")
         print(f"用户 {userId} 在群组 {chatId} 中被解禁。")
 
-def backup_data():
-    data = {
-        'chatHistories': chatHistories,
-        'GROUP_SETTINGS': GROUP_SETTINGS,
-        'USER_SETTINGS': USER_SETTINGS,
-        'GROUP_INFO': GROUP_INFO,
-        'USER_LAST_ACTIVE': USER_LAST_ACTIVE,
-        'BANNED_USERS': BANNED_USERS,
-    }
+def webdav_upload(data, filename):
     json_data = json.dumps(data)
-    
-    timestamp = datetime.now().strftime("%Y%m%d%H%M%S")
-    filename = f"tg_bot/backup_{timestamp}.json"
-
+    webdav_path = f"{WEBDAV_URL}/tg_bot/{filename}"
     curl_command = [
         'curl',
-        '-k',
+        '-k',  # 忽略证书验证
         '-u', f'{WEBDAV_USERNAME}:{WEBDAV_PASSWORD}',
         '-X', 'PUT',
-        '-d', json_data,
-        f'{WEBDAV_URL}/{filename}'
+        '-H', 'Content-Type: application/json',
+        '--data', json_data,
+        webdav_path
     ]
-
     try:
-        process = subprocess.Popen(curl_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        stdout, stderr = process.communicate()
-        if process.returncode == 0:
-            print(f"备份成功，已上传到 {WEBDAV_URL}/{filename}")
-        else:
-            print(f"备份失败，curl 返回码: {process.returncode} 错误信息: {stderr.decode()}")
-    except Exception as e:
-        print(f"执行 curl 命令时发生错误: {e}")
+        subprocess.run(curl_command, check=True, capture_output=True)
+        print(f'数据已上传到 WebDAV: {filename}')
+    except subprocess.CalledProcessError as e:
+        print(f'上传到 WebDAV 失败 ({filename}): {e.stderr.decode()}')
 
-def load_data():
-    global chatHistories, GROUP_SETTINGS, USER_SETTINGS, GROUP_INFO, USER_LAST_ACTIVE, BANNED_USERS
-    
+def webdav_download(filename):
+    webdav_path = f"{WEBDAV_URL}/tg_bot/{filename}"
     curl_command = [
         'curl',
-        '-k',
+        '-k',  # 忽略证书验证
         '-u', f'{WEBDAV_USERNAME}:{WEBDAV_PASSWORD}',
-        f'{WEBDAV_URL}/tg_bot/'
+        '-s',  # 静默模式
+        webdav_path
     ]
-  
     try:
-        process = subprocess.Popen(curl_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        stdout, stderr = process.communicate()
-        if process.returncode == 0:
-           output = stdout.decode()
-           json_files = re.findall(r'backup_(\d+)\.json', output)
-           if json_files:
-              latest_file = sorted(json_files, reverse=True)[0]
-              filename = f"tg_bot/backup_{latest_file}.json"
-              download_command = [
-                  'curl',
-                  '-k',
-                  '-u', f'{WEBDAV_USERNAME}:{WEBDAV_PASSWORD}',
-                  f'{WEBDAV_URL}/{filename}'
-              ]
-              process = subprocess.Popen(download_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-              stdout, stderr = process.communicate()
-              if process.returncode == 0:
-                  try:
-                      data = json.loads(stdout.decode())
-                      chatHistories = data.get('chatHistories', {})
-                      GROUP_SETTINGS = data.get('GROUP_SETTINGS', {})
-                      USER_SETTINGS = data.get('USER_SETTINGS', {})
-                      GROUP_INFO = data.get('GROUP_INFO', {})
-                      USER_LAST_ACTIVE = data.get('USER_LAST_ACTIVE', {})
-                      BANNED_USERS = data.get('BANNED_USERS', {})
-                      print(f"从 {WEBDAV_URL}/{filename} 加载数据成功")
-                      return
-                  except json.JSONDecodeError:
-                      print(f"加载数据失败: {filename} JSON 解析错误")
-              else:
-                  print(f"下载文件失败，curl 返回码: {process.returncode} 错误信息: {stderr.decode()}")
-           else:
-              print("WebDAV 中未找到备份文件，初始化数据")
-        else:
-          print(f"列出文件失败，curl 返回码: {process.returncode} 错误信息: {stderr.decode()}")
-    except Exception as e:
-        print(f"执行 curl 命令时发生错误: {e}")
-
-def schedule_backup():
+        result = subprocess.run(curl_command, check=True, capture_output=True)
+        print(f'数据已从 WebDAV 下载: {filename}')
+        return json.loads(result.stdout.decode('utf-8'))
+    except subprocess.CalledProcessError as e:
+        print(f'从 WebDAV 下载失败 ({filename}): {e.stderr.decode()}')
+        return None
+    except json.JSONDecodeError as e:
+        print(f'解析 WebDAV 数据失败 ({filename}): {e}')
+        return None
+def save_data_to_webdav():
     while True:
-        backup_data()
-        time.sleep(BACKUP_INTERVAL)
+        webdav_upload(chatHistories, 'chat_histories.json')
+        webdav_upload(GROUP_SETTINGS, 'group_settings.json')
+        webdav_upload(USER_SETTINGS, 'user_settings.json')
+        webdav_upload(GROUP_INFO, 'group_info.json')
+        webdav_upload(BANNED_USERS, 'banned_users.json')
+        time.sleep(60)
+
+def load_data_from_webdav():
+  global chatHistories, GROUP_SETTINGS, USER_SETTINGS, GROUP_INFO, BANNED_USERS
+  chatHistories_data = webdav_download('chat_histories.json')
+  if chatHistories_data:
+    chatHistories = chatHistories_data
+  group_settings_data = webdav_download('group_settings.json')
+  if group_settings_data:
+    GROUP_SETTINGS = group_settings_data
+  user_settings_data = webdav_download('user_settings.json')
+  if user_settings_data:
+    USER_SETTINGS = user_settings_data
+  group_info_data = webdav_download('group_info.json')
+  if group_info_data:
+    GROUP_INFO = group_info_data
+  banned_users_data = webdav_download('banned_users.json')
+  if banned_users_data:
+    BANNED_USERS = banned_users_data
+
 
 if __name__ == '__main__':
-    load_data()
+    load_data_from_webdav()
     import threading
-    backup_thread = threading.Thread(target=schedule_backup, daemon=True)
-    backup_thread.start()
+    threading.Thread(target=save_data_to_webdav, daemon=True).start()
     app.run(host='0.0.0.0', port=int(os.environ.get('PORT', 7860)))