List of strings

merge-requests/30/head
Bob Mottram 2023-08-23 13:14:03 +01:00
parent 57c3c19356
commit d5d620a428
1 changed files with 4 additions and 8 deletions

View File

@ -5300,7 +5300,6 @@ class PubServer(BaseHTTPRequestHandler):
store_person_in_cache(base_dir, actor, store_person_in_cache(base_dir, actor,
actor_json, actor_json,
person_cache, True) 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)
@ -17365,13 +17364,11 @@ class PubServer(BaseHTTPRequestHandler):
return return
# is the given shared item in the list? # is the given shared item in the list?
share_id = None share_id = None
for share_item in attached_shares: for share_href in attached_shares:
if not share_item.get('href'): if not isinstance(share_href, str):
continue continue
if not isinstance(share_item['href'], str): if share_href.endswith(self.path):
continue share_id = share_href.replace('://', '___')
if share_item['href'].endswith(self.path):
share_id = share_item['href'].replace('://', '___')
share_id = share_id.replace('/', '--') share_id = share_id.replace('/', '--')
break break
if not share_id: if not share_id:
@ -22596,7 +22593,6 @@ class PubServer(BaseHTTPRequestHandler):
store_person_in_cache(self.server.base_dir, actor, store_person_in_cache(self.server.base_dir, actor,
actor_json, person_cache, actor_json, person_cache,
True) True)
self.server.person_cache = person_cache
actor_filename = \ actor_filename = \
acct_dir(self.server.base_dir, acct_dir(self.server.base_dir,
nickname, nickname,