Allow to select wether we want to send the deletion email when deleti…

…ng a mailbox
simple-login · Nov 28, 2024 · 9cc6f33 · 9cc6f33
1 parent f1b2edf
commit 9cc6f33
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/app/mailbox_utils.py b/app/mailbox_utils.py
@@ -104,7 +104,10 @@ def create_mailbox(
 
 
 def delete_mailbox(
-    user: User, mailbox_id: int, transfer_mailbox_id: Optional[int]
+    user: User,
+    mailbox_id: int,
+    transfer_mailbox_id: Optional[int],
+    send_mail: bool = True,
 ) -> Mailbox:
     mailbox = Mailbox.get(mailbox_id)
 
@@ -150,6 +153,7 @@ def delete_mailbox(
             "transfer_mailbox_id": transfer_mailbox_id
             if transfer_mailbox_id and transfer_mailbox_id > 0
             else None,
+            "send_mail": send_mail,
         },
         run_at=arrow.now(),
         commit=True,

diff --git a/job_runner.py b/job_runner.py
@@ -164,6 +164,8 @@ def delete_mailbox_job(job: Job):
     Session.commit()
     LOG.d("Mailbox %s %s deleted", mailbox_id, mailbox_email)
 
+    if not job.payload.get("send_mail", True):
+        return
     if alias_transferred_to:
         send_email(
             user.email,