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

Blocking nicknames at account level

merge-requests/30/head
Bob Mottram 2023-04-29 12:15:07 +01:00
parent 2cac4edfed
commit aa9b2fb1e4
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
blocking.py
View File

@ -646,7 +646,7 @@ def is_blocked_nickname(base_dir: str, nickname: str,
def is_blocked(base_dir: str, nickname: str, domain: str,
block_nickname: str, block_domain: str,
blocked_cache: [] = None) -> bool:
"""Is the given nickname blocked?
"""Is the given account blocked?
"""
if is_evil(block_domain):
return True
@ -694,6 +694,8 @@ def is_blocked(base_dir: str, nickname: str, domain: str,
# account level block list
blocking_filename = account_dir + '/blocking.txt'
if os.path.isfile(blocking_filename):
if text_in_file(block_nickname + '@*' + '\n', blocking_filename):
return True
if text_in_file('*@' + block_domain + '\n', blocking_filename):
return True
if block_handle: