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 2022-06-01 18:59:34 +01:00
parent df35c23e3a
commit 5cf3798ae3
2 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
daemon.py
View File

@ -9866,8 +9866,7 @@ class PubServer(BaseHTTPRequestHandler):
bold_reading = True bold_reading = True
msg = \ msg = \
html_emoji_reaction_picker(self.server.css_cache, html_emoji_reaction_picker(self.server.recent_posts_cache,
self.server.recent_posts_cache,
self.server.max_recent_posts, self.server.max_recent_posts,
self.server.translate, self.server.translate,
self.server.base_dir, self.server.base_dir,
@ -10670,8 +10669,7 @@ class PubServer(BaseHTTPRequestHandler):
if self.server.bold_reading.get(nickname): if self.server.bold_reading.get(nickname):
bold_reading = True bold_reading = True
msg = \ msg = \
html_post_replies(self.server.css_cache, html_post_replies(recent_posts_cache,
recent_posts_cache,
max_recent_posts, max_recent_posts,
translate, translate,
base_dir, base_dir,
@ -10775,8 +10773,7 @@ class PubServer(BaseHTTPRequestHandler):
if self.server.bold_reading.get(nickname): if self.server.bold_reading.get(nickname):
bold_reading = True bold_reading = True
msg = \ msg = \
html_post_replies(self.server.css_cache, html_post_replies(recent_posts_cache,
recent_posts_cache,
max_recent_posts, max_recent_posts,
translate, translate,
base_dir, base_dir,
@ -11386,8 +11383,7 @@ class PubServer(BaseHTTPRequestHandler):
bold_reading = True bold_reading = True
msg = \ msg = \
html_individual_post(self.server.css_cache, html_individual_post(self.server.recent_posts_cache,
self.server.recent_posts_cache,
self.server.max_recent_posts, self.server.max_recent_posts,
self.server.translate, self.server.translate,
base_dir, base_dir,

23
webapp_post.py
View File

@ -2272,16 +2272,15 @@ def individual_post_as_html(signing_priv_key_pem: str,
return post_html return post_html
def html_individual_post(css_cache: {}, def html_individual_post(recent_posts_cache: {}, max_recent_posts: int,
recent_posts_cache: {}, max_recent_posts: int,
translate: {}, translate: {},
base_dir: str, session, cached_webfingers: {}, base_dir: str, session, cached_webfingers: {},
person_cache: {}, person_cache: {},
nickname: str, domain: str, port: int, nickname: str, domain: str, port: int,
authorized: bool, authorized: bool,
post_json_object: {}, http_prefix: str, post_json_object: {}, http_prefix: str,
project_version: str, likedBy: str, project_version: str, liked_by: str,
reactBy: str, reactEmoji: str, react_by: str, react_emoji: str,
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,
@ -2299,13 +2298,13 @@ def html_individual_post(css_cache: {},
by_str = '' by_str = ''
by_text = '' by_text = ''
by_text_extra = '' by_text_extra = ''
if likedBy: if liked_by:
by_str = likedBy by_str = liked_by
by_text = 'Liked by' by_text = 'Liked by'
elif reactBy and reactEmoji: elif react_by and react_emoji:
by_str = reactBy by_str = react_by
by_text = 'Reaction by' by_text = 'Reaction by'
by_text_extra = ' ' + reactEmoji by_text_extra = ' ' + react_emoji
if by_str: if by_str:
by_str_nickname = get_nickname_from_actor(by_str) by_str_nickname = get_nickname_from_actor(by_str)
@ -2454,8 +2453,7 @@ def html_individual_post(css_cache: {},
return header_str + post_str + html_footer() return header_str + post_str + html_footer()
def html_post_replies(css_cache: {}, def html_post_replies(recent_posts_cache: {}, max_recent_posts: int,
recent_posts_cache: {}, max_recent_posts: int,
translate: {}, base_dir: str, translate: {}, base_dir: str,
session, cached_webfingers: {}, person_cache: {}, session, cached_webfingers: {}, person_cache: {},
nickname: str, domain: str, port: int, replies_json: {}, nickname: str, domain: str, port: int, replies_json: {},
@ -2509,8 +2507,7 @@ def html_post_replies(css_cache: {},
return header_str + replies_str + html_footer() return header_str + replies_str + html_footer()
def html_emoji_reaction_picker(css_cache: {}, def html_emoji_reaction_picker(recent_posts_cache: {}, max_recent_posts: int,
recent_posts_cache: {}, max_recent_posts: int,
translate: {}, translate: {},
base_dir: str, session, cached_webfingers: {}, base_dir: str, session, cached_webfingers: {},
person_cache: {}, person_cache: {},