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

Use federated blocks for domains

merge-requests/30/head
Bob Mottram 2024-02-09 21:34:06 +00:00
parent 2ba05bc7ae
commit 99d61bf31a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
inbox.py
View File

@ -3140,7 +3140,8 @@ def _receive_announce(recent_posts_cache: {},
min_images_for_accounts: [], min_images_for_accounts: [],
buy_sites: {}, buy_sites: {},
languages_understood: [], languages_understood: [],
auto_cw_cache: {}) -> bool: auto_cw_cache: {},
block_federated: []) -> bool:
"""Receives an announce activity within the POST section of HTTPServer """Receives an announce activity within the POST section of HTTPServer
""" """
if message_json['type'] != 'Announce': if message_json['type'] != 'Announce':
@ -3185,7 +3186,7 @@ def _receive_announce(recent_posts_cache: {},
object_domain = object_domain.replace(prefix, '') object_domain = object_domain.replace(prefix, '')
if '/' in object_domain: if '/' in object_domain:
object_domain = object_domain.split('/')[0] object_domain = object_domain.split('/')[0]
if is_blocked_domain(base_dir, object_domain): if is_blocked_domain(base_dir, object_domain, None, block_federated):
if debug: if debug:
print('DEBUG: announced domain is blocked') print('DEBUG: announced domain is blocked')
return False return False
@ -4963,7 +4964,8 @@ def _inbox_after_initial(server, inbox_start_time,
server.min_images_for_accounts, server.min_images_for_accounts,
server.buy_sites, server.buy_sites,
languages_understood, languages_understood,
server.auto_cw_cache): server.auto_cw_cache,
server.block_federated):
if debug: if debug:
print('DEBUG: Announce accepted from ' + actor) print('DEBUG: Announce accepted from ' + actor)
fitness_performance(inbox_start_time, server.fitness, fitness_performance(inbox_start_time, server.fitness,