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

Use url for published link

merge-requests/30/head
Bob Mottram 2023-01-19 10:35:28 +00:00
parent f368d5d000
commit 37403dd72f
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
webapp_post.py
View File

@ -2217,7 +2217,9 @@ def individual_post_as_html(signing_priv_key_pem: str,
comments_enabled = False comments_enabled = False
conversation_id = None conversation_id = None
obj_dict_exists = False
if isinstance(post_json_object['object'], dict): if isinstance(post_json_object['object'], dict):
obj_dict_exists = True
if 'conversation' in post_json_object['object']: if 'conversation' in post_json_object['object']:
if post_json_object['object']['conversation']: if post_json_object['object']['conversation']:
conversation_id = post_json_object['object']['conversation'] conversation_id = post_json_object['object']['conversation']
@ -2404,13 +2406,17 @@ def individual_post_as_html(signing_priv_key_pem: str,
_log_post_timing(enable_timing_log, post_start_time, '15') _log_post_timing(enable_timing_log, post_start_time, '15')
published_link = message_id published_link = message_id
# if a url exists then use it as the link
if obj_dict_exists:
if post_json_object['object'].get('url'):
published_link = post_json_object['object']['url']
# blog posts should have no /statuses/ in their link # blog posts should have no /statuses/ in their link
post_is_blog = False post_is_blog = False
if is_blog_post(post_json_object): if is_blog_post(post_json_object):
post_is_blog = True post_is_blog = True
# is this a post to the local domain? # is this a post to the local domain?
if '://' + domain in message_id: if '://' + domain in published_link:
published_link = message_id.replace('/statuses/', '/') published_link = published_link.replace('/statuses/', '/')
# if this is a local link then make it relative so that it works # if this is a local link then make it relative so that it works
# on clearnet or onion address # on clearnet or onion address
if domain + '/users/' in published_link or \ if domain + '/users/' in published_link or \