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

Tidying

merge-requests/30/head
Bob Mottram 2024-04-13 12:59:32 +01:00
parent 95fe071622
commit 94c95bc1af
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
daemon_post_search.py
View File

@ -430,10 +430,8 @@ def receive_search_query(self, calling_domain: str, cookie: str,
curr_session = self.server.session_i2p curr_session = self.server.session_i2p
curr_session = \ curr_session = \
establish_session("handle search", establish_session("handle search", curr_session,
curr_session, curr_proxy_type, self.server)
curr_proxy_type,
self.server)
if not curr_session: if not curr_session:
self.server.postreq_busy = False self.server.postreq_busy = False
return return
@ -442,16 +440,14 @@ def receive_search_query(self, calling_domain: str, cookie: str,
avatar_url = \ avatar_url = \
get_avatar_image_url(curr_session, get_avatar_image_url(curr_session,
base_dir, http_prefix, base_dir, http_prefix,
actor, actor, person_cache,
person_cache,
None, True, None, True,
signing_priv_key_pem) signing_priv_key_pem)
profile_path_str += \ profile_path_str += \
'?options=' + actor + ';1;' + avatar_url '?options=' + actor + ';1;' + avatar_url
show_person_options(self, calling_domain, profile_path_str, show_person_options(self, calling_domain, profile_path_str,
base_dir, base_dir, domain, domain_full,
domain, domain_full,
getreq_start_time, getreq_start_time,
cookie, debug, authorized, cookie, debug, authorized,
curr_session) curr_session)
@ -478,10 +474,8 @@ def receive_search_query(self, calling_domain: str, cookie: str,
curr_session = self.server.session_i2p curr_session = self.server.session_i2p
curr_session = \ curr_session = \
establish_session("handle search", establish_session("handle search", curr_session,
curr_session, curr_proxy_type, self.server)
curr_proxy_type,
self.server)
if not curr_session: if not curr_session:
self.server.postreq_busy = False self.server.postreq_busy = False
return return
@ -593,17 +587,14 @@ def receive_search_query(self, calling_domain: str, cookie: str,
# shared items search # shared items search
nickname = get_nickname_from_actor(actor_str) nickname = get_nickname_from_actor(actor_str)
shared_items_str = \ shared_items_str = \
html_search_shared_items(translate, html_search_shared_items(translate, base_dir,
base_dir,
search_str, page_number, search_str, page_number,
max_posts_in_feed, max_posts_in_feed,
http_prefix, http_prefix, domain_full,
domain_full,
actor_str, calling_domain, actor_str, calling_domain,
shared_items_federated_domains, shared_items_federated_domains,
'shares', nickname, domain, 'shares', nickname, domain,
theme_name, theme_name, access_keys)
access_keys)
if shared_items_str: if shared_items_str:
msg = shared_items_str.encode('utf-8') msg = shared_items_str.encode('utf-8')
msglen = len(msg) msglen = len(msg)