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

Improve support for federated blocks

main
Bob Mottram 2024-02-11 13:07:55 +00:00
parent 0e35ee7f18
commit 16d98f5fe3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
posts.py
View File

@ -5851,7 +5851,8 @@ def download_announce(session, base_dir: str, http_prefix: str,
actor_url) actor_url)
return None return None
if is_blocked(base_dir, nickname, domain, if is_blocked(base_dir, nickname, domain,
actor_nickname, actor_domain): actor_nickname, actor_domain,
None, block_federated):
print('Announce download blocked actor: ' + print('Announce download blocked actor: ' +
actor_nickname + '@' + actor_domain) actor_nickname + '@' + actor_domain)
return None return None
@ -5864,7 +5865,7 @@ def download_announce(session, base_dir: str, http_prefix: str,
str(post_json_object['object'])) str(post_json_object['object']))
return None return None
if is_blocked(base_dir, nickname, domain, object_nickname, if is_blocked(base_dir, nickname, domain, object_nickname,
object_domain): object_domain, None, block_federated):
if object_nickname and object_domain: if object_nickname and object_domain:
print('Announce download blocked handle: ' + print('Announce download blocked handle: ' +
object_nickname + '@' + object_domain) object_nickname + '@' + object_domain)
@ -6097,7 +6098,8 @@ def download_announce(session, base_dir: str, http_prefix: str,
attributed_domain = \ attributed_domain = \
get_full_domain(attributed_domain, attributed_port) get_full_domain(attributed_domain, attributed_port)
if is_blocked(base_dir, nickname, domain, if is_blocked(base_dir, nickname, domain,
attributed_nickname, attributed_domain): attributed_nickname, attributed_domain,
None, block_federated):
print('WARN: announced post handle is blocked ' + print('WARN: announced post handle is blocked ' +
str(attributed_nickname) + '@' + attributed_domain) str(attributed_nickname) + '@' + attributed_domain)
_reject_announce(announce_filename, _reject_announce(announce_filename,