Self-Hosted
/
changedetection.io
mirror of https://github.com/dgtlmoon/changedetection.io.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'test-tidy' into playwright-fetch-store-headers-always

Browse Source
pull/2143/head
dgtlmoon 11 months ago
parent e08bd6e279 d8fbf4fbda
commit 88973b7408
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File

11
changedetectionio/flask_app.py
Unescape View File

@ -13,7 +13,6 @@ from threading import Event
import datetime import datetime
import flask_login import flask_login
from loguru import logger from loguru import logger
import sys
import os import os
import pytz import pytz
import queue import queue
@ -317,6 +316,8 @@ def changedetection_app(config=None, datastore_o=None):
@app.route("/rss", methods=['GET']) @app.route("/rss", methods=['GET'])
def rss(): def rss():
from jinja2 import Environment, BaseLoader
jinja2_env = Environment(loader=BaseLoader)
now = time.time() now = time.time()
# Always requires token set # Always requires token set
app_rss_token = datastore.data['settings']['application'].get('rss_access_token') app_rss_token = datastore.data['settings']['application'].get('rss_access_token')
@ -381,8 +382,12 @@ def changedetection_app(config=None, datastore_o=None):
include_equal=False, include_equal=False,
line_feed_sep="<br>") line_feed_sep="<br>")
fe.content(content="<html><body><h4>{}</h4>{}</body></html>".format(watch_title, html_diff), # @todo Make this configurable and also consider html-colored markup
type='CDATA') # @todo User could decide if <link> goes to the diff page, or to the watch link
rss_template = "<html><body>\n<h4><a href=\"{{watch_url}}\">{{watch_title}}</a></h4>\n<p>{{html_diff}}</p>\n</body></html>\n"
content = jinja2_env.from_string(rss_template).render(watch_title=watch_title, html_diff=html_diff, watch_url=watch.link)
fe.content(content=content, type='CDATA')
fe.guid(guid, permalink=False) fe.guid(guid, permalink=False)
dt = datetime.datetime.fromtimestamp(int(watch.newest_history_key)) dt = datetime.datetime.fromtimestamp(int(watch.newest_history_key))

4
changedetectionio/notification.py
Unescape View File

@ -152,6 +152,10 @@ def process_notification(n_object, datastore):
with apprise.LogCapture(level=apprise.logging.DEBUG) as logs: with apprise.LogCapture(level=apprise.logging.DEBUG) as logs:
for url in n_object['notification_urls']: for url in n_object['notification_urls']:
url = url.strip() url = url.strip()
if not url:
logger.warning(f"Process Notification: skipping empty notification URL.")
continue
logger.info(">> Process Notification: AppRise notifying {}".format(url)) logger.info(">> Process Notification: AppRise notifying {}".format(url))
url = jinja2_env.from_string(url).render(**notification_parameters) url = jinja2_env.from_string(url).render(**notification_parameters)

Write Preview
Loading…
Cancel
Save