github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-08-20 13:23:24 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix newsletter URL with no HTTP root

Browse source
This commit is contained in:
JonnyWong16 2018-05-05 11:13:27 -07:00
commit 476011a783
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plexpy/newsletters.py
View file

@ -475,10 +475,10 @@ class Newsletter(object):
def _build_params(self): def _build_params(self):
date_format = helpers.momentjs_to_arrow(plexpy.CONFIG.DATE_FORMAT) date_format = helpers.momentjs_to_arrow(plexpy.CONFIG.DATE_FORMAT)
if plexpy.CONFIG.HTTP_BASE_URL.rstrip('/'): if plexpy.CONFIG.NEWSLETTER_SELF_HOSTED and plexpy.CONFIG.HTTP_BASE_URL:
base_url = plexpy.CONFIG.HTTP_BASE_URL.rstrip('/') + '/' + plexpy.HTTP_ROOT.strip('/') base_url = plexpy.CONFIG.HTTP_BASE_URL + plexpy.HTTP_ROOT
else: else:
base_url = helpers.get_plexpy_url() base_url = helpers.get_plexpy_url() + '/'
parameters = { parameters = {
'server_name': plexpy.CONFIG.PMS_NAME, 'server_name': plexpy.CONFIG.PMS_NAME,
@ -487,7 +487,7 @@ class Newsletter(object):
'week_number': self.start_date.isocalendar()[1], 'week_number': self.start_date.isocalendar()[1],
'newsletter_time_frame': self.config['time_frame'], 'newsletter_time_frame': self.config['time_frame'],
'newsletter_time_frame_units': self.config['time_frame_units'], 'newsletter_time_frame_units': self.config['time_frame_units'],
'newsletter_url': base_url + '/newsletter/' + self.uuid, 'newsletter_url': base_url + 'newsletter/' + self.uuid,
'newsletter_uuid': self.uuid 'newsletter_uuid': self.uuid
} }