API - watch.link was accidently a tuple, enforcing string

changedetectionio/api/Watch.py

@@ -103,7 +103,7 @@ class Watch(Resource):
         # attr .last_changed will check for the last written text snapshot on change
         watch['last_changed'] = watch_obj.last_changed
         watch['viewed'] = watch_obj.viewed
-        watch['link'] = watch_obj.link,
+        watch['link'] = watch_obj.link
 
         return watch
 

changedetectionio/notification/handler.py

@@ -65,9 +65,6 @@ def notification_format_align_with_apprise(n_format : str):
     :return:
     """
 
-    if not n_format:
-        return NotifyFormat.TEXT.value
-
     if n_format.startswith('html'):
         # Apprise only knows 'html' not 'htmlcolor' etc, which shouldnt matter here
         n_format = NotifyFormat.HTML.value

changedetectionio/notification_service.py

@@ -29,7 +29,7 @@ def _check_cascading_vars(datastore, var_name, watch):
     v = watch.get(var_name)
     if v and not watch.get('notification_muted'):
         if var_name == 'notification_format' and v == USE_SYSTEM_DEFAULT_NOTIFICATION_FORMAT_FOR_WATCH:
-            return datastore.data['settings']['application'].get('notification_format') or default_notification_format
+            return datastore.data['settings']['application'].get('notification_format')
 
         return v
 
@@ -457,7 +457,7 @@ Thanks - Your omniscient changedetection.io installation.
             'notification_body': body,
             'notification_format': _check_cascading_vars(self.datastore, 'notification_format', watch),
         })
-        n_object['markup_text_links_to_html_links'] = (n_object.get('notification_format') or '').startswith('html')
+        n_object['markup_text_links_to_html_links'] = n_object.get('notification_format').startswith('html')
 
         if len(watch['notification_urls']):
             n_object['notification_urls'] = watch['notification_urls']
@@ -506,7 +506,7 @@ Thanks - Your omniscient changedetection.io installation.
             'notification_body': body,
             'notification_format': _check_cascading_vars(self.datastore, 'notification_format', watch),
         })
-        n_object['markup_text_links_to_html_links'] = (n_object.get('notification_format') or '').startswith('html')
+        n_object['markup_text_links_to_html_links'] = n_object.get('notification_format').startswith('html')
 
         if len(watch['notification_urls']):
             n_object['notification_urls'] = watch['notification_urls']

changedetectionio/tests/test_api.py

@@ -102,6 +102,8 @@ def test_api_simple(client, live_server, measure_memory_usage, datastore_path):
     #705 `last_changed` should be zero on the first check
     assert before_recheck_info['last_changed'] == 0
     assert before_recheck_info['title'] == 'My test URL'
+    assert isinstance(before_recheck_info['link'], str), "link must be a plain string, not a tuple or list"
+    assert before_recheck_info['link'] == test_url
 
     # Check the limit by tag doesnt return anything when nothing found
     res = client.get(

changedetectionio/tests/test_notification.py

@@ -541,39 +541,6 @@ def test_single_send_test_notification_on_watch(client, live_server, measure_mem
         assert 'Current snapshot: Example text: example test' in x
     os.unlink(os.path.join(datastore_path, "notification.txt"))
 
-# Regression test for #4119 - sending a test notification with 'System default' format caused a crash
-def test_send_test_notification_with_system_default_format(client, live_server, measure_memory_usage, datastore_path):
-
-    set_original_response(datastore_path=datastore_path)
-    if os.path.isfile(os.path.join(datastore_path, "notification.txt")):
-        os.unlink(os.path.join(datastore_path, "notification.txt"))
-
-    test_notification_url = url_for('test_notification_endpoint', _external=True).replace('http://', 'post://') + "?status_code=204"
-
-    test_url = url_for('test_endpoint', _external=True)
-    uuid = client.application.config.get('DATASTORE').add_watch(url=test_url)
-    client.get(url_for("ui.form_watch_checknow"), follow_redirects=True)
-    wait_for_all_checks(client)
-
-    # New watches default to USE_SYSTEM_DEFAULT_NOTIFICATION_FORMAT_FOR_WATCH.
-    # The JS sends this value verbatim from the select; it must not crash.
-    res = client.post(
-        url_for("ui.ui_notification.ajax_callback_send_notification_test") + f"/{uuid}",
-        data={
-            "notification_urls": test_notification_url,
-            "notification_body": default_notification_body,
-            "notification_title": default_notification_title,
-            "notification_format": USE_SYSTEM_DEFAULT_NOTIFICATION_FORMAT_FOR_WATCH,
-        },
-        follow_redirects=True
-    )
-
-    assert res.status_code != 400
-    assert res.status_code != 500
-
-    client.get(url_for("ui.form_delete", uuid="all"), follow_redirects=True)
-
-
 def _test_color_notifications(client, notification_body_token, datastore_path):
 
     set_original_response(datastore_path=datastore_path)