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

Block based on nickname

merge-requests/30/head
Bob Mottram 2023-04-29 11:14:21 +01:00
parent cec7114709
commit 21caca5a0c
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
inbox.py
View File

@ -97,6 +97,7 @@ from bookmarks import update_bookmarks_collection
from bookmarks import undo_bookmarks_collection_entry from bookmarks import undo_bookmarks_collection_entry
from blocking import is_blocked from blocking import is_blocked
from blocking import allowed_announce from blocking import allowed_announce
from blocking import is_blocked_nickname
from blocking import is_blocked_domain from blocking import is_blocked_domain
from blocking import broch_modeLapses from blocking import broch_modeLapses
from filters import is_filtered from filters import is_filtered
@ -705,6 +706,14 @@ def save_post_to_inbox_queue(base_dir: str, http_prefix: str,
reply_nickname = \ reply_nickname = \
get_nickname_from_actor(in_reply_to) get_nickname_from_actor(in_reply_to)
if reply_nickname and reply_domain: if reply_nickname and reply_domain:
if is_blocked_nickname(base_dir, reply_domain,
blocked_cache):
if debug:
print('WARN: post contains reply from ' +
str(actor) +
' to a blocked nickname: ' +
reply_nickname + '@' + reply_domain)
return None
if is_blocked(base_dir, nickname, domain, if is_blocked(base_dir, nickname, domain,
reply_nickname, reply_domain, reply_nickname, reply_domain,
blocked_cache): blocked_cache):
@ -2859,6 +2868,10 @@ def _receive_announce(recent_posts_cache: {},
if not actor_domain: if not actor_domain:
print('WARN: _receive_announce no actor_domain') print('WARN: _receive_announce no actor_domain')
return False return False
if is_blocked_nickname(base_dir, actor_nickname):
if debug:
print('DEBUG: announced nickname is blocked')
return False
if is_blocked(base_dir, nickname, domain, actor_nickname, actor_domain): if is_blocked(base_dir, nickname, domain, actor_nickname, actor_domain):
print('Receive announce blocked for actor: ' + print('Receive announce blocked for actor: ' +
actor_nickname + '@' + actor_domain) actor_nickname + '@' + actor_domain)