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

Global blocks of nicknames

merge-requests/30/head
Bob Mottram 2023-04-30 10:38:20 +01:00
parent 163f429575
commit 45f561c9ee
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
blocking.py
View File

@ -659,6 +659,9 @@ def is_blocked(base_dir: str, nickname: str, domain: str,
# instance level block list # instance level block list
if blocked_cache: if blocked_cache:
for blocked_str in blocked_cache: for blocked_str in blocked_cache:
if block_nickname:
if block_nickname + '@*' in blocked_str:
return True
if '*@' + domain in blocked_str: if '*@' + domain in blocked_str:
return True return True
if block_handle: if block_handle:
@ -667,6 +670,10 @@ def is_blocked(base_dir: str, nickname: str, domain: str,
else: else:
global_blocks_filename = base_dir + '/accounts/blocking.txt' global_blocks_filename = base_dir + '/accounts/blocking.txt'
if os.path.isfile(global_blocks_filename): if os.path.isfile(global_blocks_filename):
if block_nickname:
if text_in_file(block_nickname + '@*\n',
global_blocks_filename):
return True
if text_in_file('*@' + block_domain, global_blocks_filename): if text_in_file('*@' + block_domain, global_blocks_filename):
return True return True
if block_handle: if block_handle: