Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# Generated by Django 5.2.4 on 2025-08-18 10:11

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
("mailroom", "0001_initial"),
]

operations = [
migrations.AlterField(
model_name="bulkmail",
name="id",
field=models.BigAutoField(
auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
),
),
migrations.AlterField(
model_name="contact",
name="id",
field=models.BigAutoField(
auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
),
),
migrations.AlterField(
model_name="message",
name="id",
field=models.BigAutoField(
auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
),
),
]
23 changes: 17 additions & 6 deletions models.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,17 @@ def emailstr(self, header=None):
return ",".join(contact_list)

return

def email_list(self, header=None):
if header is None:
return
if header not in ["to", "cc", "bcc"]:
return
if getattr(self, header).exists():
contact_list = [contact.email for contact in getattr(self, header).all()]
return contact_list

return

def set_recipients(self, header, value):
if header not in ["to", "cc", "bcc"]:
Expand Down Expand Up @@ -143,20 +154,20 @@ def send(self):
"reply_to": [self.sender.email],
}

target_value = self.emailstr("to")
target_value = self.email_list("to")
if target_value:
packet["to"] = [target_value]
packet["to"] = target_value
else:
# No To, no email
return

target_value = self.emailstr("cc")
target_value = [target_value] if target_value else []
target_value = self.email_list("cc")
target_value = target_value if target_value else []
target_value += getattr(app_settings, "MAILROOM_CC", [])
packet["cc"] = target_value

target_value = self.emailstr("bcc")
target_value = [target_value] if target_value else []
target_value = self.email_list("bcc")
target_value = target_value if target_value else []
target_value += getattr(app_settings, "MAILROOM_BCC", [])
packet["bcc"] = target_value

Expand Down