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 2023-07-12 18:37:33 +01:00
parent 0f38b7a9ef
commit c8b31d56d2
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
inbox.py
View File

@ -1030,31 +1030,44 @@ def _inbox_post_recipients(base_dir: str, post_json_object: {},
def _receive_undo_follow(base_dir: str, message_json: {}, def _receive_undo_follow(base_dir: str, message_json: {},
debug: bool, domain: str, debug: bool, domain: str,
onion_domain: str, i2p_domain: str) -> bool: onion_domain: str, i2p_domain: str) -> bool:
"""
Receives an undo follow
{
"type": "Undo",
"actor": "https://some.instance/@someone",
"object": {
"type": "Follow",
"actor": "https://some.instance/@someone",
"object": "https://social.example/@somenickname"
}
}
"""
if not message_json['object'].get('actor'): if not message_json['object'].get('actor'):
if debug: if debug:
print('DEBUG: undo follow request has no actor within object') print('DEBUG: undo follow request has no actor within object')
return False return False
if not has_users_path(message_json['object']['actor']): actor = message_json['object']['actor']
if not has_users_path(actor):
if debug: if debug:
print('DEBUG: undo follow request "users" or "profile" missing ' + print('DEBUG: undo follow request "users" or "profile" missing ' +
'from actor within object') 'from actor within object')
return False return False
if message_json['object']['actor'] != message_json['actor']: if actor != message_json['actor']:
if debug: if debug:
print('DEBUG: undo follow request actors do not match') print('DEBUG: undo follow request actors do not match')
return False return False
nickname_follower = \ nickname_follower = \
get_nickname_from_actor(message_json['object']['actor']) get_nickname_from_actor(actor)
if not nickname_follower: if not nickname_follower:
print('WARN: undo follow request unable to find nickname in ' + print('WARN: undo follow request unable to find nickname in ' +
message_json['object']['actor']) actor)
return False return False
domain_follower, port_follower = \ domain_follower, port_follower = \
get_domain_from_actor(message_json['object']['actor']) get_domain_from_actor(actor)
if not domain_follower: if not domain_follower:
print('WARN: undo follow request unable to find domain in ' + print('WARN: undo follow request unable to find domain in ' +
message_json['object']['actor']) actor)
return False return False
domain_follower_full = get_full_domain(domain_follower, port_follower) domain_follower_full = get_full_domain(domain_follower, port_follower)
@ -1079,7 +1092,7 @@ def _receive_undo_follow(base_dir: str, message_json: {},
domain_following_full = get_full_domain(domain_following, port_following) domain_following_full = get_full_domain(domain_following, port_following)
group_account = \ group_account = \
has_group_type(base_dir, message_json['object']['actor'], None) has_group_type(base_dir, actor, None)
if unfollower_of_account(base_dir, if unfollower_of_account(base_dir,
nickname_following, domain_following_full, nickname_following, domain_following_full,
nickname_follower, domain_follower_full, nickname_follower, domain_follower_full,