@@ -2433,6 +2433,10 @@ class Priority(models.IntegerChoices):
2433
2433
VERY_LOW = 5
2434
2434
2435
2435
2436
+ HEADER_PRIORITY = 'X-Priority'
2437
+ HEADER_MSG_ID = 'Message-ID'
2438
+
2439
+
2436
2440
class EmailMessage (models .Model ):
2437
2441
"""Model for storing email messages sent or received by the system.
2438
2442
@@ -2644,13 +2648,13 @@ def issue_mail(
2644
2648
message .extra_headers [key ] = value
2645
2649
2646
2650
# 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 )
2649
2653
2650
2654
# TODO add `References` field for the thread ID
2651
2655
2652
2656
# Add headers for flags
2653
- message .extra_headers ['X-Priority' ] = str (prio )
2657
+ message .extra_headers [HEADER_PRIORITY ] = str (prio )
2654
2658
2655
2659
# And now send
2656
2660
return message .send ()
@@ -2668,14 +2672,14 @@ def log_email_messages(email_messages) -> list[EmailMessage]:
2668
2672
for msg in email_messages :
2669
2673
try :
2670
2674
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 ),
2672
2676
subject = msg .subject ,
2673
2677
body = msg .body ,
2674
2678
to = msg .to ,
2675
2679
sender = msg .from_email ,
2676
2680
status = EmailMessage .EmailStatus .ANNOUNCED ,
2677
2681
direction = EmailMessage .EmailDirection .OUTBOUND ,
2678
- priority = msg .extra_headers .get ('X-Priority' , '3' ),
2682
+ priority = msg .extra_headers .get (HEADER_PRIORITY , '3' ),
2679
2683
headers = msg .extra_headers ,
2680
2684
full_message = msg ,
2681
2685
)
@@ -2699,7 +2703,7 @@ def handle_inbound(sender, event, esp_name, **kwargs):
2699
2703
r_sender = message .envelope_sender or message .from_email .addr_spec
2700
2704
2701
2705
EmailMessage .objects .create (
2702
- message_id_key = event .message ['Message-ID' ],
2706
+ message_id_key = event .message [HEADER_MSG_ID ],
2703
2707
subject = message .subject ,
2704
2708
body = message .text ,
2705
2709
to = r_to ,
0 commit comments