Load loacl actor

merge-requests/30/head
Bob Mottram 2023-08-23 13:06:05 +01:00
parent c7ec441e90
commit 57c3c19356
1 changed files with 46 additions and 22 deletions

View File

@ -5282,16 +5282,28 @@ class PubServer(BaseHTTPRequestHandler):
person_cache = self.server.person_cache person_cache = self.server.person_cache
actor_json = get_person_from_cache(base_dir, actor_json = get_person_from_cache(base_dir,
actor, person_cache) actor, person_cache)
if add_shares_to_actor(base_dir, if not actor_json:
share_nickname, share_domain, actor_filename = \
actor_json, acct_dir(base_dir, share_nickname,
self.server.max_shares_on_profile): share_domain) + '.json'
remove_person_from_cache(base_dir, actor, person_cache) if os.path.isfile(actor_filename):
store_person_in_cache(base_dir, actor, actor_json = load_json(actor_filename, 1, 1)
actor_json, person_cache, True) if actor_json:
actor_filename = acct_dir(base_dir, share_nickname, max_shares_on_profile = \
share_domain) + '.json' self.server.max_shares_on_profile
save_json(actor_json, actor_filename) if add_shares_to_actor(base_dir,
share_nickname, share_domain,
actor_json,
max_shares_on_profile):
remove_person_from_cache(base_dir, actor,
person_cache)
store_person_in_cache(base_dir, actor,
actor_json,
person_cache, True)
self.server.person_cache = person_cache
actor_filename = acct_dir(base_dir, share_nickname,
share_domain) + '.json'
save_json(actor_json, actor_filename)
if calling_domain.endswith('.onion') and onion_domain: if calling_domain.endswith('.onion') and onion_domain:
origin_path_str = 'http://' + onion_domain + users_path origin_path_str = 'http://' + onion_domain + users_path
@ -22566,18 +22578,30 @@ class PubServer(BaseHTTPRequestHandler):
person_cache = self.server.person_cache person_cache = self.server.person_cache
actor_json = get_person_from_cache(self.server.base_dir, actor_json = get_person_from_cache(self.server.base_dir,
actor, person_cache) actor, person_cache)
if add_shares_to_actor(self.server.base_dir, if not actor_json:
nickname, self.server.domain, actor_filename = \
actor_json, acct_dir(self.server.base_dir, nickname,
self.server.max_shares_on_profile): self.server.domain) + '.json'
remove_person_from_cache(self.server.base_dir, actor, if os.path.isfile(actor_filename):
person_cache) actor_json = load_json(actor_filename, 1, 1)
store_person_in_cache(self.server.base_dir, actor, if actor_json:
actor_json, person_cache, True) max_shares_on_profile = \
actor_filename = acct_dir(self.server.base_dir, self.server.max_shares_on_profile
nickname, if add_shares_to_actor(self.server.base_dir,
self.server.domain) + '.json' nickname, self.server.domain,
save_json(actor_json, actor_filename) actor_json,
max_shares_on_profile):
remove_person_from_cache(self.server.base_dir,
actor, person_cache)
store_person_in_cache(self.server.base_dir, actor,
actor_json, person_cache,
True)
self.server.person_cache = person_cache
actor_filename = \
acct_dir(self.server.base_dir,
nickname,
self.server.domain) + '.json'
save_json(actor_json, actor_filename)
if filename: if filename:
if os.path.isfile(filename): if os.path.isfile(filename):