From 49c609a75aa05042bacea690969e92e2f92b3257 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sat, 8 Nov 2025 13:54:33 +0000 Subject: [PATCH] Support for Torrent activitypub object --- posts.py | 10 +++ torrent.py | 219 ++++++++++++++++++++++++++++++++++++++++++++++ utils.py | 52 +++++++++++ video.py | 46 +++++++--- webapp_profile.py | 3 +- 5 files changed, 315 insertions(+), 15 deletions(-) create mode 100644 torrent.py diff --git a/posts.py b/posts.py index 6831ba81b..022e520e4 100644 --- a/posts.py +++ b/posts.py @@ -123,6 +123,7 @@ from git import is_git_patch from linked_data_sig import generate_json_signature from petnames import resolve_petnames from video import convert_video_to_note +from torrent import convert_torrent_to_note from context import get_individual_post_context from maps import get_location_dict_from_tags from maps import geocoords_from_map_link @@ -6303,6 +6304,15 @@ def download_announce(session, base_dir: str, http_prefix: str, languages_understood) if converted_json: announced_json = converted_json + if announced_json['type'] == 'Torrent': + converted_json = \ + convert_torrent_to_note(base_dir, nickname, domain, + system_language, + announced_json, blocked_cache, + block_federated, + languages_understood) + if converted_json: + announced_json = converted_json if not contains_statuses(announced_json['id']): print('WARN: announced post id does not contain /statuses/ ' + 'or /objects/ or /p/ ' + str(announced_json)) diff --git a/torrent.py b/torrent.py new file mode 100644 index 000000000..7a6fd5606 --- /dev/null +++ b/torrent.py @@ -0,0 +1,219 @@ +__filename__ = "torrent.py" +__author__ = "Bob Mottram" +__license__ = "AGPL3+" +__version__ = "1.6.0" +__maintainer__ = "Bob Mottram" +__email__ = "bob@libreserver.org" +__status__ = "Production" +__module_group__ = "Timeline" + +from utils import remove_html +from utils import get_full_domain +from utils import get_nickname_from_actor +from utils import get_domain_from_actor +from utils import remove_id_ending +from utils import get_attributed_to +from utils import get_content_from_post +from utils import dangerous_markup +from utils import license_link_from_name +from utils import get_media_url_from_torrent +from utils import resembles_url +from blocking import is_blocked +from filters import is_filtered +from conversation import post_id_to_convthread_id + + +def convert_torrent_to_note(base_dir: str, nickname: str, domain: str, + system_language: str, + post_json_object: {}, blocked_cache: {}, + block_federated: [], + languages_understood: []) -> {}: + """Converts a Torrent ActivityPub(ish) object into + a Note, so that it can then be displayed in a timeline + https://socialhub.activitypub.rocks/t/ + fep-d8c8-bittorrent-torrent-objects/8309/6 + """ + if not post_json_object.get('type'): + return None + + if post_json_object['type'] != 'Torrent': + return None + + # check that the required fields are present + required_fields = ( + 'id', 'published', 'to', 'attributedTo', 'content' + ) + for field_name in required_fields: + if not post_json_object.get(field_name): + print('REJECT: torrent ' + str(post_json_object)) + return None + + # who is this attributed to ? + attributed_to = None + if isinstance(post_json_object['attributedTo'], str): + attributed_to = get_attributed_to(post_json_object['attributedTo']) + if not attributed_to: + return None + + # get the language of the torrent + post_language = system_language + if post_json_object.get('language'): + if isinstance(post_json_object['language'], dict): + if post_json_object['language'].get('identifier'): + post_language = post_json_object['language']['identifier'] + + # check that the attributed actor is not blocked + post_nickname = get_nickname_from_actor(attributed_to) + if not post_nickname: + return None + post_domain, post_domain_port = get_domain_from_actor(attributed_to) + if not post_domain: + return None + post_domain_full = get_full_domain(post_domain, post_domain_port) + if is_blocked(base_dir, nickname, domain, + post_nickname, post_domain_full, + blocked_cache, block_federated): + return None + + # check that the content is valid + if is_filtered(base_dir, nickname, domain, post_json_object['content'], + system_language): + return None + + # get the content + content = '' + if post_json_object.get('license'): + if isinstance(post_json_object['license'], dict): + if post_json_object['license'].get('name'): + if is_filtered(base_dir, nickname, domain, + post_json_object['license']['name'], + system_language): + return None + content += '

' + post_json_object['license']['name'] + '

' + content += \ + get_content_from_post(post_json_object, system_language, + languages_understood, "content") + if not content: + return None + + conversation_id = remove_id_ending(post_json_object['id']) + conversation_id = post_id_to_convthread_id(conversation_id, + post_json_object['published']) + + media_type, media_url, media_torrent, media_magnet = \ + get_media_url_from_torrent(post_json_object) + + if not media_url: + return None + + attachment = [{ + 'mediaType': media_type, + 'name': post_json_object['content'], + 'type': 'Document', + 'url': media_url + }] + + comments_enabled = True + if 'commentsEnabled' in post_json_object: + if isinstance(post_json_object['commentsEnabled'], bool): + comments_enabled = post_json_object['commentsEnabled'] + + sensitive = False + if 'sensitive' in post_json_object: + if isinstance(post_json_object['sensitive'], bool): + sensitive = post_json_object['sensitive'] + + cc: list[str] = [] + if 'cc' in post_json_object: + if isinstance(post_json_object['cc'], list): + cc = post_json_object['cc'] + + if media_torrent or media_magnet: + content += '

' + if media_torrent: + content += '⇓ ' + if media_magnet: + content += '🧲' + content += '

' + + new_post_id2 = remove_html(post_json_object['id']) + new_post_id = remove_id_ending(new_post_id2) + new_post = { + 'id': new_post_id + '/activity', + 'type': 'Create', + 'actor': attributed_to, + 'published': post_json_object['published'], + 'to': post_json_object['to'], + 'cc': post_json_object['cc'], + 'object': { + 'id': new_post_id, + 'conversation': conversation_id, + 'context': conversation_id, + 'type': 'Note', + 'summary': None, + 'inReplyTo': None, + 'published': post_json_object['published'], + 'url': new_post_id, + 'attributedTo': attributed_to, + 'to': post_json_object['to'], + 'cc': cc, + 'sensitive': sensitive, + 'atomUri': new_post_id, + 'inReplyToAtomUri': None, + 'commentsEnabled': comments_enabled, + 'rejectReplies': not comments_enabled, + 'mediaType': 'text/html', + 'content': content, + 'contentMap': { + post_language: content + }, + 'attachment': attachment, + 'tag': [], + 'replies': { + 'id': new_post_id + '/replies', + 'repliesOf': new_post_id, + 'type': 'Collection', + 'first': { + 'type': 'CollectionPage', + 'partOf': new_post_id + '/replies', + 'items': [] + } + } + } + } + if post_json_object.get('@context'): + new_post['@context'] = post_json_object['@context'] + + if post_json_object.get('support'): + support_str = post_json_object['support'] + if isinstance(support_str, str): + if not dangerous_markup(support_str, False, []): + if not is_filtered(base_dir, nickname, domain, support_str, + system_language): + new_post['object']['support'] = support_str + # if this is a link + if resembles_url(support_str): + # add a buy link + new_post['object']['attachment'].append({ + 'type': 'Link', + 'mediaType': 'text/html', + 'href': support_str, + 'rel': 'support', + 'name': 'Support' + }) + + if post_json_object.get('license'): + if isinstance(post_json_object['license'], dict): + if post_json_object['license'].get('name'): + if isinstance(post_json_object['license']['name'], str): + license_str = post_json_object['license']['name'] + content_license_url = \ + license_link_from_name(license_str) + if content_license_url: + new_post['object']['attachment'].append({ + "type": "PropertyValue", + "name": "license", + "value": content_license_url + }) + + return new_post diff --git a/utils.py b/utils.py index a22aa6cfa..062f0429b 100644 --- a/utils.py +++ b/utils.py @@ -3637,6 +3637,58 @@ def get_media_url_from_video(post_json_object: {}) -> (str, str, str, str): return media_type, media_url, media_torrent, media_magnet +def get_media_url_from_torrent(post_json_object: {}) -> (str, str, str, str): + """Within a Torrent post return the media details + """ + media_type = None + media_url = None + media_torrent = None + media_magnet = None + if not post_json_object.get('url'): + return media_type, media_url, media_torrent, media_magnet + if not isinstance(post_json_object['url'], list): + return media_type, media_url, media_torrent, media_magnet + for media_link in post_json_object['url']: + if not isinstance(media_link, dict): + continue + if not media_link.get('mediaType'): + continue + if not media_link.get('href'): + continue + if media_link.get('tag'): + media_tags = media_link['tag'] + if isinstance(media_tags, list): + for tag_link in media_tags: + if not isinstance(tag_link, dict): + continue + if not tag_link.get('mediaType'): + continue + if not tag_link.get('href'): + continue + if tag_link['mediaType'] == 'application/x-bittorrent' or \ + tag_link['mediaType'].startswith('magnet:'): + if tag_link['mediaType'].startswith('magnet:'): + media_magnet = remove_html(media_link['href']) + else: + media_torrent = remove_html(media_link['href']) + media_type = tag_link['mediaType'] + media_url = remove_html(tag_link['href']) + break + if media_type and media_url: + continue + if media_link['mediaType'] == 'application/x-bittorrent': + media_torrent = remove_html(media_link['href']) + if media_link['href'].startswith('magnet:'): + media_magnet = remove_html(media_link['href']) + if media_link['mediaType'] != 'video/mp4' and \ + media_link['mediaType'] != 'video/ogv': + continue + if not media_url: + media_type = media_link['mediaType'] + media_url = remove_html(media_link['href']) + return media_type, media_url, media_torrent, media_magnet + + def get_reply_to(post_json_object: {}) -> str: """Returns the reply to link from a post """ diff --git a/video.py b/video.py index 13cf9ec6c..53b254b58 100644 --- a/video.py +++ b/video.py @@ -33,19 +33,21 @@ def convert_video_to_note(base_dir: str, nickname: str, domain: str, a Note, so that it can then be displayed in a timeline https://docs.joinpeertube.org/api/activitypub#video """ - # check that the required fields are present - required_fields = ( - 'type', '@context', 'id', 'published', 'to', 'cc', - 'attributedTo', 'commentsEnabled', 'content', 'sensitive', - 'name', 'url' - ) - for field_name in required_fields: - if not post_json_object.get(field_name): - return None + if not post_json_object.get('type'): + return None if post_json_object['type'] != 'Video': return None + # check that the required fields are present + required_fields = ( + 'id', 'published', 'to', 'attributedTo', 'content', 'name' + ) + for field_name in required_fields: + if not post_json_object.get(field_name): + print('REJECT: video ' + str(post_json_object)) + return None + # who is this attributed to ? attributed_to = None if isinstance(post_json_object['attributedTo'], str): @@ -120,10 +122,24 @@ def convert_video_to_note(base_dir: str, nickname: str, domain: str, content += '🧲' content += '

' + comments_enabled = True + if 'commentsEnabled' in post_json_object: + if isinstance(post_json_object['commentsEnabled'], bool): + comments_enabled = post_json_object['commentsEnabled'] + + sensitive = False + if 'sensitive' in post_json_object: + if isinstance(post_json_object['sensitive'], bool): + sensitive = post_json_object['sensitive'] + + cc: list[str] = [] + if 'cc' in post_json_object: + if isinstance(post_json_object['cc'], list): + cc = post_json_object['cc'] + new_post_id2 = remove_html(post_json_object['id']) new_post_id = remove_id_ending(new_post_id2) new_post = { - '@context': post_json_object['@context'], 'id': new_post_id + '/activity', 'type': 'Create', 'actor': attributed_to, @@ -141,12 +157,12 @@ def convert_video_to_note(base_dir: str, nickname: str, domain: str, 'url': new_post_id, 'attributedTo': attributed_to, 'to': post_json_object['to'], - 'cc': post_json_object['cc'], - 'sensitive': post_json_object['sensitive'], + 'cc': cc, + 'sensitive': sensitive, 'atomUri': new_post_id, 'inReplyToAtomUri': None, - 'commentsEnabled': post_json_object['commentsEnabled'], - 'rejectReplies': not post_json_object['commentsEnabled'], + 'commentsEnabled': comments_enabled, + 'rejectReplies': not comments_enabled, 'mediaType': 'text/html', 'content': content, 'contentMap': { @@ -166,6 +182,8 @@ def convert_video_to_note(base_dir: str, nickname: str, domain: str, } } } + if post_json_object.get('@context'): + new_post['@context'] = post_json_object['@context'] if post_json_object.get('support'): support_str = post_json_object['support'] diff --git a/webapp_profile.py b/webapp_profile.py index 96e78d251..aa1adac10 100644 --- a/webapp_profile.py +++ b/webapp_profile.py @@ -185,7 +185,8 @@ def _valid_profile_preview_post(post_json_object: {}, if not has_object_dict(post_json_object): return False, None if post_json_object['type'] not in ('Create', 'Announce'): - if post_json_object['type'] not in ('Note', 'Event', 'Video', 'Page'): + if post_json_object['type'] not in ('Note', 'Event', 'Video', + 'Torrent', 'Page'): return False, None if not post_json_object.get('to'): return False, None