oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ignore invalid shared filters

Browse source
This commit is contained in:
shortcutme 2019-04-19 02:37:27 +02:00
parent 719df4ac88
commit 7e78fbc16e
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
plugins/ContentFilter/ContentFilterPlugin.py
View file

@ -145,7 +145,14 @@ class UiWebsocketPlugin(object):
include_site = filter_storage.site_manager.get(include["address"]) include_site = filter_storage.site_manager.get(include["address"])
if not include_site: if not include_site:
continue continue
content = include_site.storage.loadJson(include["inner_path"]) try:
content = include_site.storage.loadJson(include["inner_path"])
include["error"] = None
except Exception as err:
if include_site.settings["own"]:
include_site.log.warning("Error loading filter %s: %s" % (include["inner_path"], err))
content = {}
include["error"] = str(err)
include["mutes"] = content.get("mutes", {}) include["mutes"] = content.get("mutes", {})
include["siteblocks"] = content.get("siteblocks", {}) include["siteblocks"] = content.get("siteblocks", {})
back.append(include) back.append(include)