Fixing tests

changedetectionio/api/Tags.py

@@ -96,16 +96,6 @@ class Tag(Resource):
         if not tag:
             abort(404, message='No tag exists with the UUID of {}'.format(uuid))
 
-        # Validate notification_urls if provided
-        if 'notification_urls' in request.json:
-            from wtforms import ValidationError
-            from changedetectionio.api.Notifications import validate_notification_urls
-            try:
-                notification_urls = request.json.get('notification_urls', [])
-                validate_notification_urls(notification_urls)
-            except ValidationError as e:
-                return str(e), 400
-
         tag.update(request.json)
         self.datastore.needs_write_urgent = True
 

changedetectionio/api/Watch.py

@@ -140,16 +140,6 @@ class Watch(Resource):
         if validation_error:
             return validation_error, 400
 
-        # Validate notification_urls if provided
-        if 'notification_urls' in request.json:
-            from wtforms import ValidationError
-            from changedetectionio.api.Notifications import validate_notification_urls
-            try:
-                notification_urls = request.json.get('notification_urls', [])
-                validate_notification_urls(notification_urls)
-            except ValidationError as e:
-                return str(e), 400
-
         # XSS etc protection - validate URL if it's being updated
         if 'url' in request.json:
             new_url = request.json.get('url')
@@ -454,16 +444,6 @@ class CreateWatch(Resource):
         if validation_error:
             return validation_error, 400
 
-        # Validate notification_urls if provided
-        if 'notification_urls' in json_data:
-            from wtforms import ValidationError
-            from changedetectionio.api.Notifications import validate_notification_urls
-            try:
-                notification_urls = json_data.get('notification_urls', [])
-                validate_notification_urls(notification_urls)
-            except ValidationError as e:
-                return str(e), 400
-
         extras = copy.deepcopy(json_data)
 
         # Because we renamed 'tag' to 'tags' but don't want to change the API (can do this in v2 of the API)
@@ -480,16 +460,6 @@ class CreateWatch(Resource):
 #            worker_handler.queue_item_async_safe(self.update_q, queuedWatchMetaData.PrioritizedItem(priority=1, item={'uuid': new_uuid}))
             return {'uuid': new_uuid}, 201
         else:
-            # Check if it was a limit issue
-            page_watch_limit = os.getenv('PAGE_WATCH_LIMIT')
-            if page_watch_limit:
-                try:
-                    page_watch_limit = int(page_watch_limit)
-                    current_watch_count = len(self.datastore.data['watching'])
-                    if current_watch_count >= page_watch_limit:
-                        return f"Watch limit reached ({current_watch_count}/{page_watch_limit} watches). Cannot add more watches.", 429
-                except ValueError:
-                    pass
             return "Invalid or unsupported URL", 400
 
     @auth.check_token

changedetectionio/blueprint/settings/templates/settings.html

@@ -80,16 +80,6 @@
                         {{ render_checkbox_field(form.application.form.empty_pages_are_a_change) }}
                         <span class="pure-form-message-inline">{{ _('When a request returns no content, or the HTML does not contain any text, is this considered a change?') }}</span>
                     </div>
-                {% if form.requests.proxy %}
-                    <div>
-                    <br>
-                        <div class="inline-radio">
-                            {{ render_field(form.requests.form.proxy, class="fetch-backend-proxy") }}
-                            <span class="pure-form-message-inline">{{ _('Choose a default proxy for all watches') }}</span>
-                        </div>
-                    </div>
-                {% endif %}
-
                 </fieldset>
             </div>
 
@@ -350,6 +340,15 @@ nav
                 {{ render_fieldlist_with_inline_errors(form.requests.form.extra_proxies) }}
                 <span class="pure-form-message-inline">{{ _('"Name" will be used for selecting the proxy in the Watch Edit settings') }}</span><br>
                 <span class="pure-form-message-inline">{{ _('SOCKS5 proxies with authentication are only supported with \'plain requests\' fetcher, for other fetchers you should whitelist the IP access instead') }}</span>
+                {% if form.requests.proxy %}
+                <div>
+                <br>
+                    <div class="inline-radio">
+                        {{ render_field(form.requests.form.proxy, class="fetch-backend-proxy") }}
+                        <span class="pure-form-message-inline">{{ _('Choose a default proxy for all watches') }}</span>
+                    </div>
+                </div>
+                {% endif %}
                 </div>
                 <div class="pure-control-group" id="extra-browsers-setting">
                     <p>

changedetectionio/blueprint/watchlist/templates/watch-overview.html

@@ -223,7 +223,7 @@ html[data-darkmode="true"] .watch-tag-list.tag-{{ class_name }} {
                                 <span class="processor-badge processor-badge-{{ watch['processor'] }}" title="{{ processor_descriptions.get(watch['processor'], watch['processor']) }}">{{ processor_badge_texts[watch['processor']] }}</span>
                             {%- endif -%}
                             {%- for watch_tag_uuid, watch_tag in datastore.get_all_tags_for_watch(watch['uuid']).items() -%}
-                              <a href="{{url_for('watchlist.index', tag=watch_tag_uuid) }}" class="watch-tag-list tag-{{ watch_tag.title|sanitize_tag_class }}">{{ watch_tag.title }}</a>
+                              <span class="watch-tag-list tag-{{ watch_tag.title|sanitize_tag_class }}">{{ watch_tag.title }}</span>
                             {%- endfor -%}
                         </div>
                     <div class="status-icons">

changedetectionio/static/styles/scss/styles.scss

@@ -222,19 +222,6 @@ code {
   color: var(--color-white);
   background: var(--color-text-watch-tag-list);
   @extend .inline-tag;
-  
-  /* Remove default anchor styling when used as links */
-  text-decoration: none;
-  
-  &:hover {
-    text-decoration: none;
-    opacity: 0.8;
-    cursor: pointer;
-  }
-  
-  &:visited {
-    color: var(--color-white);
-  }
 }
 
 @media (min-width: 768px) {

changedetectionio/store/__init__.py

@@ -604,19 +604,6 @@ class ChangeDetectionStore(DatastoreUpdatesMixin, FileSavingDataStore):
 
             return None
 
-        # Check PAGE_WATCH_LIMIT if set
-        page_watch_limit = os.getenv('PAGE_WATCH_LIMIT')
-        if page_watch_limit:
-            try:
-                page_watch_limit = int(page_watch_limit)
-                current_watch_count = len(self.__data['watching'])
-                if current_watch_count >= page_watch_limit:
-                    logger.error(f"Watch limit reached: {current_watch_count}/{page_watch_limit} watches. Cannot add {url}")
-                    flash(gettext("Watch limit reached ({}/{} watches). Cannot add more watches.").format(current_watch_count, page_watch_limit), 'error')
-                    return None
-            except ValueError:
-                logger.warning(f"Invalid PAGE_WATCH_LIMIT value: {page_watch_limit}, ignoring limit check")
-
         if tag and type(tag) == str:
             # Then it's probably a string of the actual tag by name, split and add it
             for t in tag.split(','):

changedetectionio/store/file_saving_datastore.py

@@ -16,11 +16,11 @@ import os
 import tempfile
 import time
 from concurrent.futures import ThreadPoolExecutor, as_completed
+from distutils.util import strtobool
 from threading import Thread
 from loguru import logger
 
 from .base import DataStore
-from .. import strtobool
 
 # Try to import orjson for faster JSON serialization
 try:

changedetectionio/tests/test_api_notification_urls_validation.py

@@ -1,166 +0,0 @@
-#!/usr/bin/env python3
-
-"""
-Test notification_urls validation in Watch and Tag API endpoints.
-Ensures that invalid AppRise URLs are rejected when setting notification_urls.
-
-Valid AppRise notification URLs use specific protocols like:
-- posts://example.com - POST to HTTP endpoint
-- gets://example.com - GET to HTTP endpoint
-- mailto://user@example.com - Email
-- slack://token/channel - Slack
-- discord://webhook_id/webhook_token - Discord
-- etc.
-
-Invalid notification URLs:
-- https://example.com - Plain HTTPS is NOT a valid AppRise notification protocol
-- ftp://example.com - FTP is NOT a valid AppRise notification protocol
-- Plain URLs without proper AppRise protocol prefix
-"""
-
-from flask import url_for
-import json
-
-
-def test_watch_notification_urls_validation(client, live_server, measure_memory_usage, datastore_path):
-    """Test that Watch PUT/POST endpoints validate notification_urls."""
-    api_key = live_server.app.config['DATASTORE'].data['settings']['application'].get('api_access_token')
-
-    # Test 1: Create a watch with valid notification URLs
-    valid_urls = ["posts://example.com/notify1", "posts://example.com/notify2"]
-    res = client.post(
-        url_for("createwatch"),
-        data=json.dumps({
-            "url": "https://example.com",
-            "notification_urls": valid_urls
-        }),
-        headers={'content-type': 'application/json', 'x-api-key': api_key}
-    )
-    assert res.status_code == 201, "Should accept valid notification URLs on watch creation"
-    watch_uuid = res.json['uuid']
-
-    # Verify the notification URLs were saved
-    res = client.get(
-        url_for("watch", uuid=watch_uuid),
-        headers={'x-api-key': api_key}
-    )
-    assert res.status_code == 200
-    assert set(res.json['notification_urls']) == set(valid_urls), "Valid notification URLs should be saved"
-
-    # Test 2: Try to create a watch with invalid notification URLs (https:// is not valid)
-    invalid_urls = ["https://example.com/webhook"]
-    res = client.post(
-        url_for("createwatch"),
-        data=json.dumps({
-            "url": "https://example.com",
-            "notification_urls": invalid_urls
-        }),
-        headers={'content-type': 'application/json', 'x-api-key': api_key}
-    )
-    assert res.status_code == 400, "Should reject https:// notification URLs (not a valid AppRise protocol)"
-    assert b"is not a valid AppRise URL" in res.data, "Should provide AppRise validation error message"
-
-    # Test 2b: Also test other invalid protocols
-    invalid_urls_ftp = ["ftp://not-apprise-url"]
-    res = client.post(
-        url_for("createwatch"),
-        data=json.dumps({
-            "url": "https://example.com",
-            "notification_urls": invalid_urls_ftp
-        }),
-        headers={'content-type': 'application/json', 'x-api-key': api_key}
-    )
-    assert res.status_code == 400, "Should reject ftp:// notification URLs"
-    assert b"is not a valid AppRise URL" in res.data, "Should provide AppRise validation error message"
-
-    # Test 3: Update watch with valid notification URLs
-    new_valid_urls = ["posts://newserver.com"]
-    res = client.put(
-        url_for("watch", uuid=watch_uuid),
-        data=json.dumps({"notification_urls": new_valid_urls}),
-        headers={'content-type': 'application/json', 'x-api-key': api_key}
-    )
-    assert res.status_code == 200, "Should accept valid notification URLs on watch update"
-
-    # Verify the notification URLs were updated
-    res = client.get(
-        url_for("watch", uuid=watch_uuid),
-        headers={'x-api-key': api_key}
-    )
-    assert res.status_code == 200
-    assert res.json['notification_urls'] == new_valid_urls, "Valid notification URLs should be updated"
-
-    # Test 4: Try to update watch with invalid notification URLs (plain https:// not valid)
-    invalid_https_url = ["https://example.com/webhook"]
-    res = client.put(
-        url_for("watch", uuid=watch_uuid),
-        data=json.dumps({"notification_urls": invalid_https_url}),
-        headers={'content-type': 'application/json', 'x-api-key': api_key}
-    )
-    assert res.status_code == 400, "Should reject https:// notification URLs on watch update"
-    assert b"is not a valid AppRise URL" in res.data, "Should provide AppRise validation error message"
-
-    # Test 5: Update watch with non-list notification_urls (caught by OpenAPI schema validation)
-    res = client.put(
-        url_for("watch", uuid=watch_uuid),
-        data=json.dumps({"notification_urls": "not-a-list"}),
-        headers={'content-type': 'application/json', 'x-api-key': api_key}
-    )
-    assert res.status_code == 400, "Should reject non-list notification_urls"
-    assert b"OpenAPI validation failed" in res.data or b"Request body validation error" in res.data
-
-    # Test 6: Verify original URLs are preserved after failed update
-    res = client.get(
-        url_for("watch", uuid=watch_uuid),
-        headers={'x-api-key': api_key}
-    )
-    assert res.status_code == 200
-    assert res.json['notification_urls'] == new_valid_urls, "URLs should remain unchanged after validation failure"
-
-
-def test_tag_notification_urls_validation(client, live_server, measure_memory_usage, datastore_path):
-    """Test that Tag PUT endpoint validates notification_urls."""
-    from changedetectionio.model import Tag
-
-    api_key = live_server.app.config['DATASTORE'].data['settings']['application'].get('api_access_token')
-    datastore = live_server.app.config['DATASTORE']
-
-    # Create a tag
-    tag_uuid = datastore.add_tag(title="Test Tag")
-    assert tag_uuid is not None
-
-    # Test 1: Update tag with valid notification URLs
-    valid_urls = ["posts://example.com/tag-notify"]
-    res = client.put(
-        url_for("tag", uuid=tag_uuid),
-        data=json.dumps({"notification_urls": valid_urls}),
-        headers={'content-type': 'application/json', 'x-api-key': api_key}
-    )
-    assert res.status_code == 200, "Should accept valid notification URLs on tag update"
-
-    # Verify the notification URLs were saved
-    tag = datastore.data['settings']['application']['tags'][tag_uuid]
-    assert tag['notification_urls'] == valid_urls, "Valid notification URLs should be saved to tag"
-
-    # Test 2: Try to update tag with invalid notification URLs (https:// not valid)
-    invalid_urls = ["https://example.com/webhook"]
-    res = client.put(
-        url_for("tag", uuid=tag_uuid),
-        data=json.dumps({"notification_urls": invalid_urls}),
-        headers={'content-type': 'application/json', 'x-api-key': api_key}
-    )
-    assert res.status_code == 400, "Should reject https:// notification URLs on tag update"
-    assert b"is not a valid AppRise URL" in res.data, "Should provide AppRise validation error message"
-
-    # Test 3: Update tag with non-list notification_urls (caught by OpenAPI schema validation)
-    res = client.put(
-        url_for("tag", uuid=tag_uuid),
-        data=json.dumps({"notification_urls": "not-a-list"}),
-        headers={'content-type': 'application/json', 'x-api-key': api_key}
-    )
-    assert res.status_code == 400, "Should reject non-list notification_urls"
-    assert b"OpenAPI validation failed" in res.data or b"Request body validation error" in res.data
-
-    # Test 4: Verify original URLs are preserved after failed update
-    tag = datastore.data['settings']['application']['tags'][tag_uuid]
-    assert tag['notification_urls'] == valid_urls, "URLs should remain unchanged after validation failure"

changedetectionio/tests/util.py

@@ -144,7 +144,7 @@ def wait_for_all_checks(client=None):
     """
     from changedetectionio.flask_app import update_q as global_update_q
     from changedetectionio import worker_handler
-    time.sleep(0.05)
+
     # Use the shared wait logic from worker_handler
     return worker_handler.wait_for_all_checks(global_update_q, timeout=150)