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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
daemon.py
View File

@ -5282,13 +5282,25 @@ 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 not actor_json:
actor_filename = \
acct_dir(base_dir, share_nickname,
share_domain) + '.json'
if os.path.isfile(actor_filename):
actor_json = load_json(actor_filename, 1, 1)
if actor_json:
max_shares_on_profile = \
self.server.max_shares_on_profile
if add_shares_to_actor(base_dir, if add_shares_to_actor(base_dir,
share_nickname, share_domain, share_nickname, share_domain,
actor_json, actor_json,
self.server.max_shares_on_profile): max_shares_on_profile):
remove_person_from_cache(base_dir, actor, person_cache) remove_person_from_cache(base_dir, actor,
person_cache)
store_person_in_cache(base_dir, actor, store_person_in_cache(base_dir, actor,
actor_json, person_cache, True) actor_json,
person_cache, True)
self.server.person_cache = person_cache
actor_filename = acct_dir(base_dir, share_nickname, actor_filename = acct_dir(base_dir, share_nickname,
share_domain) + '.json' share_domain) + '.json'
save_json(actor_json, actor_filename) save_json(actor_json, actor_filename)
@ -22566,15 +22578,27 @@ 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 not actor_json:
actor_filename = \
acct_dir(self.server.base_dir, nickname,
self.server.domain) + '.json'
if os.path.isfile(actor_filename):
actor_json = load_json(actor_filename, 1, 1)
if actor_json:
max_shares_on_profile = \
self.server.max_shares_on_profile
if add_shares_to_actor(self.server.base_dir, if add_shares_to_actor(self.server.base_dir,
nickname, self.server.domain, nickname, self.server.domain,
actor_json, actor_json,
self.server.max_shares_on_profile): max_shares_on_profile):
remove_person_from_cache(self.server.base_dir, actor, remove_person_from_cache(self.server.base_dir,
person_cache) actor, person_cache)
store_person_in_cache(self.server.base_dir, actor, store_person_in_cache(self.server.base_dir, actor,
actor_json, person_cache, True) actor_json, person_cache,
actor_filename = acct_dir(self.server.base_dir, True)
self.server.person_cache = person_cache
actor_filename = \
acct_dir(self.server.base_dir,
nickname, nickname,
self.server.domain) + '.json' self.server.domain) + '.json'
save_json(actor_json, actor_filename) save_json(actor_json, actor_filename)