moanos/fediverse-blocklist-tool
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects 1 Releases Wiki Activity

Don't fetch remote blocklist when merging files

Browse Source
This commit is contained in:
moanos [he/him] 2023-07-13 11:35:32 +02:00
parent 3d0854ac4c
commit 626516e98c
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mastodon_blocklist_deploy/cli.py
View File

@ -120,12 +120,14 @@ def cli():
else: else:
token = os.getenv('MBD_TOKEN') token = os.getenv('MBD_TOKEN')
"""if there is a remote blocklist provided load this instead of fetching it from a server (for debugging reasons)""" """Get a remote blocklist only when necessary"""
if args.remote_blocklist: if args.action in ["diff", "deploy"]:
with open(args.remote_blocklist) as f: """if there is a remote blocklist provided load this instead of fetching it from a server (for debugging reasons)"""
remote_blocklist = blocklist_json_to_instances(json.load(f)) if args.remote_blocklist:
else: with open(args.remote_blocklist) as f:
remote_blocklist = load_blocklist_from_instance(server=args.server, token=token) remote_blocklist = blocklist_json_to_instances(json.load(f))
else:
remote_blocklist = load_blocklist_from_instance(server=args.server, token=token)
"""Load local blocklist only when needed""" """Load local blocklist only when needed"""
if args.action in ["diff", "deploy", "merge"]: if args.action in ["diff", "deploy", "merge"]: