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 2024-05-29 20:03:41 +01:00
parent c21da935de
commit 722350c6a7
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
webapp_post.py
View File

@ -131,6 +131,14 @@ from session import get_json
MAX_DISPLAY_NAME_LENGTH = 42 MAX_DISPLAY_NAME_LENGTH = 42
def _bookmark_from_id(post_id: str) -> str:
""" Converts a post id into a bookmark
"""
timeline_post_bookmark = remove_id_ending(post_id)
timeline_post_bookmark = timeline_post_bookmark.replace('://', '-')
return timeline_post_bookmark.replace('/', '-')
def _enforce_max_display_name_length(display_name: str) -> str: def _enforce_max_display_name_length(display_name: str) -> str:
"""Ensures that the display name does not get too long """Ensures that the display name does not get too long
""" """
@ -1338,7 +1346,7 @@ def _announce_unattributed_html(translate: {},
if translate.get(announces_str): if translate.get(announces_str):
announces_str = translate[announces_str] announces_str = translate[announces_str]
post_id = remove_id_ending(post_json_object['object']['id']) post_id = remove_id_ending(post_json_object['object']['id'])
post_bookmark = '#' + post_id.replace('://', '-').replace('/', '-') post_bookmark = '#' + _bookmark_from_id(post_id)
post_link = '/users/' + nickname + '?convthread=' + \ post_link = '/users/' + nickname + '?convthread=' + \
post_id.replace('--', '/') + post_bookmark post_id.replace('--', '/') + post_bookmark
return ' <img loading="lazy" decoding="async" title="' + \ return ' <img loading="lazy" decoding="async" title="' + \
@ -1361,7 +1369,7 @@ def _announce_with_display_name_html(translate: {},
if translate.get(announces_str): if translate.get(announces_str):
announces_str = translate[announces_str] announces_str = translate[announces_str]
post_id = remove_id_ending(post_json_object['object']['id']) post_id = remove_id_ending(post_json_object['object']['id'])
post_bookmark = '#' + post_id.replace('://', '-').replace('/', '-') post_bookmark = '#' + _bookmark_from_id(post_id)
post_link = '/users/' + nickname + '?convthread=' + \ post_link = '/users/' + nickname + '?convthread=' + \
post_id.replace('--', '/') + post_bookmark post_id.replace('--', '/') + post_bookmark
return ' <img loading="lazy" decoding="async" title="' + \ return ' <img loading="lazy" decoding="async" title="' + \
@ -1530,7 +1538,7 @@ def _reply_to_unknown_html(translate: {},
""" """
replying_to_str = _replying_to_with_scope(post_json_object, translate) replying_to_str = _replying_to_with_scope(post_json_object, translate)
post_id = get_reply_to(post_json_object['object']) post_id = get_reply_to(post_json_object['object'])
post_bookmark = '#' + post_id.replace('://', '-').replace('/', '-') post_bookmark = '#' + _bookmark_from_id(post_id)
post_link = '/users/' + nickname + '?convthread=' + \ post_link = '/users/' + nickname + '?convthread=' + \
post_id.replace('--', '/') + post_bookmark post_id.replace('--', '/') + post_bookmark
return ' <img loading="lazy" decoding="async" title="' + \ return ' <img loading="lazy" decoding="async" title="' + \
@ -1561,7 +1569,7 @@ def _reply_with_unknown_path_html(translate: {},
""" """
replying_to_str = _replying_to_with_scope(post_json_object, translate) replying_to_str = _replying_to_with_scope(post_json_object, translate)
post_id = get_reply_to(post_json_object['object']) post_id = get_reply_to(post_json_object['object'])
post_bookmark = '#' + post_id.replace('://', '-').replace('/', '-') post_bookmark = '#' + _bookmark_from_id(post_id)
post_link = '/users/' + nickname + '?convthread=' + \ post_link = '/users/' + nickname + '?convthread=' + \
post_id.replace('--', '/') + post_bookmark post_id.replace('--', '/') + post_bookmark
return ' <img loading="lazy" decoding="async" title="' + \ return ' <img loading="lazy" decoding="async" title="' + \
@ -1584,7 +1592,7 @@ def _get_reply_html(translate: {},
if not in_reply_to: if not in_reply_to:
return '' return ''
replying_to_str = _replying_to_with_scope(post_json_object, translate) replying_to_str = _replying_to_with_scope(post_json_object, translate)
post_bookmark = '#' + in_reply_to.replace('://', '-').replace('/', '-') post_bookmark = '#' + _bookmark_from_id(in_reply_to)
post_link = '/users/' + nickname + '?convthread=' + \ post_link = '/users/' + nickname + '?convthread=' + \
in_reply_to.replace('--', '/') + post_bookmark in_reply_to.replace('--', '/') + post_bookmark
return ' ' + \ return ' ' + \
@ -1859,8 +1867,7 @@ def _get_footer_with_icons(show_icons: bool,
footer_str += _get_copyright_footer(content_license_url, footer_str += _get_copyright_footer(content_license_url,
translate) translate)
# show the date # show the date
post_bookmark = \ post_bookmark = '#' + _bookmark_from_id(published_link)
'#' + published_link.replace('://', '-').replace('/', '-')
date_link = '/users/' + nickname + '?convthread=' + \ date_link = '/users/' + nickname + '?convthread=' + \
published_link.replace('--', '/') + post_bookmark published_link.replace('--', '/') + post_bookmark
footer_str += '<a href="' + date_link + '" class="' + \ footer_str += '<a href="' + date_link + '" class="' + \
@ -2267,9 +2274,7 @@ def individual_post_as_html(signing_priv_key_pem: str,
avatar_image_in_post = \ avatar_image_in_post = \
' <div class="timeline-avatar">' + avatar_link + '</div>\n' ' <div class="timeline-avatar">' + avatar_link + '</div>\n'
timeline_post_bookmark = remove_id_ending(post_json_object['id']) timeline_post_bookmark = _bookmark_from_id(post_json_object['id'])
timeline_post_bookmark = timeline_post_bookmark.replace('://', '-')
timeline_post_bookmark = timeline_post_bookmark.replace('/', '-')
# If this is the inbox timeline then don't show the repeat icon on any DMs # If this is the inbox timeline then don't show the repeat icon on any DMs
show_repeat_icon = show_repeats show_repeat_icon = show_repeats
@ -2709,8 +2714,7 @@ def individual_post_as_html(signing_priv_key_pem: str,
if content_license_url and not is_reminder(post_json_object): if content_license_url and not is_reminder(post_json_object):
footer_str += _get_copyright_footer(content_license_url, footer_str += _get_copyright_footer(content_license_url,
translate) translate)
post_bookmark = \ post_bookmark = '#' + _bookmark_from_id(published_link)
'#' + published_link.replace('://', '-').replace('/', '-')
conv_link = '/users/' + nickname + '?convthread=' + \ conv_link = '/users/' + nickname + '?convthread=' + \
published_link.replace('--', '/') + post_bookmark published_link.replace('--', '/') + post_bookmark
footer_str += '<a href="' + conv_link + \ footer_str += '<a href="' + conv_link + \