fix body generation

src/rer/newsletter/adapter/sender.py

@@ -6,7 +6,6 @@
 from persistent.list import PersistentList
 from plone import api
 from rer.newsletter import logger
-from rer.newsletter.behaviors.ships import IShippable
 from rer.newsletter.utils import get_site_title
 from rer.newsletter.utils import OK
 from rer.newsletter.utils import SEND_UID_NOT_FOUND
@@ -125,9 +124,7 @@ def set_end_send_infos(self, send_uid, completed=True):
         send_info = [x for x in details if x["uid"] == send_uid]
         if not send_info:
             return SEND_UID_NOT_FOUND
-        send_info[0]["send_date_end"] = datetime.today().strftime(
-            "%d/%m/%Y %H:%M:%S"
-        )
+        send_info[0]["send_date_end"] = datetime.today().strftime("%d/%m/%Y %H:%M:%S")
         send_info[0]["completed"] = completed
         send_info[0]["running"] = False
         return OK
@@ -152,9 +149,7 @@ def sendMessage(self, message):
         subscribers = self.get_annotations_for_channel(key=SUBSCRIBERS_KEY)
 
         nl_subject = (
-            " - " + self.context.subject_email
-            if self.context.subject_email
-            else ""
+            " - " + self.context.subject_email if self.context.subject_email else ""
         )
         sender = (
             self.context.sender_name
@@ -200,9 +195,7 @@ def doSend(self, body, subject, subscribers, sender):
     def addToHistory(self, message):
         """Add to history that message is sent"""
 
-        list_history = [
-            x for x in message.workflow_history.get("message_workflow")
-        ]
+        list_history = [x for x in message.workflow_history.get("message_workflow")]
         current = api.user.get_current()
         entry = dict(
             action="Invio",

src/rer/newsletter/behaviors/ships.py

@@ -2,11 +2,11 @@
 from plone import api
 from plone.app.contenttypes.content import Collection
 from rer.newsletter.content.message import Message
+from rer.newsletter.interfaces import IBlocksToHtml
 from zope.component import adapter
+from zope.component import getUtility
 from zope.interface import alsoProvides
 from zope.interface import Interface
-from zope.component import getUtility
-from rer.newsletter.interfaces import IBlocksToHtml
 
 
 class IShippableMarker(Interface):

src/rer/newsletter/blocks_converter/__init__.py

@@ -1,6 +1,7 @@
 from bs4 import BeautifulSoup as bs
 from copy import deepcopy
-from plone.restapi.blocks import visit_blocks, iter_block_transform_handlers
+from plone.restapi.blocks import iter_block_transform_handlers
+from plone.restapi.blocks import visit_blocks
 from plone.restapi.interfaces import IBlockFieldSerializationTransformer
 from rer.newsletter.blocks_converter.slate2html import slate_to_html
 from rer.newsletter.interfaces import IBlocksToHtml
@@ -21,9 +22,7 @@ def __call__(self, context, blocks, blocks_layout):
             return ""
         html = []
         for block in blocks:
-            handler = getattr(
-                self, f"block_handler_{block.get('@type', '')}", None
-            )
+            handler = getattr(self, f"block_handler_{block.get('@type', '')}", None)
             if handler and callable(handler):
                 value = handler(context=context, block=block)
                 if value:
@@ -111,9 +110,7 @@ def block_handler_gridBlock(self, block, context):
         tr = root.findAll("tr")[0]
 
         for block in blocks:
-            handler = getattr(
-                self, f"block_handler_{block.get('@type', '')}", None
-            )
+            handler = getattr(self, f"block_handler_{block.get('@type', '')}", None)
             if handler and callable(handler):
                 value = handler(block)
                 if value:

src/rer/newsletter/blocks_converter/configure.zcml

@@ -1,6 +1,7 @@
 <configure xmlns="http://namespaces.zope.org/zope">
-    <utility
-        provides="rer.newsletter.interfaces.IBlocksToHtml"
-        component=".blocks_to_html"
-        permission="zope.Public" />
+  <utility
+      provides="rer.newsletter.interfaces.IBlocksToHtml"
+      component=".blocks_to_html"
+      permission="zope.Public"
+      />
 </configure>

src/rer/newsletter/browser/message/messagepreview.py

@@ -3,8 +3,9 @@
 from Products.Five import BrowserView
 from rer.newsletter.behaviors.ships import IShippable
 from rer.newsletter.content.channel import Channel
-from zope.component import getUtility
 from rer.newsletter.interfaces import IBlocksToHtml
+from zope.component import getUtility
+
 
 DEFAULT_STYLES = """
 .block.image {

src/rer/newsletter/browser/message/messageview.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from Products.Five.browser import BrowserView
-from zope.component import getUtility
 from rer.newsletter.interfaces import IBlocksToHtml
+from zope.component import getUtility
 
 
 class MessageView(BrowserView):

src/rer/newsletter/browser/message/sendingtest.py

@@ -47,10 +47,7 @@ def _getDate(self):
         return datetime.today().strftime("Newsletter %d-%m-%Y")
 
     def _getMessage(self, channel, message, footer):
-        content = IShippable(message).message_content
-        message_template = self.context.restrictedTraverse(
-            "@@messagepreview_view"
-        )
+        message_template = self.context.restrictedTraverse("@@messagepreview_view")
         parameters = {
             "message_subheader": f"""
                 <tr>
@@ -112,15 +109,11 @@ def handleSave(self, action):
                 "enabled": ns_obj.standard_unsubscribe,
             }
             unsubscribe_footer_text = unsubscribe_footer_template(**parameters)
-            body = self._getMessage(
-                ns_obj, message_obj, unsubscribe_footer_text
-            )
+            body = self._getMessage(ns_obj, message_obj, unsubscribe_footer_text)
 
             sender = compose_sender(channel=ns_obj)
 
-            nl_subject = (
-                " - " + ns_obj.subject_email if ns_obj.subject_email else ""
-            )
+            nl_subject = " - " + ns_obj.subject_email if ns_obj.subject_email else ""
 
             subject = "Messaggio di prova - " + message_obj.title + nl_subject
             # per mandare la mail non passo per l'utility

src/rer/newsletter/browser/settings.py

@@ -15,9 +15,7 @@ class ISettingsSchema(Interface):
 
     source_link = schema.TextLine(
         title=_("source_link", default="Link sorgente"),
-        description=_(
-            "description_source_link", default="Indirizzo da sostituire"
-        ),
+        description=_("description_source_link", default="Indirizzo da sostituire"),
         default="",
         required=False,
     )

src/rer/newsletter/transforms/link_transform.py

@@ -1,14 +1,11 @@
 # -*- coding: utf-8 -*-
 # from lxml import etree
 from plone import api
-from plone.registry.interfaces import IRegistry
 from premailer import Premailer
 from Products.PortalTransforms.interfaces import ITransform
 from rer.newsletter.browser.settings import ISettingsSchema
-from zope.component import getUtility
 from zope.interface import implementer
 
-
 import re
 
 
@@ -41,9 +38,7 @@ def convert(self, orig, data, **kwargs):
         p = Premailer(orig, strip_important=False)
         orig = p.transform()
 
-        source_link = api.portal.get_registry_record(
-            "source_link", ISettingsSchema
-        )
+        source_link = api.portal.get_registry_record("source_link", ISettingsSchema)
         if not source_link:
             source_link = api.portal.get().absolute_url()