From 0fca58810a71c0a1dc2952450919af8d686a84fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian-Samuel=20Geb=C3=BChr?= Date: Thu, 12 Jan 2023 16:22:03 +0100 Subject: [PATCH] feat: Allow token via environment variables --- mastodon_blocklist_deploy/cli.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/mastodon_blocklist_deploy/cli.py b/mastodon_blocklist_deploy/cli.py index c7d5607..d8ccaee 100644 --- a/mastodon_blocklist_deploy/cli.py +++ b/mastodon_blocklist_deploy/cli.py @@ -3,7 +3,7 @@ import argparse import json import logging import requests - +import os import toml from mastodon_blocklist_deploy.models import Instance @@ -76,12 +76,19 @@ def cli(): else: logging.basicConfig(level=logging.WARN) + if args.token: + token = args.token + else: + token = os.getenv('MBD_TOKEN') + + + """if there is a remote blocklist provided load this instead of fetching it from a server (for debugging reasons)""" if args.remote_blocklist: with open(args.remote_blocklist) as f: remote_blocklist = blocklist_json_to_instances(json.load(f)) else: - remote_blocklist = load_blocklist_from_instance(server=args.server, token=args.token) + remote_blocklist = load_blocklist_from_instance(server=args.server, token=token) """Load local blocklist only when needed""" if args.action in ["diff", "deploy"]: @@ -95,7 +102,7 @@ def cli(): Instance.show_diffs(local_blocklist, remote_blocklist) elif args.action == "deploy": diffs = Instance.list_diffs(local_blocklist, remote_blocklist) - Instance.apply_blocks_from_diff(diffs, args.server, args.token, args.no_delete) + Instance.apply_blocks_from_diff(diffs, args.server, token, args.no_delete) elif args.action == "export": if not args.output: print("Export currently requires to pass --output as well")