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

Avoid confusing terminology

merge-requests/30/head
Bob Mottram 2022-12-28 09:37:43 +00:00
parent 3b145a7ac4
commit e3abcd99fe
2 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
daemon.py
View File

@ -221,7 +221,7 @@ from webapp_suspended import html_suspended
from webapp_tos import html_terms_of_service from webapp_tos import html_terms_of_service
from webapp_confirm import html_confirm_follow from webapp_confirm import html_confirm_follow
from webapp_confirm import html_confirm_unfollow 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_emoji_reaction_picker
from webapp_post import html_post_replies from webapp_post import html_post_replies
from webapp_post import html_individual_post from webapp_post import html_individual_post
@ -11834,34 +11834,34 @@ class PubServer(BaseHTTPRequestHandler):
if self.server.bold_reading.get(nickname): if self.server.bold_reading.get(nickname):
bold_reading = True bold_reading = True
conv_str = \ conv_str = \
html_conversation_thread(post_id, self.server.translate, html_conversation_view(post_id, self.server.translate,
base_dir, base_dir,
http_prefix, http_prefix,
nickname, nickname,
domain, domain,
self.server.project_version, self.server.project_version,
self.server.recent_posts_cache, self.server.recent_posts_cache,
self.server.max_recent_posts, self.server.max_recent_posts,
curr_session, curr_session,
self.server.cached_webfingers, self.server.cached_webfingers,
self.server.person_cache, self.server.person_cache,
port, port,
self.server.yt_replace_domain, self.server.yt_replace_domain,
self.server.twitter_replacement_domain, self.server.twitter_replacement_domain,
self.server.show_published_date_only, self.server.show_published_date_only,
self.server.peertube_instances, self.server.peertube_instances,
self.server.allow_local_network_access, self.server.allow_local_network_access,
self.server.theme_name, self.server.theme_name,
self.server.system_language, self.server.system_language,
self.server.max_like_count, self.server.max_like_count,
self.server.signing_priv_key_pem, self.server.signing_priv_key_pem,
self.server.cw_lists, self.server.cw_lists,
self.server.lists_enabled, self.server.lists_enabled,
timezone, bold_reading, timezone, bold_reading,
self.server.dogwhistles, self.server.dogwhistles,
self.server.access_keys, self.server.access_keys,
self.server.min_images_for_accounts, self.server.min_images_for_accounts,
self.server.debug) self.server.debug)
if conv_str: if conv_str:
msg = conv_str.encode('utf-8') msg = conv_str.encode('utf-8')
msglen = len(msg) msglen = len(msg)

52
webapp_post.py
View File

@ -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() return header_str + reacted_to_post_str + emoji_picks_str + html_footer()
def html_conversation_thread(post_id: str, def html_conversation_view(post_id: str,
translate: {}, base_dir: str, translate: {}, base_dir: str,
http_prefix: str, http_prefix: str,
nickname: str, domain: str, nickname: str, domain: str,
project_version: str, project_version: str,
recent_posts_cache: {}, recent_posts_cache: {},
max_recent_posts: int, max_recent_posts: int,
session, session,
cached_webfingers, cached_webfingers,
person_cache: {}, person_cache: {},
port: int, port: int,
yt_replace_domain: str, yt_replace_domain: str,
twitter_replacement_domain: str, twitter_replacement_domain: str,
show_published_date_only: bool, show_published_date_only: bool,
peertube_instances: [], peertube_instances: [],
allow_local_network_access: bool, allow_local_network_access: bool,
theme_name: str, theme_name: str,
system_language: str, system_language: str,
max_like_count: int, max_like_count: int,
signing_priv_key_pem: str, signing_priv_key_pem: str,
cw_lists: {}, cw_lists: {},
lists_enabled: str, lists_enabled: str,
timezone: str, bold_reading: bool, timezone: str, bold_reading: bool,
dogwhistles: {}, access_keys: {}, dogwhistles: {}, access_keys: {},
min_images_for_accounts: [], min_images_for_accounts: [],
debug: bool) -> str: debug: bool) -> str:
"""Show a page containing a conversation thread """Show a page containing a conversation thread
""" """
conv_posts = \ conv_posts = \