From a8bd2fc634ddfadb2af74341b5730a8d59fcbcdd Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Thu, 19 Jan 2023 10:41:06 +0000 Subject: [PATCH] Revert "Use url for published link" This reverts commit 37403dd72f45e3110e9b49426de515e6f01b30a7. --- webapp_post.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/webapp_post.py b/webapp_post.py index 54e0976ff..0a7a5f0c5 100644 --- a/webapp_post.py +++ b/webapp_post.py @@ -2217,9 +2217,7 @@ def individual_post_as_html(signing_priv_key_pem: str, comments_enabled = False conversation_id = None - obj_dict_exists = False if isinstance(post_json_object['object'], dict): - obj_dict_exists = True if 'conversation' in post_json_object['object']: if post_json_object['object']['conversation']: conversation_id = post_json_object['object']['conversation'] @@ -2406,17 +2404,13 @@ def individual_post_as_html(signing_priv_key_pem: str, _log_post_timing(enable_timing_log, post_start_time, '15') 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 post_is_blog = False if is_blog_post(post_json_object): post_is_blog = True # is this a post to the local domain? - if '://' + domain in published_link: - published_link = published_link.replace('/statuses/', '/') + if '://' + domain in message_id: + published_link = message_id.replace('/statuses/', '/') # if this is a local link then make it relative so that it works # on clearnet or onion address if domain + '/users/' in published_link or \