fix: email from address formatting

.env.example

@@ -18,7 +18,6 @@ EMAIL_PORT=
 EMAIL_HOST_USER=
 EMAIL_HOST_PASSWORD=
 EMAIL_USE_TLS=
-EMAIL_ADDRESS=
 
 VATSIM_CONNECT_CLIENT_ID=
 VATSIM_CONNECT_CLIENT_SECRET=

apps/mailer/migrations/0002_alter_email_bcc_email_alter_email_cc_email_and_more.py

@@ -0,0 +1,28 @@
+# Generated by Django 5.0.3 on 2024-04-07 02:47
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mailer', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='email',
+            name='bcc_email',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AlterField(
+            model_name='email',
+            name='cc_email',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AlterField(
+            model_name='email',
+            name='from_email',
+            field=models.EmailField(max_length=254),
+        ),
+    ]

apps/mailer/models.py

@@ -1,4 +1,3 @@
-import os
 import traceback
 from smtplib import SMTPException
 from typing import Any
@@ -44,10 +43,10 @@ class Email(models.Model):
     subject = models.CharField(max_length=255)
     html_body = models.TextField()
     text_body = models.TextField()
-    from_email = models.EmailField(null=True)
+    from_email = models.EmailField()
     to_email = models.TextField()
-    cc_email = models.CharField(max_length=255, null=True)
-    bcc_email = models.CharField(max_length=255, null=True)
+    cc_email = models.CharField(max_length=255, blank=True, null=True)
+    bcc_email = models.CharField(max_length=255, blank=True, null=True)
     status = models.IntegerField(choices=Status.choices, default=Status.PENDING)
     last_attempt = models.DateTimeField(null=True)
     error = models.TextField(null=True)
@@ -65,7 +64,7 @@ def send(self):
                 to=self.to_email.split(","),
                 cc=cc,
                 bcc=bcc,
-                from_email=f"Houston ARTCC <{self.from_email or os.getenv("EMAIL_ADDRESS")}>",
+                from_email=f"Houston ARTCC <{self.from_email}>",
                 body=self.text_body,
                 alternatives=[(self.html_body, "text/html")],
             ).send()

readme.md

@@ -51,7 +51,6 @@ All commands assume that you are at the root of the `zhu-core` repository that y
     | `EMAIL_HOST_USER`                   |  Email server username                                               | `"username"`         |
     | `EMAIL_HOST_PASSWORD`               |  Email server password                                               | `"password"`         |
     | `EMAIL_USE_TLS`                     |  Use TLS for SMTP                                                    | `True`               |
-    | `EMAIL_ADDRESS`                     |  Email address used for outgoing mail                                | `"[email protected]"` |
     | `EVENTS_WEBHOOK_URL` **[Optional]** |  Discord channel webhook for posting events                          |                      |
     </details>