Skip to content

Commit 22b9d1d

Browse files
committed
add enum
1 parent 4e7c8c8 commit 22b9d1d

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

src/backend/InvenTree/InvenTree/backends.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,11 @@ def send_messages(
131131
# Anymail: pre-processing
132132
if settings.INTERNAL_EMAIL_BACKEND.startswith('anymail.backends.'):
133133
for a in email_messages:
134-
if a.extra_headers and 'Message-ID' in a.extra_headers:
134+
if a.extra_headers and common.models.HEADER_MSG_ID in a.extra_headers:
135135
# Remove the Message-ID header from the email
136136
# This is because some ESPs do not like it being set
137137
# in the headers, and will ignore the email
138-
a.extra_headers.pop('Message-ID')
138+
a.extra_headers.pop(common.models.HEADER_MSG_ID)
139139
# Add tracking if requested: TODO
140140
# a.track_opens = True
141141

src/backend/InvenTree/common/models.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2433,6 +2433,10 @@ class Priority(models.IntegerChoices):
24332433
VERY_LOW = 5
24342434

24352435

2436+
HEADER_PRIORITY = 'X-Priority'
2437+
HEADER_MSG_ID = 'Message-ID'
2438+
2439+
24362440
class EmailMessage(models.Model):
24372441
"""Model for storing email messages sent or received by the system.
24382442
@@ -2644,13 +2648,13 @@ def issue_mail(
26442648
message.extra_headers[key] = value
26452649

26462650
# Stabilize the message ID before creating the object
2647-
if 'Message-ID' not in message.extra_headers:
2648-
message.extra_headers['Message-ID'] = make_msgid(domain=DNS_NAME)
2651+
if HEADER_MSG_ID not in message.extra_headers:
2652+
message.extra_headers[HEADER_MSG_ID] = make_msgid(domain=DNS_NAME)
26492653

26502654
# TODO add `References` field for the thread ID
26512655

26522656
# Add headers for flags
2653-
message.extra_headers['X-Priority'] = str(prio)
2657+
message.extra_headers[HEADER_PRIORITY] = str(prio)
26542658

26552659
# And now send
26562660
return message.send()
@@ -2668,14 +2672,14 @@ def log_email_messages(email_messages) -> list[EmailMessage]:
26682672
for msg in email_messages:
26692673
try:
26702674
new_obj = EmailMessage.objects.create(
2671-
message_id_key=msg.extra_headers.get('Message-ID'),
2675+
message_id_key=msg.extra_headers.get(HEADER_MSG_ID),
26722676
subject=msg.subject,
26732677
body=msg.body,
26742678
to=msg.to,
26752679
sender=msg.from_email,
26762680
status=EmailMessage.EmailStatus.ANNOUNCED,
26772681
direction=EmailMessage.EmailDirection.OUTBOUND,
2678-
priority=msg.extra_headers.get('X-Priority', '3'),
2682+
priority=msg.extra_headers.get(HEADER_PRIORITY, '3'),
26792683
headers=msg.extra_headers,
26802684
full_message=msg,
26812685
)
@@ -2699,7 +2703,7 @@ def handle_inbound(sender, event, esp_name, **kwargs):
26992703
r_sender = message.envelope_sender or message.from_email.addr_spec
27002704

27012705
EmailMessage.objects.create(
2702-
message_id_key=event.message['Message-ID'],
2706+
message_id_key=event.message[HEADER_MSG_ID],
27032707
subject=message.subject,
27042708
body=message.text,
27052709
to=r_to,

0 commit comments

Comments
 (0)