diff --git a/daemon.py b/daemon.py index bd728dd10..bb95a3a03 100644 --- a/daemon.py +++ b/daemon.py @@ -221,7 +221,7 @@ from webapp_suspended import html_suspended from webapp_tos import html_terms_of_service from webapp_confirm import html_confirm_follow from webapp_confirm import html_confirm_unfollow -from webapp_post import html_conversation_thread +from webapp_post import html_conversation_view from webapp_post import html_emoji_reaction_picker from webapp_post import html_post_replies from webapp_post import html_individual_post @@ -11834,34 +11834,34 @@ class PubServer(BaseHTTPRequestHandler): if self.server.bold_reading.get(nickname): bold_reading = True conv_str = \ - html_conversation_thread(post_id, self.server.translate, - base_dir, - http_prefix, - nickname, - domain, - self.server.project_version, - self.server.recent_posts_cache, - self.server.max_recent_posts, - curr_session, - self.server.cached_webfingers, - self.server.person_cache, - port, - 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, - timezone, bold_reading, - self.server.dogwhistles, - self.server.access_keys, - self.server.min_images_for_accounts, - self.server.debug) + html_conversation_view(post_id, self.server.translate, + base_dir, + http_prefix, + nickname, + domain, + self.server.project_version, + self.server.recent_posts_cache, + self.server.max_recent_posts, + curr_session, + self.server.cached_webfingers, + self.server.person_cache, + port, + 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, + timezone, bold_reading, + self.server.dogwhistles, + self.server.access_keys, + self.server.min_images_for_accounts, + self.server.debug) if conv_str: msg = conv_str.encode('utf-8') msglen = len(msg) diff --git a/webapp_post.py b/webapp_post.py index 75ff621d1..2450dfa2b 100644 --- a/webapp_post.py +++ b/webapp_post.py @@ -2924,32 +2924,32 @@ def html_emoji_reaction_picker(recent_posts_cache: {}, max_recent_posts: int, return header_str + reacted_to_post_str + emoji_picks_str + html_footer() -def html_conversation_thread(post_id: str, - translate: {}, base_dir: str, - http_prefix: str, - nickname: str, domain: str, - project_version: str, - recent_posts_cache: {}, - max_recent_posts: int, - session, - cached_webfingers, - person_cache: {}, - port: int, - 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: str, - timezone: str, bold_reading: bool, - dogwhistles: {}, access_keys: {}, - min_images_for_accounts: [], - debug: bool) -> str: +def html_conversation_view(post_id: str, + translate: {}, base_dir: str, + http_prefix: str, + nickname: str, domain: str, + project_version: str, + recent_posts_cache: {}, + max_recent_posts: int, + session, + cached_webfingers, + person_cache: {}, + port: int, + 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: str, + timezone: str, bold_reading: bool, + dogwhistles: {}, access_keys: {}, + min_images_for_accounts: [], + debug: bool) -> str: """Show a page containing a conversation thread """ conv_posts = \