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

Get actor from file

main
Bob Mottram 2022-08-27 21:52:04 +01:00
parent 1b235f60ce
commit a04ff0e21c
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
daemon.py
View File

@ -816,15 +816,21 @@ class PubServer(BaseHTTPRequestHandler):
else: else:
return None return None
if calling_domain.endswith('.onion'): if calling_domain.endswith('.onion'):
actor = http_prefix + '://' + onion_domain + '/users/' + nickname actor = 'http://' + onion_domain + '/users/' + nickname
elif calling_domain.endswith('.i2p'): elif calling_domain.endswith('.i2p'):
actor = http_prefix + '://' + i2p_domain + '/users/' + nickname actor = 'http://' + i2p_domain + '/users/' + nickname
else: else:
actor = http_prefix + '://' + domain + '/users/' + nickname actor = http_prefix + '://' + domain + '/users/' + nickname
actor_json = \ actor_json = get_person_from_cache(base_dir, actor, person_cache)
get_person_from_cache(base_dir, actor, person_cache)
if not actor_json: if not actor_json:
return None actor_filename = acct_dir(base_dir, nickname, domain) + '.json'
if not os.path.isfile(actor_filename):
return None
actor_json = load_json(actor_filename)
if not actor_json:
return None
store_person_in_cache(base_dir, actor, actor_json,
person_cache, False)
if not actor_json.get('publicKey'): if not actor_json.get('publicKey'):
return None return None
return actor_json['publicKey'] return actor_json['publicKey']