main
Bob Mottram 2022-02-28 16:19:26 +00:00
parent 79151137a7
commit 23a2fb8cf5
1 changed files with 11 additions and 12 deletions

View File

@ -738,21 +738,19 @@ def followed_account_accepts(session, base_dir: str, http_prefix: str,
accept_handle = nickname + '@' + domain accept_handle = nickname + '@' + domain
# send accept back # send accept back
if debug: print('Sending follow Accept activity for ' +
print('DEBUG: sending Accept activity for ' + 'follow request which arrived at ' +
'follow request which arrived at ' + nickname_to_follow + '@' + domain_to_follow +
nickname_to_follow + '@' + domain_to_follow + ' back to ' + accept_handle)
' back to ' + accept_handle)
accept_json = create_accept(base_dir, federation_list, accept_json = create_accept(base_dir, federation_list,
nickname_to_follow, domain_to_follow, port, nickname_to_follow, domain_to_follow, port,
person_url, '', http_prefix, person_url, '', http_prefix,
follow_json) follow_json)
if debug: pprint(accept_json)
pprint(accept_json) print('DEBUG: sending follow Accept from ' +
print('DEBUG: sending follow Accept from ' + nickname_to_follow + '@' + domain_to_follow +
nickname_to_follow + '@' + domain_to_follow + ' port ' + str(port) + ' to ' +
' port ' + str(port) + ' to ' + accept_handle + ' port ' + str(from_port))
accept_handle + ' port ' + str(from_port))
client_to_server = False client_to_server = False
if removeFollowActivity: if removeFollowActivity:
@ -765,7 +763,8 @@ def followed_account_accepts(session, base_dir: str, http_prefix: str,
try: try:
os.remove(follow_activity_filename) os.remove(follow_activity_filename)
except OSError: except OSError:
print('EX: followed_account_accepts unable to delete ' + print('EX: follow Accept ' +
'followed_account_accepts unable to delete ' +
follow_activity_filename) follow_activity_filename)
group_account = False group_account = False