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-12 19:17:58 +01:00
parent 63a55bc5bd
commit 8ae8753735
2 changed files with 96 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
daemon_get.py
View File

@ -3987,7 +3987,33 @@ def daemon_http_get(self) -> None:
getreq_start_time, getreq_start_time,
proxy_type, cookie, proxy_type, cookie,
self.server.debug, self.server.debug,
curr_session): curr_session,
self.server.recent_posts_cache,
self.server.max_recent_posts,
self.server.translate,
self.server.cached_webfingers,
self.server.person_cache,
self.server.project_version,
self.server.yt_replace_domain,
self.server.twitter_replacement_domain,
self.server.peertube_instances,
self.server.account_timezone,
self.server.bold_reading,
self.server.show_published_date_only,
self.server.allow_local_network_access,
self.server.theme_name,
self.server.system_language,
self.server.max_like_count,
self.server.signing_priv_key_pem,
self.server.cw_lists,
self.server.lists_enabled,
self.server.dogwhistles,
self.server.min_images_for_accounts,
self.server.buy_sites,
self.server.auto_cw_cache,
self.server.fitness,
self.server.onion_domain,
self.server.i2p_domain):
self.server.getreq_busy = False self.server.getreq_busy = False
return return

132
daemon_get_post.py
View File

@ -748,7 +748,33 @@ def show_replies_to_post(self, authorized: bool,
domain: str, domain_full: str, port: int, domain: str, domain_full: str, port: int,
getreq_start_time, getreq_start_time,
proxy_type: str, cookie: str, proxy_type: str, cookie: str,
debug: str, curr_session) -> bool: debug: str, curr_session,
recent_posts_cache: {},
max_recent_posts: int,
translate: {},
cached_webfingers: {},
person_cache: {},
project_version: str,
yt_replace_domain: str,
twitter_replacement_domain: str,
peertube_instances: [],
account_timezone: {},
bold_reading_nicknames: {},
show_published_date_only: bool,
allow_local_network_access: bool,
theme_name: str,
system_language: str,
max_like_count: int,
signing_priv_key_pem: str,
cw_lists: {},
lists_enabled: {},
dogwhistles: {},
min_images_for_accounts: bool,
buy_sites: [],
auto_cw_cache: {},
fitness: {},
onion_domain: str,
i2p_domain: str) -> bool:
"""Shows the replies to a post """Shows the replies to a post
""" """
if not ('/statuses/' in path and '/users/' in path): if not ('/statuses/' in path and '/users/' in path):
@ -812,22 +838,12 @@ def show_replies_to_post(self, authorized: bool,
if not curr_session: if not curr_session:
http_404(self, 61) http_404(self, 61)
return True return True
recent_posts_cache = self.server.recent_posts_cache yt_domain = yt_replace_domain
max_recent_posts = self.server.max_recent_posts
translate = self.server.translate
cached_webfingers = self.server.cached_webfingers
person_cache = self.server.person_cache
project_version = self.server.project_version
yt_domain = self.server.yt_replace_domain
twitter_replacement_domain = \
self.server.twitter_replacement_domain
peertube_instances = self.server.peertube_instances
timezone = None timezone = None
if self.server.account_timezone.get(nickname): if account_timezone.get(nickname):
timezone = \ timezone = account_timezone.get(nickname)
self.server.account_timezone.get(nickname)
bold_reading = False bold_reading = False
if self.server.bold_reading.get(nickname): if bold_reading_nicknames.get(nickname):
bold_reading = True bold_reading = True
msg = \ msg = \
html_post_replies(recent_posts_cache, html_post_replies(recent_posts_cache,
@ -845,38 +861,38 @@ def show_replies_to_post(self, authorized: bool,
project_version, project_version,
yt_domain, yt_domain,
twitter_replacement_domain, twitter_replacement_domain,
self.server.show_published_date_only, show_published_date_only,
peertube_instances, peertube_instances,
self.server.allow_local_network_access, allow_local_network_access,
self.server.theme_name, theme_name,
self.server.system_language, system_language,
self.server.max_like_count, max_like_count,
self.server.signing_priv_key_pem, signing_priv_key_pem,
self.server.cw_lists, cw_lists,
self.server.lists_enabled, lists_enabled,
timezone, bold_reading, timezone, bold_reading,
self.server.dogwhistles, dogwhistles,
self.server.min_images_for_accounts, min_images_for_accounts,
self.server.buy_sites, buy_sites,
self.server.auto_cw_cache) auto_cw_cache)
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
msglen = len(msg) msglen = len(msg)
set_headers(self, 'text/html', msglen, set_headers(self, 'text/html', msglen,
cookie, calling_domain, False) cookie, calling_domain, False)
write2(self, msg) write2(self, msg)
fitness_performance(getreq_start_time, self.server.fitness, fitness_performance(getreq_start_time, fitness,
'_GET', 'show_replies_to_post', '_GET', 'show_replies_to_post',
debug) debug)
else: else:
if secure_mode(curr_session, proxy_type, False, if secure_mode(curr_session, proxy_type, False,
self.server, self.headers, self.path): self.server, self.headers, path):
msg_str = json.dumps(replies_json, ensure_ascii=False) msg_str = json.dumps(replies_json, ensure_ascii=False)
msg_str = convert_domains(calling_domain, msg_str = convert_domains(calling_domain,
referer_domain, referer_domain,
msg_str, http_prefix, msg_str, http_prefix,
domain, domain,
self.server.onion_domain, onion_domain,
self.server.i2p_domain) i2p_domain)
msg = msg_str.encode('utf-8') msg = msg_str.encode('utf-8')
protocol_str = \ protocol_str = \
get_json_content_from_accept(self.headers['Accept']) get_json_content_from_accept(self.headers['Accept'])
@ -884,7 +900,7 @@ def show_replies_to_post(self, authorized: bool,
set_headers(self, protocol_str, msglen, None, set_headers(self, protocol_str, msglen, None,
calling_domain, False) calling_domain, False)
write2(self, msg) write2(self, msg)
fitness_performance(getreq_start_time, self.server.fitness, fitness_performance(getreq_start_time, fitness,
'_GET', 'show_replies_to_post json', '_GET', 'show_replies_to_post json',
debug) debug)
else: else:
@ -933,22 +949,12 @@ def show_replies_to_post(self, authorized: bool,
if not curr_session: if not curr_session:
http_404(self, 63) http_404(self, 63)
return True return True
recent_posts_cache = self.server.recent_posts_cache yt_domain = yt_replace_domain
max_recent_posts = self.server.max_recent_posts
translate = self.server.translate
cached_webfingers = self.server.cached_webfingers
person_cache = self.server.person_cache
project_version = self.server.project_version
yt_domain = self.server.yt_replace_domain
twitter_replacement_domain = \
self.server.twitter_replacement_domain
peertube_instances = self.server.peertube_instances
timezone = None timezone = None
if self.server.account_timezone.get(nickname): if account_timezone.get(nickname):
timezone = \ timezone = account_timezone.get(nickname)
self.server.account_timezone.get(nickname)
bold_reading = False bold_reading = False
if self.server.bold_reading.get(nickname): if bold_reading_nicknames.get(nickname):
bold_reading = True bold_reading = True
msg = \ msg = \
html_post_replies(recent_posts_cache, html_post_replies(recent_posts_cache,
@ -966,38 +972,38 @@ def show_replies_to_post(self, authorized: bool,
project_version, project_version,
yt_domain, yt_domain,
twitter_replacement_domain, twitter_replacement_domain,
self.server.show_published_date_only, show_published_date_only,
peertube_instances, peertube_instances,
self.server.allow_local_network_access, allow_local_network_access,
self.server.theme_name, theme_name,
self.server.system_language, system_language,
self.server.max_like_count, max_like_count,
self.server.signing_priv_key_pem, signing_priv_key_pem,
self.server.cw_lists, cw_lists,
self.server.lists_enabled, lists_enabled,
timezone, bold_reading, timezone, bold_reading,
self.server.dogwhistles, dogwhistles,
self.server.min_images_for_accounts, min_images_for_accounts,
self.server.buy_sites, buy_sites,
self.server.auto_cw_cache) auto_cw_cache)
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
msglen = len(msg) msglen = len(msg)
set_headers(self, 'text/html', msglen, set_headers(self, 'text/html', msglen,
cookie, calling_domain, False) cookie, calling_domain, False)
write2(self, msg) write2(self, msg)
fitness_performance(getreq_start_time, self.server.fitness, fitness_performance(getreq_start_time, fitness,
'_GET', 'show_replies_to_post', '_GET', 'show_replies_to_post',
debug) debug)
else: else:
if secure_mode(curr_session, proxy_type, False, if secure_mode(curr_session, proxy_type, False,
self.server, self.headers, self.path): self.server, self.headers, path):
msg_str = json.dumps(replies_json, ensure_ascii=False) msg_str = json.dumps(replies_json, ensure_ascii=False)
msg_str = convert_domains(calling_domain, msg_str = convert_domains(calling_domain,
referer_domain, referer_domain,
msg_str, http_prefix, msg_str, http_prefix,
domain, domain,
self.server.onion_domain, onion_domain,
self.server.i2p_domain) i2p_domain)
msg = msg_str.encode('utf-8') msg = msg_str.encode('utf-8')
protocol_str = \ protocol_str = \
get_json_content_from_accept(self.headers['Accept']) get_json_content_from_accept(self.headers['Accept'])
@ -1005,7 +1011,7 @@ def show_replies_to_post(self, authorized: bool,
set_headers(self, protocol_str, msglen, set_headers(self, protocol_str, msglen,
None, calling_domain, False) None, calling_domain, False)
write2(self, msg) write2(self, msg)
fitness_performance(getreq_start_time, self.server.fitness, fitness_performance(getreq_start_time, fitness,
'_GET', 'show_replies_to_post json', '_GET', 'show_replies_to_post json',
debug) debug)
else: else: