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

Grudging support for yet another quote toot implementation in FEP-dd4b

main
Bob Mottram 2025-02-23 12:10:15 +00:00
parent 7f6a2daec5
commit 8e4d74520f
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
metadata.py
View File

@ -97,7 +97,7 @@ def meta_data_node_info(base_dir: str,
"text/markdown", "text/x.misskeymarkdown"], "text/markdown", "text/x.misskeymarkdown"],
"FEPs": ["c648", "521a", "8fcf", "4ccd", "c118", "fffd", "FEPs": ["c648", "521a", "8fcf", "4ccd", "c118", "fffd",
"1970", "0837", "7628", "2677", "5e53", "c16b", "1970", "0837", "7628", "2677", "5e53", "c16b",
"5e53", "268d", "b2b8", "9967"] "5e53", "268d", "b2b8", "9967", "dd4b"]
} }
} }
return nodeinfo return nodeinfo

24
utils.py
View File

@ -625,6 +625,9 @@ def get_base_content_from_post(post_json_object: {},
""" """
this_post_json = post_json_object this_post_json = post_json_object
if has_object_dict(post_json_object): if has_object_dict(post_json_object):
# handle quote posts FEP-dd4b, where there is no content within object
if 'content' in this_post_json['object'] or \
'contentMap' in this_post_json['object']:
this_post_json = post_json_object['object'] this_post_json = post_json_object['object']
if 'contentMap' in this_post_json: if 'contentMap' in this_post_json:
if isinstance(this_post_json['contentMap'], dict): if isinstance(this_post_json['contentMap'], dict):
@ -4646,10 +4649,13 @@ def save_reverse_timeline(base_dir: str, reverse_sequence: []) -> []:
def get_quote_toot_url(post_json_object: str) -> str: def get_quote_toot_url(post_json_object: str) -> str:
""" Returns the url for a quote toot """ Returns the url for a quote toot
This suffers from a general lack of protocol consensus
""" """
# adhoc quote toot implementations # adhoc quote toot implementations
object_quote_url_fields = ('quoteUri', 'quoteUrl', 'quoteReply', object_quote_url_fields = (
'toot:quoteReply', '_misskey_quote') 'quoteUri', 'quoteUrl', 'quoteReply', 'toot:quoteReply',
'_misskey_quote'
)
for fieldname in object_quote_url_fields: for fieldname in object_quote_url_fields:
if not post_json_object['object'].get(fieldname): if not post_json_object['object'].get(fieldname):
continue continue
@ -4658,7 +4664,19 @@ def get_quote_toot_url(post_json_object: str) -> str:
if resembles_url(quote_url): if resembles_url(quote_url):
return remove_html(quote_url) return remove_html(quote_url)
# More correct ActivityPub implementation - adding a Link tag # as defined by FEP-dd4b
# https://codeberg.org/fediverse/fep/src/branch/main/fep/dd4b/fep-dd4b.md
if ((post_json_object.get('content') or
post_json_object.get('contentMap')) and
(not post_json_object['object'].get('content') and
not post_json_object['object'].get('contentMap')) and
post_json_object['object'].get('id')):
quote_url = post_json_object['object']['id']
if isinstance(quote_url, str):
if resembles_url(quote_url):
return remove_html(quote_url)
# Other ActivityPub implementation - adding a Link tag
if not post_json_object['object'].get('tag'): if not post_json_object['object'].get('tag'):
return '' return ''