From ebf014406d666f2d1349a9b2474c4e573086aa53 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <JonnyWong16@users.noreply.github.com>
Date: Mon, 14 Nov 2016 21:33:37 -0800
Subject: [PATCH] Use fallback text if invalid subject or body

---
 plexpy/notification_handler.py | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/plexpy/notification_handler.py b/plexpy/notification_handler.py
index 9d6e2b98..0fa98598 100644
--- a/plexpy/notification_handler.py
+++ b/plexpy/notification_handler.py
@@ -558,6 +558,19 @@ def build_server_notify_params(notify_action=None, **kwargs):
 
 
 def build_notify_text(subject='', body='', notify_action=None, parameters=None, agent_id=None, test=False):
+    # Default subject and body text
+    default_action = next((a for a in notifiers.available_notification_actions() if a['name'] == notify_action), {})
+    default_subject = default_action.get('subject', '')
+    default_body = default_action.get('body', '')
+
+    # Make sure subject and body text are strings
+    if not isinstance(subject, basestring):
+        logger.error(u"PlexPy NotificationHandler :: Invalid subject text. Using fallback.")
+        subject = default_subject
+    if not isinstance(body, basestring):
+        logger.error(u"PlexPy NotificationHandler :: Invalid body text. Using fallback.")
+        body = default_body
+
     media_type = parameters.get('media_type')
 
     all_tags = r'<movie>.*?</movie>|' \
@@ -582,18 +595,9 @@ def build_notify_text(subject='', body='', notify_action=None, parameters=None,
     else:
         pattern = re.compile(all_tags, re.IGNORECASE | re.DOTALL)
 
-    if pattern:
-        # Remove the unwanted tags and strip any unmatch tags too.
-        subject = strip_tag(re.sub(pattern, '', subject), agent_id)
-        body = strip_tag(re.sub(pattern, '', body), agent_id)
-    else:
-        subject = strip_tag(subject, agent_id)
-        body = strip_tag(body, agent_id)
-
-    # Default subject and body text
-    default_action = next((a for a in notifiers.available_notification_actions() if a['name'] == notify_action), {})
-    default_subject = default_action.get('subject', '')
-    default_body = default_action.get('body', '')
+    # Remove the unwanted tags and strip any unmatch tags too.
+    subject = strip_tag(re.sub(pattern, '', subject), agent_id)
+    body = strip_tag(re.sub(pattern, '', body), agent_id)
 
     # Use default subject and body if they are blank
     # only if the notification is not script