django-codenerix-email 4.0.27__tar.gz → 4.0.29__tar.gz

{django_codenerix_email-4.0.27 → django_codenerix_email-4.0.29}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django_codenerix_email
-Version: 4.0.27
+Version: 4.0.29
 Summary: Codenerix Email is a module that enables CODENERIX to set send emails in a general manner.
 Home-page: https://github.com/codenerix/django-codenerix-email
 Author: Juan Miguel Taboada Godoy <juanmi@juanmitaboada.com>, Juan Soler Ruiz <soleronline@gmail.com>

{django_codenerix_email-4.0.27 → django_codenerix_email-4.0.29}/codenerix_email/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "4.0.27"
+__version__ = "4.0.29"
 
 __authors__ = [
     "Juan Miguel Taboada Godoy <juanmi@juanmitaboada.com>",

{django_codenerix_email-4.0.27 → django_codenerix_email-4.0.29}/codenerix_email/management/commands/test_email.py

@@ -22,6 +22,7 @@ import json
 
 from django.core.management.base import BaseCommand
 from django.conf import settings
+from django.utils import timezone
 
 from codenerix_lib.debugger import Debugger
 from codenerix_email.models import EmailMessage, EmailTemplate  # type: ignore
@@ -131,6 +132,15 @@ Django Codenerix Email v{}
                 email_message.efrom = settings.DEFAULT_FROM_EMAIL
                 email_message.eto = email
 
+                # Prepare message ID info
+                ecid = email_message.uuid.hex
+                edomain = settings.EMAIL_FROM.split("@")[-1]
+                ets = int(timezone.now().timestamp())
+                email_message.headers = {
+                    "Message-ID": f"<{ecid}-{ets}@{edomain}>",
+                    "X-Codenerix-Email": "Test",
+                }
+
                 if stdout:
                     self.debug(
                         f"Sending email to {name} <{email}> "
@@ -148,6 +158,15 @@ Django Codenerix Email v{}
             email_message.efrom = settings.DEFAULT_FROM_EMAIL
             email_message.eto = email
 
+            # Prepare message ID info
+            ecid = email_message.uuid.hex
+            edomain = settings.EMAIL_FROM.split("@")[-1]
+            ets = int(timezone.now().timestamp())
+            email_message.headers = {
+                "Message-ID": f"<{ecid}-{ets}@{edomain}>",
+                "X-Codenerix-Email": "Test",
+            }
+
             if stdout:
                 self.debug(
                     f"Sending email to {name} <{email}> "

{django_codenerix_email-4.0.27 → django_codenerix_email-4.0.29}/codenerix_email/models.py

@@ -49,8 +49,10 @@ CONTENT_SUBTYPES = (
 )
 
 
-def ensure_header(headers, key, value):
-    if key not in headers:
+def ensure_header(headers, key, value, headers_keys=None):
+    if headers_keys is None:
+        headers_keys = [k.lower() for k in headers.keys()]
+    if key.lower() not in headers_keys:
         headers[key] = value
     return headers
 
@@ -186,13 +188,34 @@ class EmailMessage(CodenerixModel, Debugger):
         # Get headers
         headers = self.headers or {}
 
+        # Header keys
+        headers_keys = [k.lower() for k in headers.keys()]
+
         # Ensure unsubscribe headers
         if self.unsubscribe_url:
             ensure_header(
-                headers, "List-Unsubscribe", f"<{self.unsubscribe_url}>"
+                headers,
+                "List-Unsubscribe",
+                f"<{self.unsubscribe_url}>",
+                headers_keys,
             )
             ensure_header(
-                headers, "List-Unsubscribe-Post", "List-Unsubscribe=One-Click"
+                headers,
+                "List-Unsubscribe-Post",
+                "List-Unsubscribe=One-Click",
+                headers_keys,
+            )
+
+        # Prepare message ID info
+        if "Message-ID".lower() not in headers_keys:
+            ecid = self.uuid.hex
+            edomain = settings.EMAIL_FROM.split("@")[-1]
+            ets = int(timezone.now().timestamp())
+            ensure_header(
+                headers,
+                "Message-ID",
+                f"<{ecid}-{ets}@{edomain}>",
+                headers_keys,
             )
 
         # Return headers
@@ -552,6 +575,7 @@ class EmailTemplate(CodenerixModel):
         e.body = Template(getattr(self, lang).body).render(Context(context))
         e.efrom = Template(self.efrom).render(Context(context))
         e.content_subtype = self.content_subtype
+
         return e
 
     def clean(self):

{django_codenerix_email-4.0.27 → django_codenerix_email-4.0.29}/codenerix_email/views.py

@@ -115,6 +115,23 @@ class EmailTemplateList(GenList):
         "bread": [_("Emails"), _("Email Template")],
     }
 
+    def __fields__(self, info):
+        fields = []
+        fields.append(("pk", _("PK"), 100))
+        fields.append(("cid", _("CID"), 100))
+        fields.append(("efrom", _("From"), 100))
+        fields.append(
+            (
+                f"{self.language}__subject",
+                _("Subject"),
+                100,
+                None,
+                "shorttext:150",
+            )
+        )
+        fields.append(("content_subtype", _("Content Subtype"), 100))
+        return fields
+
 
 class EmailTemplateCreate(MultiForm, GenCreate):
     model = EmailTemplate

{django_codenerix_email-4.0.27 → django_codenerix_email-4.0.29}/django_codenerix_email.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-codenerix-email
-Version: 4.0.27
+Version: 4.0.29
 Summary: Codenerix Email is a module that enables CODENERIX to set send emails in a general manner.
 Home-page: https://github.com/codenerix/django-codenerix-email
 Author: Juan Miguel Taboada Godoy <juanmi@juanmitaboada.com>, Juan Soler Ruiz <soleronline@gmail.com>