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:45:59 +01:00
parent 2fdfe4ed5a
commit df35c23e3a
8 changed files with 56 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
daemon.py
View File

@ -3835,8 +3835,7 @@ class PubServer(BaseHTTPRequestHandler):
if self.server.bold_reading.get(nickname): if self.server.bold_reading.get(nickname):
bold_reading = True bold_reading = True
hashtag_str = \ hashtag_str = \
html_hashtag_search(self.server.css_cache, html_hashtag_search(nickname, domain, port,
nickname, domain, port,
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,
@ -3881,10 +3880,8 @@ class PubServer(BaseHTTPRequestHandler):
search_str = search_str.replace('*', '').strip() search_str = search_str.replace('*', '').strip()
skill_str = \ skill_str = \
html_skills_search(actor_str, html_skills_search(actor_str,
self.server.css_cache,
self.server.translate, self.server.translate,
base_dir, base_dir,
http_prefix,
search_str, search_str,
self.server.instance_only_skills_search, self.server.instance_only_skills_search,
64) 64)
@ -3940,8 +3937,7 @@ class PubServer(BaseHTTPRequestHandler):
if self.server.bold_reading.get(nickname): if self.server.bold_reading.get(nickname):
bold_reading = True bold_reading = True
history_str = \ history_str = \
html_history_search(self.server.css_cache, html_history_search(self.server.translate,
self.server.translate,
base_dir, base_dir,
http_prefix, http_prefix,
nickname, nickname,
@ -4021,8 +4017,7 @@ class PubServer(BaseHTTPRequestHandler):
if self.server.bold_reading.get(nickname): if self.server.bold_reading.get(nickname):
bold_reading = True bold_reading = True
bookmarks_str = \ bookmarks_str = \
html_history_search(self.server.css_cache, html_history_search(self.server.translate,
self.server.translate,
base_dir, base_dir,
http_prefix, http_prefix,
nickname, nickname,
@ -4187,8 +4182,7 @@ class PubServer(BaseHTTPRequestHandler):
bold_reading = True bold_reading = True
profile_str = \ profile_str = \
html_profile_after_search(self.server.css_cache, html_profile_after_search(recent_posts_cache,
recent_posts_cache,
self.server.max_recent_posts, self.server.max_recent_posts,
self.server.translate, self.server.translate,
base_dir, base_dir,
@ -4243,10 +4237,8 @@ class PubServer(BaseHTTPRequestHandler):
search_str.replace(' emoji', '') search_str.replace(' emoji', '')
# emoji search # emoji search
emoji_str = \ emoji_str = \
html_search_emoji(self.server.css_cache, html_search_emoji(self.server.translate,
self.server.translate,
base_dir, base_dir,
http_prefix,
search_str) search_str)
if emoji_str: if emoji_str:
msg = emoji_str.encode('utf-8') msg = emoji_str.encode('utf-8')
@ -4261,8 +4253,7 @@ class PubServer(BaseHTTPRequestHandler):
shared_items_federated_domains = \ shared_items_federated_domains = \
self.server.shared_items_federated_domains self.server.shared_items_federated_domains
wanted_items_str = \ wanted_items_str = \
html_search_shared_items(self.server.css_cache, html_search_shared_items(self.server.translate,
self.server.translate,
base_dir, base_dir,
search_str[1:], page_number, search_str[1:], page_number,
MAX_POSTS_IN_FEED, MAX_POSTS_IN_FEED,
@ -4284,8 +4275,7 @@ class PubServer(BaseHTTPRequestHandler):
shared_items_federated_domains = \ shared_items_federated_domains = \
self.server.shared_items_federated_domains self.server.shared_items_federated_domains
shared_items_str = \ shared_items_str = \
html_search_shared_items(self.server.css_cache, html_search_shared_items(self.server.translate,
self.server.translate,
base_dir, base_dir,
search_str, page_number, search_str, page_number,
MAX_POSTS_IN_FEED, MAX_POSTS_IN_FEED,
@ -8353,7 +8343,7 @@ class PubServer(BaseHTTPRequestHandler):
hashtag = urllib.parse.unquote_plus(hashtag) hashtag = urllib.parse.unquote_plus(hashtag)
if is_blocked_hashtag(base_dir, hashtag): if is_blocked_hashtag(base_dir, hashtag):
print('BLOCK: hashtag #' + hashtag) print('BLOCK: hashtag #' + hashtag)
msg = html_hashtag_blocked(self.server.css_cache, base_dir, msg = html_hashtag_blocked(base_dir,
self.server.translate).encode('utf-8') self.server.translate).encode('utf-8')
msglen = len(msg) msglen = len(msg)
self._login_headers('text/html', msglen, calling_domain) self._login_headers('text/html', msglen, calling_domain)
@ -8374,8 +8364,7 @@ class PubServer(BaseHTTPRequestHandler):
if self.server.bold_reading.get(nickname): if self.server.bold_reading.get(nickname):
bold_reading = True bold_reading = True
hashtag_str = \ hashtag_str = \
html_hashtag_search(self.server.css_cache, html_hashtag_search(nickname, domain, port,
nickname, domain, port,
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,
@ -16226,17 +16215,14 @@ class PubServer(BaseHTTPRequestHandler):
if self.path.startswith('/terms'): if self.path.startswith('/terms'):
if calling_domain.endswith('.onion') and \ if calling_domain.endswith('.onion') and \
self.server.onion_domain: self.server.onion_domain:
msg = html_terms_of_service(self.server.css_cache, msg = html_terms_of_service(self.server.base_dir, 'http',
self.server.base_dir, 'http',
self.server.onion_domain) self.server.onion_domain)
elif (calling_domain.endswith('.i2p') and elif (calling_domain.endswith('.i2p') and
self.server.i2p_domain): self.server.i2p_domain):
msg = html_terms_of_service(self.server.css_cache, msg = html_terms_of_service(self.server.base_dir, 'http',
self.server.base_dir, 'http',
self.server.i2p_domain) self.server.i2p_domain)
else: else:
msg = html_terms_of_service(self.server.css_cache, msg = html_terms_of_service(self.server.base_dir,
self.server.base_dir,
self.server.http_prefix, self.server.http_prefix,
self.server.domain_full) self.server.domain_full)
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
@ -16265,8 +16251,7 @@ class PubServer(BaseHTTPRequestHandler):
if not os.path.isfile(following_filename): if not os.path.isfile(following_filename):
self._404() self._404()
return return
msg = html_following_list(self.server.css_cache, msg = html_following_list(self.server.base_dir, following_filename)
self.server.base_dir, following_filename)
msglen = len(msg) msglen = len(msg)
self._login_headers('text/html', msglen, calling_domain) self._login_headers('text/html', msglen, calling_domain)
self._write(msg.encode('utf-8')) self._write(msg.encode('utf-8'))
@ -16435,9 +16420,6 @@ class PubServer(BaseHTTPRequestHandler):
self.server.domain): self.server.domain):
msg = \ msg = \
html_welcome_final(self.server.base_dir, nickname, html_welcome_final(self.server.base_dir, nickname,
self.server.domain,
self.server.http_prefix,
self.server.domain_full,
self.server.system_language, self.server.system_language,
self.server.translate, self.server.translate,
self.server.theme_name) self.server.theme_name)
@ -17016,8 +16998,7 @@ class PubServer(BaseHTTPRequestHandler):
access_keys = self.server.key_shortcuts[nickname] access_keys = self.server.key_shortcuts[nickname]
# show the search screen # show the search screen
msg = html_search(self.server.css_cache, msg = html_search(self.server.translate,
self.server.translate,
self.server.base_dir, self.path, self.server.base_dir, self.path,
self.server.domain, self.server.domain,
self.server.default_timeline, self.server.default_timeline,
@ -17171,8 +17152,7 @@ class PubServer(BaseHTTPRequestHandler):
if self.path.endswith('/searchemoji'): if self.path.endswith('/searchemoji'):
# show the search screen # show the search screen
msg = \ msg = \
html_search_emoji_text_entry(self.server.css_cache, html_search_emoji_text_entry(self.server.translate,
self.server.translate,
self.server.base_dir, self.server.base_dir,
self.path).encode('utf-8') self.path).encode('utf-8')
msglen = len(msg) msglen = len(msg)

10
webapp_post.py
View File

@ -813,8 +813,7 @@ def _get_bookmark_icon_html(nickname: str, domain_full: str,
return bookmark_str return bookmark_str
def _get_reaction_icon_html(nickname: str, domain_full: str, def _get_reaction_icon_html(nickname: str, post_json_object: {},
post_json_object: {},
is_moderation_post: bool, is_moderation_post: bool,
show_reaction_button: bool, show_reaction_button: bool,
translate: {}, translate: {},
@ -1900,8 +1899,7 @@ def individual_post_as_html(signing_priv_key_pem: str,
_log_post_timing(enable_timing_log, post_start_time, '12.9') _log_post_timing(enable_timing_log, post_start_time, '12.9')
reaction_str = \ reaction_str = \
_get_reaction_icon_html(nickname, domain_full, _get_reaction_icon_html(nickname, post_json_object,
post_json_object,
is_moderation_post, is_moderation_post,
show_reaction_button, show_reaction_button,
translate, translate,
@ -2135,7 +2133,7 @@ def individual_post_as_html(signing_priv_key_pem: str,
content_str = add_embedded_elements(translate, content_str, content_str = add_embedded_elements(translate, content_str,
peertube_instances) peertube_instances)
content_str = insert_question(base_dir, translate, content_str = insert_question(base_dir, translate,
nickname, domain, port, nickname, domain,
content_str, post_json_object, content_str, post_json_object,
page_number) page_number)
else: else:
@ -2157,7 +2155,7 @@ def individual_post_as_html(signing_priv_key_pem: str,
cw_content_str = add_embedded_elements(translate, cw_content_str, cw_content_str = add_embedded_elements(translate, cw_content_str,
peertube_instances) peertube_instances)
cw_content_str = \ cw_content_str = \
insert_question(base_dir, translate, nickname, domain, port, insert_question(base_dir, translate, nickname, domain,
cw_content_str, post_json_object, page_number) cw_content_str, post_json_object, page_number)
cw_content_str = \ cw_content_str = \
switch_words(base_dir, nickname, domain, cw_content_str) switch_words(base_dir, nickname, domain, cw_content_str)

45
webapp_profile.py
View File

@ -126,8 +126,7 @@ def _valid_profile_preview_post(post_json_object: {},
return True, post_json_object return True, post_json_object
def html_profile_after_search(css_cache: {}, def html_profile_after_search(recent_posts_cache: {}, max_recent_posts: int,
recent_posts_cache: {}, max_recent_posts: int,
translate: {}, translate: {},
base_dir: str, path: str, http_prefix: str, base_dir: str, path: str, http_prefix: str,
nickname: str, domain: str, port: int, nickname: str, domain: str, port: int,
@ -283,8 +282,7 @@ def html_profile_after_search(css_cache: {},
joined_date = profile_json['published'] joined_date = profile_json['published']
profile_str = \ profile_str = \
_get_profile_header_after_search(base_dir, _get_profile_header_after_search(nickname, default_timeline,
nickname, default_timeline,
search_nickname, search_nickname,
search_domain_full, search_domain_full,
translate, translate,
@ -401,12 +399,10 @@ def html_profile_after_search(css_cache: {},
profile_str + html_footer() profile_str + html_footer()
def _get_profile_header(base_dir: str, http_prefix: str, def _get_profile_header(http_prefix: str, nickname: str,
nickname: str, domain: str,
domain_full: str, translate: {}, domain_full: str, translate: {},
default_timeline: str, default_timeline: str,
display_name: str, display_name: str,
avatar_description: str,
profile_description_short: str, profile_description_short: str,
login_button: str, avatar_url: str, login_button: str, avatar_url: str,
theme: str, moved_to: str, theme: str, moved_to: str,
@ -506,8 +502,7 @@ def _get_profile_header(base_dir: str, http_prefix: str,
return html_str return html_str
def _get_profile_header_after_search(base_dir: str, def _get_profile_header_after_search(nickname: str, default_timeline: str,
nickname: str, default_timeline: str,
search_nickname: str, search_nickname: str,
search_domain_full: str, search_domain_full: str,
translate: {}, translate: {},
@ -899,11 +894,10 @@ def html_profile(signing_priv_key_pem: str,
pinned_content = pin_file.read() pinned_content = pin_file.read()
profile_header_str = \ profile_header_str = \
_get_profile_header(base_dir, http_prefix, _get_profile_header(http_prefix,
nickname, domain, nickname,
domain_full, translate, domain_full, translate,
default_timeline, display_name, default_timeline, display_name,
avatar_description,
profile_description_short, profile_description_short,
login_button, avatar_url, theme, login_button, avatar_url, theme,
moved_to, also_known_as, moved_to, also_known_as,
@ -1040,7 +1034,7 @@ def html_profile(signing_priv_key_pem: str,
profile_str += \ profile_str += \
_html_profile_following(translate, base_dir, http_prefix, _html_profile_following(translate, base_dir, http_prefix,
authorized, nickname, authorized, nickname,
domain, port, session, domain, session,
cached_webfingers, cached_webfingers,
person_cache, extra_json, person_cache, extra_json,
project_version, ["unfollow"], project_version, ["unfollow"],
@ -1053,7 +1047,7 @@ def html_profile(signing_priv_key_pem: str,
profile_str += \ profile_str += \
_html_profile_following(translate, base_dir, http_prefix, _html_profile_following(translate, base_dir, http_prefix,
authorized, nickname, authorized, nickname,
domain, port, session, domain, session,
cached_webfingers, cached_webfingers,
person_cache, extra_json, person_cache, extra_json,
project_version, ["block"], project_version, ["block"],
@ -1067,17 +1061,16 @@ def html_profile(signing_priv_key_pem: str,
extra_json) extra_json)
elif selected == 'skills': elif selected == 'skills':
profile_str += \ profile_str += \
_html_profile_skills(translate, nickname, domain_full, _html_profile_skills(extra_json)
extra_json)
# elif selected == 'shares': # elif selected == 'shares':
# profile_str += \ # profile_str += \
# _html_profile_shares(actor, translate, # _html_profile_shares(actor, translate,
# nickname, domain_full, # domain_full,
# extra_json, 'shares') + license_str # extra_json, 'shares') + license_str
# elif selected == 'wanted': # elif selected == 'wanted':
# profile_str += \ # profile_str += \
# _html_profile_shares(actor, translate, # _html_profile_shares(actor, translate,
# nickname, domain_full, # domain_full,
# extra_json, 'wanted') + license_str # extra_json, 'wanted') + license_str
# end of #timeline # end of #timeline
profile_str += '</div>' profile_str += '</div>'
@ -1169,8 +1162,7 @@ def _html_profile_posts(recent_posts_cache: {}, max_recent_posts: int,
def _html_profile_following(translate: {}, base_dir: str, http_prefix: str, def _html_profile_following(translate: {}, base_dir: str, http_prefix: str,
authorized: bool, authorized: bool, nickname: str, domain: str,
nickname: str, domain: str, port: int,
session, cached_webfingers: {}, person_cache: {}, session, cached_webfingers: {}, person_cache: {},
following_json: {}, project_version: str, following_json: {}, project_version: str,
buttons: [], buttons: [],
@ -1252,12 +1244,11 @@ def _html_profile_roles(translate: {}, nickname: str, domain: str,
return profile_str return profile_str
def _html_profile_skills(translate: {}, nickname: str, domain: str, def _html_profile_skills(skills_json: {}) -> str:
skillsJson: {}) -> str:
"""Shows skills on the profile screen """Shows skills on the profile screen
""" """
profile_str = '' profile_str = ''
for skill, level in skillsJson.items(): for skill, level in skills_json.items():
profile_str += \ profile_str += \
'<div>' + skill + \ '<div>' + skill + \
'<br><div id="myProgress"><div id="myBar" style="width:' + \ '<br><div id="myProgress"><div id="myBar" style="width:' + \
@ -1269,7 +1260,7 @@ def _html_profile_skills(translate: {}, nickname: str, domain: str,
def _html_profile_shares(actor: str, translate: {}, def _html_profile_shares(actor: str, translate: {},
nickname: str, domain: str, shares_json: {}, domain: str, shares_json: {},
shares_file_type: str) -> str: shares_file_type: str) -> str:
"""Shows shares on the profile screen """Shows shares on the profile screen
""" """
@ -1556,8 +1547,7 @@ def _html_edit_profile_instance(base_dir: str, translate: {},
libretranslate_url = get_config_param(base_dir, 'libretranslateUrl') libretranslate_url = get_config_param(base_dir, 'libretranslateUrl')
libretranslate_api_key = get_config_param(base_dir, 'libretranslateApiKey') libretranslate_api_key = get_config_param(base_dir, 'libretranslateApiKey')
libretranslate_str = \ libretranslate_str = \
_html_edit_profile_libre_translate(translate, _html_edit_profile_libre_translate(libretranslate_url,
libretranslate_url,
libretranslate_api_key) libretranslate_api_key)
return instance_str, role_assign_str, peertube_str, libretranslate_str return instance_str, role_assign_str, peertube_str, libretranslate_str
@ -1907,8 +1897,7 @@ def _html_edit_profile_change_password(translate: {}) -> str:
return edit_profile_form return edit_profile_form
def _html_edit_profile_libre_translate(translate: {}, def _html_edit_profile_libre_translate(libretranslate_url: str,
libretranslate_url: str,
libretranslate_api_key: str) -> str: libretranslate_api_key: str) -> str:
"""Change automatic translation settings """Change automatic translation settings
""" """

3
webapp_question.py
View File

@ -14,8 +14,7 @@ from utils import acct_dir
def insert_question(base_dir: str, translate: {}, def insert_question(base_dir: str, translate: {},
nickname: str, domain: str, port: int, nickname: str, domain: str, content: str,
content: str,
post_json_object: {}, page_number: int) -> str: post_json_object: {}, page_number: int) -> str:
""" Inserts question selection into a post """ Inserts question selection into a post
""" """

20
webapp_search.py
View File

@ -42,9 +42,7 @@ from webapp_post import individual_post_as_html
from webapp_hashtagswarm import html_hash_tag_swarm from webapp_hashtagswarm import html_hash_tag_swarm
def html_search_emoji(css_cache: {}, translate: {}, def html_search_emoji(translate: {}, base_dir: str, search_str: str) -> str:
base_dir: str, http_prefix: str,
search_str: str) -> str:
"""Search results for emoji """Search results for emoji
""" """
# emoji.json is generated so that it can be customized and the changes # emoji.json is generated so that it can be customized and the changes
@ -221,7 +219,7 @@ def _html_shares_result(base_dir: str, shares_json: {}, page_number: int,
return results_exist, curr_page, ctr, shared_items_form return results_exist, curr_page, ctr, shared_items_form
def html_search_shared_items(css_cache: {}, translate: {}, def html_search_shared_items(translate: {},
base_dir: str, search_str: str, base_dir: str, search_str: str,
page_number: int, page_number: int,
results_per_page: int, results_per_page: int,
@ -331,7 +329,7 @@ def html_search_shared_items(css_cache: {}, translate: {},
return shared_items_form return shared_items_form
def html_search_emoji_text_entry(css_cache: {}, translate: {}, def html_search_emoji_text_entry(translate: {},
base_dir: str, path: str) -> str: base_dir: str, path: str) -> str:
"""Search for an emoji by name """Search for an emoji by name
""" """
@ -380,8 +378,7 @@ def html_search_emoji_text_entry(css_cache: {}, translate: {},
return emoji_str return emoji_str
def html_search(css_cache: {}, translate: {}, def html_search(translate: {}, base_dir: str, path: str, domain: str,
base_dir: str, path: str, domain: str,
default_timeline: str, theme: str, default_timeline: str, theme: str,
text_mode_banner: str, access_keys: {}) -> str: text_mode_banner: str, access_keys: {}) -> str:
"""Search called from the timeline icon """Search called from the timeline icon
@ -468,9 +465,7 @@ def html_search(css_cache: {}, translate: {},
return follow_str return follow_str
def html_skills_search(actor: str, def html_skills_search(actor: str, translate: {}, base_dir: str,
css_cache: {}, translate: {}, base_dir: str,
http_prefix: str,
skillsearch: str, instance_only: bool, skillsearch: str, instance_only: bool,
posts_per_page: int) -> str: posts_per_page: int) -> str:
"""Show a page containing search results for a skill """Show a page containing search results for a skill
@ -601,7 +596,7 @@ def html_skills_search(actor: str,
return skill_search_form return skill_search_form
def html_history_search(css_cache: {}, translate: {}, base_dir: str, def html_history_search(translate: {}, base_dir: str,
http_prefix: str, http_prefix: str,
nickname: str, domain: str, nickname: str, domain: str,
historysearch: str, historysearch: str,
@ -721,8 +716,7 @@ def html_history_search(css_cache: {}, translate: {}, base_dir: str,
return history_search_form return history_search_form
def html_hashtag_search(css_cache: {}, def html_hashtag_search(nickname: str, domain: str, port: int,
nickname: str, domain: str, port: int,
recent_posts_cache: {}, max_recent_posts: int, recent_posts_cache: {}, max_recent_posts: int,
translate: {}, translate: {},
base_dir: str, hashtag: str, page_number: int, base_dir: str, hashtag: str, page_number: int,

2
webapp_tos.py
View File

@ -16,7 +16,7 @@ from webapp_utils import html_footer
from markdown import markdown_to_html from markdown import markdown_to_html
def html_terms_of_service(css_cache: {}, base_dir: str, def html_terms_of_service(base_dir: str,
http_prefix: str, domain_full: str) -> str: http_prefix: str, domain_full: str) -> str:
"""Show the terms of service screen """Show the terms of service screen
""" """

22
webapp_utils.py
View File

@ -42,8 +42,7 @@ def get_broken_link_substitute() -> str:
"/icons/avatar_default.png'\"" "/icons/avatar_default.png'\""
def html_following_list(css_cache: {}, base_dir: str, def html_following_list(base_dir: str, following_filename: str) -> str:
following_filename: str) -> str:
"""Returns a list of handles being followed """Returns a list of handles being followed
""" """
with open(following_filename, 'r') as following_file: with open(following_filename, 'r') as following_file:
@ -70,7 +69,7 @@ def html_following_list(css_cache: {}, base_dir: str,
return '' return ''
def html_hashtag_blocked(css_cache: {}, base_dir: str, translate: {}) -> str: def html_hashtag_blocked(base_dir: str, translate: {}) -> str:
"""Show the screen for a blocked hashtag """Show the screen for a blocked hashtag
""" """
blocked_hashtag_form = '' blocked_hashtag_form = ''
@ -492,7 +491,7 @@ def post_contains_public(post_json_object: {}) -> bool:
def _get_image_file(base_dir: str, name: str, directory: str, def _get_image_file(base_dir: str, name: str, directory: str,
nickname: str, domain: str, theme: str) -> (str, str): theme: str) -> (str, str):
""" """
returns the filenames for an image with the given name returns the filenames for an image with the given name
""" """
@ -524,8 +523,7 @@ def get_banner_file(base_dir: str,
"""Gets the image for the timeline banner """Gets the image for the timeline banner
""" """
account_dir = acct_dir(base_dir, nickname, domain) account_dir = acct_dir(base_dir, nickname, domain)
return _get_image_file(base_dir, 'banner', account_dir, return _get_image_file(base_dir, 'banner', account_dir, theme)
nickname, domain, theme)
def get_search_banner_file(base_dir: str, def get_search_banner_file(base_dir: str,
@ -534,8 +532,7 @@ def get_search_banner_file(base_dir: str,
"""Gets the image for the search banner """Gets the image for the search banner
""" """
account_dir = acct_dir(base_dir, nickname, domain) account_dir = acct_dir(base_dir, nickname, domain)
return _get_image_file(base_dir, 'search_banner', account_dir, return _get_image_file(base_dir, 'search_banner', account_dir, theme)
nickname, domain, theme)
def get_left_image_file(base_dir: str, def get_left_image_file(base_dir: str,
@ -543,8 +540,7 @@ def get_left_image_file(base_dir: str,
"""Gets the image for the left column """Gets the image for the left column
""" """
account_dir = acct_dir(base_dir, nickname, domain) account_dir = acct_dir(base_dir, nickname, domain)
return _get_image_file(base_dir, 'left_col_image', account_dir, return _get_image_file(base_dir, 'left_col_image', account_dir, theme)
nickname, domain, theme)
def get_right_image_file(base_dir: str, def get_right_image_file(base_dir: str,
@ -552,8 +548,7 @@ def get_right_image_file(base_dir: str,
"""Gets the image for the right column """Gets the image for the right column
""" """
account_dir = acct_dir(base_dir, nickname, domain) account_dir = acct_dir(base_dir, nickname, domain)
return _get_image_file(base_dir, 'right_col_image', return _get_image_file(base_dir, 'right_col_image', account_dir, theme)
account_dir, nickname, domain, theme)
def _get_variable_from_css(css_str: str, variable: str) -> str: def _get_variable_from_css(css_str: str, variable: str) -> str:
@ -1357,8 +1352,7 @@ def html_highlight_label(label: str, highlight: bool) -> str:
return '*' + str(label) + '*' return '*' + str(label) + '*'
def get_avatar_image_url(session, def get_avatar_image_url(session, base_dir: str, http_prefix: str,
base_dir: str, http_prefix: str,
post_actor: str, person_cache: {}, post_actor: str, person_cache: {},
avatar_url: str, allow_downloads: bool, avatar_url: str, allow_downloads: bool,
signing_priv_key_pem: str) -> str: signing_priv_key_pem: str) -> str:

3
webapp_welcome_final.py
View File

@ -16,8 +16,7 @@ from webapp_utils import html_footer
from markdown import markdown_to_html from markdown import markdown_to_html
def html_welcome_final(base_dir: str, nickname: str, domain: str, def html_welcome_final(base_dir: str, nickname: str,
http_prefix: str, domain_full: str,
language: str, translate: {}, language: str, translate: {},
theme_name: str) -> str: theme_name: str) -> str:
"""Returns the final welcome screen after first login """Returns the final welcome screen after first login