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

Merge branch 'develop'

Browse Source
This commit is contained in:
Georg Krause
2023-01-26 11:54:22 +01:00
parent 7ad318bc48 8a8a725002
commit d4c754c103
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mastodon_blocklist_deploy/cli.py
View File

@@ -38,6 +38,9 @@ def load_blocklist_from_instance(server: str, token: str) -> [Instance]:
else: else:
raise ConnectionError(f"Could not connect to the server ({response.status_code}: {response.reason})") raise ConnectionError(f"Could not connect to the server ({response.status_code}: {response.reason})")
def remove_key_from_dict(dict, key):
del dict[key]
return dict
def cli(): def cli():
parser = argparse.ArgumentParser(description='Deploy blocklist updates to a mastodon server') parser = argparse.ArgumentParser(description='Deploy blocklist updates to a mastodon server')
@@ -92,10 +95,10 @@ def cli():
Instance.apply_blocks_from_diff(diffs, args.server, token, args.no_delete) Instance.apply_blocks_from_diff(diffs, args.server, token, args.no_delete)
elif args.action == "export": elif args.action == "export":
if not args.output: if not args.output:
print(toml.dumps({"instances": [b.__dict__ for b in remote_blocklist]})) print(toml.dumps({"instances": [remove_key_from_dict(b.__dict__, 'id') for b in remote_blocklist]}))
else: else:
with open(args.output, "w") as f: with open(args.output, "w") as f:
toml.dump({"instances": [b.__dict__ for b in remote_blocklist]}, f) toml.dump({"instances": [remove_key_from_dict(b.__dict__, 'id') for b in remote_blocklist]}, f)
if __name__ == "__main__": if __name__ == "__main__":

3
mastodon_blocklist_deploy/models.py
View File

@@ -38,7 +38,10 @@ class Instance:
self.reject_reports = instance_dict["reject_reports"] self.reject_reports = instance_dict["reject_reports"]
def parse_local_block(self, instance_dict): def parse_local_block(self, instance_dict):
try:
self.name = instance_dict["name"] self.name = instance_dict["name"]
except KeyError:
pass
self.domain = instance_dict["domain"] self.domain = instance_dict["domain"]
self.severity = instance_dict["severity"] self.severity = instance_dict["severity"]
self.public_comment = instance_dict["public_comment"] self.public_comment = instance_dict["public_comment"]