merge-requests/30/head
Bob Mottram 2024-04-12 10:56:07 +01:00
parent ed647fb23d
commit fbb91fc8f1
2 changed files with 76 additions and 30 deletions

View File

@ -3402,10 +3402,34 @@ def daemon_http_get(self) -> None:
self.server.base_dir, self.server.base_dir,
self.server.http_prefix, self.server.http_prefix,
self.server.domain, self.server.domain,
self.server.domain_full,
self.server.port, self.server.port,
getreq_start_time, getreq_start_time,
cookie, self.server.debug, cookie, self.server.debug,
curr_session) curr_session,
self.server.onion_domain,
self.server.i2p_domain,
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.show_published_date_only,
self.server.peertube_instances,
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.getreq_busy = False self.server.getreq_busy = False
return return

View File

@ -20,9 +20,31 @@ from fitnessFunctions import fitness_performance
def reaction_picker2(self, calling_domain: str, path: str, def reaction_picker2(self, calling_domain: str, path: str,
base_dir: str, http_prefix: str, base_dir: str, http_prefix: str,
domain: str, port: int, domain: str, domain_full: str, port: int,
getreq_start_time, cookie: str, getreq_start_time, cookie: str,
debug: str, curr_session) -> None: debug: str, curr_session,
onion_domain: str, i2p_domain: str,
recent_posts_cache: {},
max_recent_posts: int,
translate: {},
cached_webfingers: {},
person_cache: {},
project_version: str,
yt_replace_domain: str,
twitter_replacement_domain: str,
show_published_date_only: bool,
peertube_instances: [],
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: {}) -> None:
"""Press the emoji reaction picker icon at the bottom of the post """Press the emoji reaction picker icon at the bottom of the post
""" """
page_number = 1 page_number = 1
@ -57,9 +79,9 @@ def reaction_picker2(self, calling_domain: str, path: str,
actor_absolute = \ actor_absolute = \
get_instance_url(calling_domain, get_instance_url(calling_domain,
http_prefix, http_prefix,
self.server.domain_full, domain_full,
self.server.onion_domain, onion_domain,
self.server.i2p_domain) + \ i2p_domain) + \
actor actor
actor_path_str = \ actor_path_str = \
actor_absolute + '/' + timeline_str + \ actor_absolute + '/' + timeline_str + \
@ -78,9 +100,9 @@ def reaction_picker2(self, calling_domain: str, path: str,
actor_absolute = \ actor_absolute = \
get_instance_url(calling_domain, get_instance_url(calling_domain,
http_prefix, http_prefix,
self.server.domain_full, domain_full,
self.server.onion_domain, onion_domain,
self.server.i2p_domain) + \ i2p_domain) + \
actor actor
actor_path_str = \ actor_path_str = \
actor_absolute + '/' + timeline_str + \ actor_absolute + '/' + timeline_str + \
@ -98,34 +120,34 @@ def reaction_picker2(self, calling_domain: str, path: str,
bold_reading = True bold_reading = True
msg = \ msg = \
html_emoji_reaction_picker(self.server.recent_posts_cache, html_emoji_reaction_picker(recent_posts_cache,
self.server.max_recent_posts, max_recent_posts,
self.server.translate, translate,
base_dir, base_dir,
curr_session, curr_session,
self.server.cached_webfingers, cached_webfingers,
self.server.person_cache, person_cache,
self.post_to_nickname, self.post_to_nickname,
domain, port, post_json_object, domain, port, post_json_object,
http_prefix, http_prefix,
self.server.project_version, project_version,
self.server.yt_replace_domain, yt_replace_domain,
self.server.twitter_replacement_domain, twitter_replacement_domain,
self.server.show_published_date_only, show_published_date_only,
self.server.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,
timeline_str, page_number, timeline_str, page_number,
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,