diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html
index d7e076ee..c0033d54 100644
--- a/data/interfaces/default/settings.html
+++ b/data/interfaces/default/settings.html
@@ -956,8 +956,7 @@
- Note: The ${http_root}newsletter endpoint on your domain must be publicly accessible from the internet.
- Note: Newsletter images will be self-hosted regardless of the Image Hosting setting below.
+ Note: The ${http_root}newsletter endpoint on your domain must be publicly accessible from the internet.
Warning: Public Tautulli domain not set under Web Interface.
@@ -1084,7 +1083,7 @@
Add a new newsletter agent, or configure an existing newsletter agent by clicking the settings icon on the right.
- Warning: Either online Image Hosting or Self-Hosted Newsletters must be enabled.
+ Warning: Image Hosting must be enabled for images to display on the newsletter.
@@ -2605,10 +2604,10 @@ $(document).ready(function() {
});
function newsletterUploadEnabled() {
- if ($('#notify_upload_posters').val() !== '2' || $('#newsletter_self_hosted').is(':checked')) {
- $('#newsletter_upload_warning').hide();
- } else {
+ if ($('#notify_upload_posters').val() === '0') {
$('#newsletter_upload_warning').show();
+ } else {
+ $('#newsletter_upload_warning').hide();
}
}
newsletterUploadEnabled();
diff --git a/data/interfaces/newsletters/recently_added.html b/data/interfaces/newsletters/recently_added.html
index 67e93383..20dfd0a3 100644
--- a/data/interfaces/newsletters/recently_added.html
+++ b/data/interfaces/newsletters/recently_added.html
@@ -1,17 +1,23 @@
% if data:
<%
import plexpy
- from plexpy.helpers import grouper
+ from plexpy.helpers import grouper, get_img_service
recently_added = data['recently_added']
if plexpy.CONFIG.NEWSLETTER_SELF_HOSTED and plexpy.CONFIG.HTTP_BASE_URL:
base_url = plexpy.CONFIG.HTTP_BASE_URL + plexpy.HTTP_ROOT + 'newsletter/'
- base_url_image = base_url + 'image/'
elif preview:
base_url = 'newsletter/'
- base_url_image = base_url + 'image/'
else:
- base_url = base_url_image = ''
+ base_url = ''
+
+ if get_img_service(include_self=True) == 'self-hosted' and plexpy.CONFIG.HTTP_BASE_URL:
+ base_url_image = plexpy.CONFIG.HTTP_BASE_URL + plexpy.HTTP_ROOT + 'newsletter/image/'
+ elif preview:
+ base_url_image = 'newsletter/image/'
+ else:
+ base_url_image = ''
+
%>
diff --git a/data/interfaces/newsletters/recently_added_master.html b/data/interfaces/newsletters/recently_added_master.html
index 70716a37..c29f8e45 100644
--- a/data/interfaces/newsletters/recently_added_master.html
+++ b/data/interfaces/newsletters/recently_added_master.html
@@ -1,17 +1,23 @@
% if data:
<%
import plexpy
- from plexpy.helpers import grouper
+ from plexpy.helpers import grouper, get_img_service
recently_added = data['recently_added']
if plexpy.CONFIG.NEWSLETTER_SELF_HOSTED and plexpy.CONFIG.HTTP_BASE_URL:
base_url = plexpy.CONFIG.HTTP_BASE_URL + plexpy.HTTP_ROOT + 'newsletter/'
- base_url_image = base_url + 'image/'
elif preview:
base_url = 'newsletter/'
- base_url_image = base_url + 'image/'
else:
- base_url = base_url_image = ''
+ base_url = ''
+
+ if get_img_service(include_self=True) == 'self-hosted' and plexpy.CONFIG.HTTP_BASE_URL:
+ base_url_image = plexpy.CONFIG.HTTP_BASE_URL + plexpy.HTTP_ROOT + 'newsletter/image/'
+ elif preview:
+ base_url_image = 'newsletter/image/'
+ else:
+ base_url_image = ''
+
%>
diff --git a/plexpy/newsletters.py b/plexpy/newsletters.py
index 401d9410..280c130c 100644
--- a/plexpy/newsletters.py
+++ b/plexpy/newsletters.py
@@ -695,7 +695,7 @@ class RecentlyAdded(Newsletter):
artists = recently_added.get('artist', [])
albums = [a for artist in artists for a in artist['album']]
- if self.is_preview or plexpy.CONFIG.NEWSLETTER_SELF_HOSTED:
+ if self.is_preview or helpers.get_img_service(include_self=True) == 'self-hosted':
for item in movies + shows + albums:
if item['media_type'] == 'album':
height = 150
@@ -717,7 +717,7 @@ class RecentlyAdded(Newsletter):
item['poster_url'] = ''
item['art_url'] = ''
- else:
+ elif helpers.get_img_service():
# Upload posters and art to image hosting service
for item in movies + shows + albums:
if item['media_type'] == 'album':