fix master 22/11

the new template mode in HA version 0.118 needs some fixes
jumping2000 · Nov 22, 2020 · 845f957 · 845f957
1 parent e47628f
commit 845f957
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/apps/notifier/notifier_dispatch.py b/apps/notifier/notifier_dispatch.py
@@ -79,25 +79,25 @@ def convert(self, lst):
 
     def createTTSdict(self, data) -> list:
         dizionario = ""
-        if data == "":
+        if data == "" or (not self.check_notify(data)):
             flag = False
         elif str(data).lower() in ["1","true","on","yes"]:
             flag = True
             dizionario = {}
         else:
-            if "OrderedDict([(" in data:
+            if "OrderedDict([(" in str(data):
                 dizionario = self.convert(list(data.split("'")))
                 if dizionario.get("mode") != None:
                     flag = self.check_flag(dizionario["mode"])
                 else:
                     flag = True
             else:
-                dizionario = data if isinstance(data, dict) else eval(data)  # data if isinstance(data, dict) else eval(data)
+                dizionario = data if isinstance(data, dict) else eval(data) # convert to dict
                 if dizionario.get("mode") != None:
                     flag = self.check_flag(dizionario["mode"])
                 else:
                     flag = True
-        return [flag, dizionario]
+        return [flag,dizionario]
 
     def notify_hub(self, event_name, data, kwargs):
         self.log("#### START NOTIFIER_DISPATCH ####")
@@ -110,11 +110,11 @@ def notify_hub(self, event_name, data, kwargs):
         notify_flag = self.check_notify(data["notify"])
 
         ### GOOGLE ####
-        google_flag = self.createTTSdict(data["google"])[0]
-        google = self.createTTSdict(data["google"])[1]
+        google_flag = self.createTTSdict(data["google"])[0] if len(str(data["google"])) != 0 else False
+        google = self.createTTSdict(data["google"])[1] if len(str(data["google"])) != 0 else False
         ### ALEXA ####
-        alexa_flag = self.createTTSdict(data["alexa"])[0]
-        alexa = self.createTTSdict(data["alexa"])[1]
+        alexa_flag = self.createTTSdict(data["alexa"])[0] if len(str(data["alexa"])) != 0 else False
+        alexa = self.createTTSdict(data["alexa"])[1] if len(str(data["alexa"])) != 0 else False
 
         ### FROM INPUT BOOLEAN ###
         dnd_status = self.get_state(self.tts_dnd)