diff --git a/data/interfaces/newsletters/recently_added.html b/data/interfaces/newsletters/recently_added.html index 36208ef6..aa6f4885 100644 --- a/data/interfaces/newsletters/recently_added.html +++ b/data/interfaces/newsletters/recently_added.html @@ -955,7 +955,7 @@
- Newsletter generated by Tautulli. +
diff --git a/data/interfaces/newsletters/recently_added.internal.html b/data/interfaces/newsletters/recently_added.internal.html index d1e91ca2..a22ffd59 100644 --- a/data/interfaces/newsletters/recently_added.internal.html +++ b/data/interfaces/newsletters/recently_added.internal.html @@ -956,7 +956,7 @@
- Newsletter generated by Tautulli. +
diff --git a/plexpy/newsletters.py b/plexpy/newsletters.py index 7d4c8b9c..1bc0382b 100644 --- a/plexpy/newsletters.py +++ b/plexpy/newsletters.py @@ -19,6 +19,7 @@ from itertools import groupby from mako.lookup import TemplateLookup from mako import exceptions import os +import re import plexpy import common @@ -420,7 +421,7 @@ class Newsletter(object): self.retrieve_data() - return serve_template( + newsletter_rendered = serve_template( templatename=self._TEMPLATE, uuid=self.uuid, subject=self.subject_formatted, @@ -431,6 +432,25 @@ class Newsletter(object): preview=self.is_preview ) + # Force Tautulli footer + if '' in newsletter_rendered: + newsletter_rendered = newsletter_rendered.replace( + '', + 'Newsletter generated by Tautulli.' + ) + return newsletter_rendered + else: + msg = ('
' + '

' + 'The Tautulli newsletter footer was removed from the newsletter template.
' + 'Please leave the footer in place as it is unobtrusive and supports ' + 'Tautulli.
Thank you.' + '

') + newsletter_rendered = re.sub(r'()', r'\1' + msg, newsletter_rendered) + return newsletter_rendered + def send(self): self.newsletter = self.generate_newsletter()