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

Don't show bookmark icon for unbookmarkable posts

merge-requests/30/head
Bob Mottram 2023-02-07 10:38:07 +00:00
parent fb088adcbe
commit 4ea0d5039b
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
webapp_post.py
View File

@ -916,7 +916,9 @@ def _get_like_icon_html(nickname: str, domain_full: str,
return like_str return like_str
def _get_bookmark_icon_html(nickname: str, domain_full: str, def _get_bookmark_icon_html(base_dir: str,
nickname: str, domain: str,
domain_full: str,
post_json_object: {}, post_json_object: {},
is_moderation_post: bool, is_moderation_post: bool,
translate: {}, translate: {},
@ -924,7 +926,8 @@ def _get_bookmark_icon_html(nickname: str, domain_full: str,
post_start_time, box_name: str, post_start_time, box_name: str,
page_number_param: str, page_number_param: str,
timeline_post_bookmark: str, timeline_post_bookmark: str,
first_post_id: str) -> str: first_post_id: str,
post_url: str) -> str:
"""Returns html for bookmark icon/button """Returns html for bookmark icon/button
""" """
bookmark_str = '' bookmark_str = ''
@ -932,6 +935,9 @@ def _get_bookmark_icon_html(nickname: str, domain_full: str,
if is_moderation_post: if is_moderation_post:
return bookmark_str return bookmark_str
if not locate_post(base_dir, nickname, domain, post_url):
return bookmark_str
bookmark_icon = 'bookmark_inactive.png' bookmark_icon = 'bookmark_inactive.png'
bookmark_link = 'bookmark' bookmark_link = 'bookmark'
bookmark_emoji = '' bookmark_emoji = ''
@ -2299,15 +2305,14 @@ def individual_post_as_html(signing_priv_key_pem: str,
_log_post_timing(enable_timing_log, post_start_time, '12.5') _log_post_timing(enable_timing_log, post_start_time, '12.5')
bookmark_str = \ bookmark_str = \
_get_bookmark_icon_html(nickname, domain_full, _get_bookmark_icon_html(base_dir, nickname, domain,
post_json_object, domain_full, post_json_object,
is_moderation_post, is_moderation_post, translate,
translate,
enable_timing_log, enable_timing_log,
post_start_time, box_name, post_start_time, box_name,
page_number_param, page_number_param,
timeline_post_bookmark, timeline_post_bookmark,
first_post_id) first_post_id, message_id)
_log_post_timing(enable_timing_log, post_start_time, '12.9') _log_post_timing(enable_timing_log, post_start_time, '12.9')
@ -2656,8 +2661,10 @@ def individual_post_as_html(signing_priv_key_pem: str,
translate) translate)
if map_str: if map_str:
map_str = '<center>\n' + map_str + '</center>\n' map_str = '<center>\n' + map_str + '</center>\n'
if map_str and post_json_object['object'].get('attributedTo'): attrib = None
if post_json_object['object'].get('attributedTo'):
attrib = post_json_object['object']['attributedTo'] attrib = post_json_object['object']['attributedTo']
if map_str and attrib:
# is this being sent by the author? # is this being sent by the author?
if '://' + domain_full + '/users/' + nickname in attrib: if '://' + domain_full + '/users/' + nickname in attrib:
location_domain = location_str location_domain = location_str