diff --git a/changedetectionio/flask_app.py b/changedetectionio/flask_app.py index 16a0b806..02e041b1 100644 --- a/changedetectionio/flask_app.py +++ b/changedetectionio/flask_app.py @@ -339,7 +339,7 @@ def changedetection_app(config=None, datastore_o=None): # @todo needs a .itemsWithTag() or something - then we can use that in Jinaj2 and throw this away for uuid, watch in datastore.data['watching'].items(): # @todo tag notification_muted skip also (improve Watch model) - if watch.get('notification_muted'): + if datastore.data['settings']['application'].get('rss_hide_muted_watches') and watch.get('notification_muted'): continue if limit_tag and not limit_tag in watch['tags']: continue diff --git a/changedetectionio/forms.py b/changedetectionio/forms.py index 673be9ca..16720aa2 100644 --- a/changedetectionio/forms.py +++ b/changedetectionio/forms.py @@ -572,6 +572,8 @@ class globalSettingsApplicationForm(commonSettingsForm): removepassword_button = SubmitField('Remove password', render_kw={"class": "pure-button pure-button-primary"}) render_anchor_tag_content = BooleanField('Render anchor tag content', default=False) shared_diff_access = BooleanField('Allow access to view diff page when password is enabled', default=False, validators=[validators.Optional()]) + rss_hide_muted_watches = BooleanField('Hide muted watches from RSS feed', default=True, + validators=[validators.Optional()]) filter_failure_notification_threshold_attempts = IntegerField('Number of times the filter can be missing before sending a notification', render_kw={"style": "width: 5em;"}, validators=[validators.NumberRange(min=0, diff --git a/changedetectionio/model/App.py b/changedetectionio/model/App.py index 229ae2d7..e412542b 100644 --- a/changedetectionio/model/App.py +++ b/changedetectionio/model/App.py @@ -47,6 +47,7 @@ class model(dict): 'password': False, 'render_anchor_tag_content': False, 'rss_access_token': None, + 'rss_hide_muted_watches': True, 'schema_version' : 0, 'shared_diff_access': False, 'webdriver_delay': None , # Extra delay in seconds before extracting text diff --git a/changedetectionio/templates/settings.html b/changedetectionio/templates/settings.html index 0e3cea34..1212def0 100644 --- a/changedetectionio/templates/settings.html +++ b/changedetectionio/templates/settings.html @@ -62,6 +62,9 @@
+