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

Tidying

merge-requests/30/head
Bob Mottram 2022-05-30 13:09:18 +01:00
parent 26e0cb8385
commit 57a606f04d
1 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
inbox.py
View File

@ -710,16 +710,16 @@ def save_post_to_inbox_queue(base_dir: str, http_prefix: str,
return filename return filename
def _inbox_post_recipients_add(base_dir: str, http_prefix: str, toList: [], def _inbox_post_recipients_add(base_dir: str, http_prefix: str, to_list: [],
recipients_dict: {}, recipients_dict: {},
domain_match: str, domain: str, domain_match: str, domain: str,
actor: str, debug: bool, actor: str, debug: bool,
onion_domain: str, i2p_domain: str) -> bool: onion_domain: str, i2p_domain: str) -> bool:
"""Given a list of post recipients (toList) from 'to' or 'cc' parameters """Given a list of post recipients (to_list) from 'to' or 'cc' parameters
populate a recipients_dict with the handle for each populate a recipients_dict with the handle for each
""" """
follower_recipients = False follower_recipients = False
for recipient in toList: for recipient in to_list:
if not recipient: if not recipient:
continue continue
# if the recipient is an onion or i2p address then # if the recipient is an onion or i2p address then
@ -750,7 +750,7 @@ def _inbox_post_recipients_add(base_dir: str, http_prefix: str, toList: [],
else: else:
print('DEBUG: ' + recipient + ' is not local to ' + print('DEBUG: ' + recipient + ' is not local to ' +
domain_match) domain_match)
print(str(toList)) print(str(to_list))
if recipient.endswith('followers'): if recipient.endswith('followers'):
if debug: if debug:
print('DEBUG: followers detected as post recipients') print('DEBUG: followers detected as post recipients')
@ -2251,12 +2251,11 @@ def _receive_announce(recent_posts_cache: {},
if not announced_actor_nickname: if not announced_actor_nickname:
print('WARN: _receive_announce no announced_actor_nickname') print('WARN: _receive_announce no announced_actor_nickname')
return False return False
announcedActorDomain, announcedActorPort = \ announced_actor_domain, _ = get_domain_from_actor(message_json['object'])
get_domain_from_actor(message_json['object'])
if is_blocked(base_dir, nickname, domain, if is_blocked(base_dir, nickname, domain,
announced_actor_nickname, announcedActorDomain): announced_actor_nickname, announced_actor_domain):
print('Receive announce object blocked for actor: ' + print('Receive announce object blocked for actor: ' +
announced_actor_nickname + '@' + announcedActorDomain) announced_actor_nickname + '@' + announced_actor_domain)
return False return False
# is this post in the outbox of the person? # is this post in the outbox of the person?
@ -2770,7 +2769,7 @@ def _dm_notify(base_dir: str, handle: str, url: str) -> None:
def _already_liked(base_dir: str, nickname: str, domain: str, def _already_liked(base_dir: str, nickname: str, domain: str,
post_url: str, likerActor: str) -> bool: post_url: str, liker_actor: str) -> bool:
"""Is the given post already liked by the given handle? """Is the given post already liked by the given handle?
""" """
post_filename = \ post_filename = \
@ -2793,7 +2792,7 @@ def _already_liked(base_dir: str, nickname: str, domain: str,
continue continue
if like['type'] != 'Like': if like['type'] != 'Like':
continue continue
if like['actor'] == likerActor: if like['actor'] == liker_actor:
return True return True
return False return False
@ -4496,8 +4495,7 @@ def _inbox_quota_exceeded(queue: {}, queue_filename: str,
if quotas_per_min['accounts'].get(post_handle): if quotas_per_min['accounts'].get(post_handle):
account_max_posts_per_min = \ account_max_posts_per_min = \
int(account_max_posts_per_day / (24 * 60)) int(account_max_posts_per_day / (24 * 60))
if account_max_posts_per_min < 5: account_max_posts_per_min = max(account_max_posts_per_min, 5)
account_max_posts_per_min = 5
if quotas_per_min['accounts'][post_handle] > \ if quotas_per_min['accounts'][post_handle] > \
account_max_posts_per_min: account_max_posts_per_min:
print('Queue: Quota account posts per min -' + print('Queue: Quota account posts per min -' +
@ -4824,7 +4822,7 @@ def _receive_follow_request(session, session_onion, session_i2p,
else: else:
followers_file.write('!' + approve_handle + followers_file.write('!' + approve_handle +
'\n' + content) '\n' + content)
except Exception as ex: except OSError as ex:
print('WARN: ' + print('WARN: ' +
'Failed to write entry to followers file ' + 'Failed to write entry to followers file ' +
str(ex)) str(ex))
@ -5227,7 +5225,7 @@ def run_inbox_queue(server,
debug) debug)
inbox_start_time = time.time() inbox_start_time = time.time()
continue continue
else:
if http_signature_failed: if http_signature_failed:
print('jsonld inbox signature check success ' + print('jsonld inbox signature check success ' +
'via relay ' + key_id) 'via relay ' + key_id)
@ -5294,7 +5292,7 @@ def run_inbox_queue(server,
debug) debug)
inbox_start_time = time.time() inbox_start_time = time.time()
continue continue
else:
if debug: if debug:
print('DEBUG: No follow requests') print('DEBUG: No follow requests')