From d9bf2b57a51bb4677870d05e71e9b9a2b8cf9445 Mon Sep 17 00:00:00 2001
From: Christian Hagenest <mail@hagenest.dev>
Date: Mon, 8 Jul 2024 14:33:23 +0200
Subject: [PATCH] rename dir to vmail_basedir

---
 chatmaild/src/chatmaild/rm_accounts.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/chatmaild/src/chatmaild/rm_accounts.py b/chatmaild/src/chatmaild/rm_accounts.py
index c8c870fd..ec5f31c1 100644
--- a/chatmaild/src/chatmaild/rm_accounts.py
+++ b/chatmaild/src/chatmaild/rm_accounts.py
@@ -22,9 +22,8 @@ def remove_users(db: Database, cutoff_date: int):
         conn.execute(delete_query, (cutoff_date))
 
 
-def remove_user_data(db: Database, cutoff_date: int, dir: Path):
+def remove_user_data(db: Database, cutoff_date: int, vmail_basedir: Path):
     """Collects all users where last_login < cutoff_date and deletes corresponding directories."""
-    db.connect()
 
     with db.write_transaction() as conn:
         select_query = "SELECT user FROM users WHERE last_login <?"
@@ -32,7 +31,7 @@ def remove_user_data(db: Database, cutoff_date: int, dir: Path):
         usernames = cursor.fetchall()
 
         for username in usernames:
-            user_dir = dir / username[0]
+            user_dir = vmail_basedir / username[0]
             if user_dir.exists() and user_dir.is_dir():
                 shutil.rmtree(user_dir)
                 print(f"Deleted directory: {user_dir}")