django-codenerix-email 4.0.19__tar.gz → 4.0.21__tar.gz

{django-codenerix-email-4.0.19/django_codenerix_email.egg-info → django-codenerix-email-4.0.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-codenerix-email
-Version: 4.0.19
+Version: 4.0.21
 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.19 → django-codenerix-email-4.0.21}/codenerix_email/__init__.py

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

{django-codenerix-email-4.0.19 → django-codenerix-email-4.0.21}/codenerix_email/forms.py

@@ -96,6 +96,7 @@ class EmailMessageForm(GenModelForm):
                 ["eto", 3],
                 ["subject", 3],
                 ["opened", 3],
+                ["content_subtype", 3],
             ),
             (
                 _("System"),
@@ -106,6 +107,8 @@ class EmailMessageForm(GenModelForm):
                 ["retries", 3],
                 ["priority", 3],
                 ["log", 3],
+                ["unsubscribe_url", 3],
+                ["headers", 3],
             ),
             (
                 _("Body"),

django-codenerix-email-4.0.21/codenerix_email/migrations/0013_emailmessage_headers.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.2 on 2024-10-15 06:20
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("codenerix_email", "0012_emailmessage_unsubscribe_url"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="emailmessage",
+            name="headers",
+            field=models.JSONField(blank=True, null=True, verbose_name="Headers"),
+        ),
+    ]

{django-codenerix-email-4.0.19 → django-codenerix-email-4.0.21}/codenerix_email/models.py

@@ -49,6 +49,12 @@ CONTENT_SUBTYPES = (
 )
 
 
+def ensure_header(headers, key, value):
+    if key not in headers:
+        headers[key] = value
+    return headers
+
+
 class EmailMessage(CodenerixModel, Debugger):
     uuid = models.UUIDField(
         _("UUID"),
@@ -95,6 +101,7 @@ class EmailMessage(CodenerixModel, Debugger):
     unsubscribe_url = models.URLField(
         _("Unsubscribe URL"), blank=True, null=True
     )
+    headers = models.JSONField(_("Headers"), blank=True, null=True)
 
     def __fields__(self, info):
         fields = []
@@ -111,9 +118,9 @@ class EmailMessage(CodenerixModel, Debugger):
         fields.append(("retries", _("Retries")))
         fields.append(("next_retry", _("Next retry")))
         fields.append(("pk", _("ID")))
-        fields.append(("content_subtype", _("Content Subtype")))
         fields.append(("uuid", _("UUID")))
-        fields.append(("unsubscribe_url", _("Unsubscribe URL")))
+        fields.append(("unsubscribe_url", _("Unsubscribe")))
+        fields.append(("content_subtype", _("Content Subtype")))
         return fields
 
     def __searchQ__(self, info, search):  # noqa: N802
@@ -160,21 +167,37 @@ class EmailMessage(CodenerixModel, Debugger):
             "eto": (_("To"), lambda x: Q(eto__icontains=x), "input"),
             "retries": (_("Retries"), lambda x: Q(retries=x), "input"),
             "pk": (_("ID"), lambda x: Q(pk=x), "input"),
-            "unsubscribe_url": (
-                _("Unsubscribe URL"),
-                lambda x: Q(unsubscribe_url__icontains=x),
-                "input",
-            ),
         }
 
     def __unicode__(self):
         return "{} ({})".format(self.eto, self.pk)
 
+    def clean(self):
+        if not isinstance(self.headers, dict):
+            raise ValidationError(_("HEADERS must be a Dictionary"))
+
     def set_opened(self):
         if not self.opened:
             self.opened = timezone.now()
             self.save()
 
+    def get_headers(self):
+
+        # Get headers
+        headers = self.headers or {}
+
+        # Ensure unsubscribe headers
+        if self.unsubscribe_url:
+            ensure_header(
+                headers, "List-Unsubscribe", f"<{self.unsubscribe_url}>"
+            )
+            ensure_header(
+                headers, "List-Unsubscribe-Post", "List-Unsubscribe=One-Click"
+            )
+
+        # Return headers
+        return headers
+
     @classmethod
     def process_queue(
         cls, connection=None, legacy=False, silent=True, debug=False
@@ -353,24 +376,14 @@ class EmailMessage(CodenerixModel, Debugger):
 
             if connection:
 
-                # Prepare headers
-                headers = {}
-
-                # If unsubscribe_url is set, add List-Unsubscribe header
-                if self.unsubscribe_url:
-                    headers["List-Unsubscribe"] = f"<{self.unsubscribe_url}>"
-                    headers[
-                        "List-Unsubscribe-Post"
-                    ] = "List-Unsubscribe=One-Click"
-
                 email = EM(
                     subject=self.subject,
                     body=self.body,
                     from_email=self.efrom,
                     to=[self.eto],
                     connection=connection,
+                    headers=self.get_headers(),
                 )
-                email.headers = headers
                 email.content_subtype = self.content_subtype
                 for at in self.attachments.all():
                     with open(at.path) as f:

{django-codenerix-email-4.0.19 → django-codenerix-email-4.0.21}/codenerix_email/static/codenerix_email/partials/emailmessages_rows.html

@@ -17,7 +17,13 @@
 <td><center>{{row.retries|codenerix}}</center></td>
 <td class="text-nowrap">{{row.next_retry|codenerix}}</td>
 <td><center>{{row.pk|codenerix}}</center></td>
-<td>
+<td ng-click="$event.stopPropagation();" align="center">
+    <nobr><i title="{{row.uuid}}" codenerix-html-compile="row.uuid|codenerix:'copytoclipboard:UUID:UUID copiado al portapapales...'"></i></nobr>
+</td>
+<td ng-click="$event.stopPropagation();" align="center">
+    <i codenerix-html-compile="row.unsubscribe_url|codenerix:'link:blank:onlyicon'"></i>
+</td>
+<td ng-click="$event.stopPropagation();">
     <center>
         <button class="btn" title="{{row.content_subtype|codenerix}}">
             <i ng-show="row.content_subtype=='plain'" class="fa fa-file-text-o" aria-hidden="true"></i>
@@ -26,11 +32,3 @@
         </button>
     </center>
 </td>
-<td ng-click="$event.stopPropagation();" align="center">
-    <span codenerix-html-compile="row.uuid|codenerix:'copytoclipboard:UUID:UUID copiado al portapapales...':codenerix_inner_element">
-        <span class="fa fa-barcode"></span>
-    </span>
-</td>
-<td ng-click="$event.stopPropagation();" align="center">
-    <span codenerix-html-compile="row.unsubscribe_url|codenerix:'link:blank:onlyicon'">
-</td>

{django-codenerix-email-4.0.19 → django-codenerix-email-4.0.21/django_codenerix_email.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-codenerix-email
-Version: 4.0.19
+Version: 4.0.21
 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.19 → django-codenerix-email-4.0.21}/django_codenerix_email.egg-info/SOURCES.txt

@@ -32,6 +32,7 @@ codenerix_email/migrations/0009_emailmessage_opened_emailmessage_uuid.py
 codenerix_email/migrations/0010_emailmessage_content_subtype_and_more.py
 codenerix_email/migrations/0011_alter_emailmessage_content_subtype_and_more.py
 codenerix_email/migrations/0012_emailmessage_unsubscribe_url.py
+codenerix_email/migrations/0013_emailmessage_headers.py
 codenerix_email/migrations/__init__.py
 codenerix_email/migrations/__pycache__/0001_initial.cpython-310.pyc
 codenerix_email/migrations/__pycache__/0001_initial.cpython-311.pyc
@@ -71,6 +72,7 @@ codenerix_email/migrations/__pycache__/0010_emailmessage_content_subtype_and_mor
 codenerix_email/migrations/__pycache__/0010_emailmessage_opened_emailmessage_uuid_and_more.cpython-311.pyc
 codenerix_email/migrations/__pycache__/0011_alter_emailmessage_content_subtype_and_more.cpython-311.pyc
 codenerix_email/migrations/__pycache__/0012_emailmessage_unsubscribe_url.cpython-311.pyc
+codenerix_email/migrations/__pycache__/0013_emailmessage_headers.cpython-311.pyc
 codenerix_email/migrations/__pycache__/__init__.cpython-310.pyc
 codenerix_email/migrations/__pycache__/__init__.cpython-311.pyc
 codenerix_email/migrations/__pycache__/__init__.cpython-35.pyc