indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Try other fields to obtain block strings

merge-requests/30/head
Bob Mottram 2024-02-10 12:21:18 +00:00
parent ca0ffdbd6b
commit 0e82d56cd0
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
blocking.py
View File

@ -1933,26 +1933,31 @@ def _update_federated_blocks(session, base_dir: str,
# a simple list of strings containing handles # a simple list of strings containing handles
# or domains # or domains
handle = block_dict handle = block_dict
if handle.startswith('@'):
handle = handle[1:]
if _valid_blocklist_entry(handle): if _valid_blocklist_entry(handle):
new_block_api_str += handle + '\n' if handle not in new_block_api_str:
new_block_api_str += handle + '\n'
if handle not in block_federated: if handle not in block_federated:
block_federated.append(handle) block_federated.append(handle)
continue continue
if not isinstance(block_dict, dict): if not isinstance(block_dict, dict):
continue continue
if not block_dict.get('username'): for block_fieldname in ('username', 'domain'):
continue if not block_dict.get(block_fieldname):
if not isinstance(block_dict['username'], str): continue
continue if not isinstance(block_dict[block_fieldname], str):
handle = block_dict['username'] continue
if handle.startswith('@'): handle = block_dict[block_fieldname]
handle = handle[1:] if handle.startswith('@'):
if not _valid_blocklist_entry(handle): handle = handle[1:]
continue if not _valid_blocklist_entry(handle):
new_block_api_str += handle + '\n' continue
if handle not in block_federated: if handle not in new_block_api_str:
block_federated.append(handle) new_block_api_str += handle + '\n'
if handle not in block_federated:
block_federated.append(handle)
block_api_filename = \ block_api_filename = \
base_dir + '/accounts/block_api.txt' base_dir + '/accounts/block_api.txt'