From 1225b6ada14279adec3d61e13b0d55b5c0965f9d Mon Sep 17 00:00:00 2001 From: white <122345776@umail.ucc.ie> Date: Mon, 3 Mar 2025 11:07:29 +0000 Subject: [PATCH] UPDATE: fixed newsletter subjects --- web_server/utils/email.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/web_server/utils/email.py b/web_server/utils/email.py index 2e7dd09..f647005 100644 --- a/web_server/utils/email.py +++ b/web_server/utils/email.py @@ -29,10 +29,11 @@ def send_email(email, func) -> None: SMTP_PASSWORD = getenv("EMAIL_PASSWORD") # Setup up the receiver details - body = func() + body, subject = func() + print(subject, flush=True) msg = MIMEText(body, "html") - msg["Subject"] = "Reset Gander Login" + msg["Subject"] = subject msg["From"] = SMTP_EMAIL msg["To"] = email @@ -87,7 +88,7 @@ def forgot_password_body(email) -> str: """ - return content + return content, "Gander - Forgot Password" def confirm_account_creation_body(email) -> str: """ @@ -125,7 +126,7 @@ def confirm_account_creation_body(email) -> str: """ - return content + return content, "Gander - Confirm Account Creation" def newsletter_conf(email): @@ -160,7 +161,7 @@ def newsletter_conf(email): add_to_newsletter(email) - return content + return content, "Gander - Newsletter" def add_to_newsletter(email): """ @@ -175,6 +176,8 @@ def add_to_newsletter(email): INSERT INTO newsletter (email) VALUES (?); """, (email,)) + + db.close_connection() def remove_from_newsletter(email): @@ -190,3 +193,5 @@ def remove_from_newsletter(email): DELETE FROM newsletter WHERE email = ?; """, (email,)) + + db.close_connection() \ No newline at end of file