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

Block reasons on hashtags

merge-requests/30/head
Bob Mottram 2022-11-23 16:04:17 +00:00
parent 1e94bbcc78
commit ef9d5fc570
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
daemon.py
View File

@ -2638,6 +2638,9 @@ class PubServer(BaseHTTPRequestHandler):
full_block_domain = \ full_block_domain = \
moderation_domain.strip() moderation_domain.strip()
if full_block_domain or nickname.startswith('#'): if full_block_domain or nickname.startswith('#'):
if nickname.startswith('#') and ' ' in nickname:
nickname = nickname.split(' ')[0]
moderation_reason = nickname.split(' ', 1)[0]
add_global_block(base_dir, nickname, add_global_block(base_dir, nickname,
full_block_domain, moderation_reason) full_block_domain, moderation_reason)
if moderation_button == 'unblock': if moderation_button == 'unblock':
@ -2664,6 +2667,8 @@ class PubServer(BaseHTTPRequestHandler):
nickname = '*' nickname = '*'
full_block_domain = moderation_domain.strip() full_block_domain = moderation_domain.strip()
if full_block_domain or nickname.startswith('#'): if full_block_domain or nickname.startswith('#'):
if nickname.startswith('#') and ' ' in nickname:
nickname = nickname.split(' ')[0]
remove_global_block(base_dir, nickname, remove_global_block(base_dir, nickname,
full_block_domain) full_block_domain)
if moderation_button == 'remove': if moderation_button == 'remove':