anonfunc/JellyPy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Automatically append HTTP root to newsletter URL

Browse Source
This commit is contained in:
JonnyWong16
2018-03-21 19:18:49 -07:00
parent 1f10668838
commit 511f4a916b
5 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plexpy/newsletter_handler.py
View File

@@ -78,8 +78,8 @@ def notify(newsletter_id=None, notify_action=None, **kwargs):
return
if notify_action in ('test', 'api'):
subject = kwargs.pop('subject', newsletter_config['subject'])
body = kwargs.pop('body', newsletter_config['body'])
subject = kwargs.pop('subject', None) or newsletter_config['subject']
body = kwargs.pop('body', None) or newsletter_config['body']
else:
subject = newsletter_config['subject']
body = newsletter_config['body']

2
plexpy/newsletters.py
View File

@@ -455,7 +455,7 @@ class Newsletter(object):
'start_date': self.start_date.format(date_format),
'end_date': self.end_date.format(date_format),
'newsletter_days': self.config['last_days'],
'newsletter_url': base_url.rstrip('/') + '/newsletter/' + self.uuid,
'newsletter_url': base_url.rstrip('/') + plexpy.HTTP_ROOT + 'newsletter/' + self.uuid,
'newsletter_uuid': self.uuid
}