Notifications - "Send test" was not always following "System default notification format" (#2844)

Author: dgtlmoon

changedetectionio/update_worker.py

@@ -28,6 +28,8 @@ def __init__(self, q, notification_q, app, datastore, *args, **kwargs):
 
     def queue_notification_for_watch(self, notification_q, n_object, watch):
         from changedetectionio import diff
+        from changedetectionio.notification import default_notification_format_for_watch
+
         dates = []
         trigger_text = ''
 
@@ -44,6 +46,10 @@ def queue_notification_for_watch(self, notification_q, n_object, watch):
         else:
             snapshot_contents = "No snapshot/history available, the watch should fetch atleast once."
 
+        # If we ended up here with "System default"
+        if n_object.get('notification_format') == default_notification_format_for_watch:
+            n_object['notification_format'] = self.datastore.data['settings']['application'].get('notification_format')
+
         html_colour_enable = False
         # HTML needs linebreak, but MarkDown and Text can use a linefeed
         if n_object.get('notification_format') == 'HTML':