michael/pyfedi
1
0
Fork 0
mirror of https://codeberg.org/rimu/pyfedi synced 2025-01-23 19:36:56 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

improve robustness of handling of 'sensitive' field

Browse source
This commit is contained in:
rimu 2024-03-17 02:55:59 +13:00
parent 8be165d5eb
commit 1cb31a0794
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/activitypub/util.py
View file

@ -1234,7 +1234,7 @@ def create_post(activity_log: ActivityPubLog, community: Community, request_json
title=html.unescape(request_json['object']['name']), title=html.unescape(request_json['object']['name']),
comments_enabled=request_json['object']['commentsEnabled'] if 'commentsEnabled' in request_json['object'] else True, comments_enabled=request_json['object']['commentsEnabled'] if 'commentsEnabled' in request_json['object'] else True,
sticky=request_json['object']['stickied'] if 'stickied' in request_json['object'] else False, sticky=request_json['object']['stickied'] if 'stickied' in request_json['object'] else False,
nsfw=request_json['object']['sensitive'], nsfw=request_json['object']['sensitive'] if 'sensitive' in request_json['object'] else False,
nsfl=request_json['object']['nsfl'] if 'nsfl' in request_json['object'] else nsfl_in_title, nsfl=request_json['object']['nsfl'] if 'nsfl' in request_json['object'] else nsfl_in_title,
ap_id=request_json['object']['id'], ap_id=request_json['object']['id'],
ap_create_id=request_json['id'], ap_create_id=request_json['id'],
@ -1351,7 +1351,8 @@ def update_post_from_activity(post: Post, request_json: dict):
post.body = html_to_markdown(post.body_html) post.body = html_to_markdown(post.body_html)
if 'attachment' in request_json['object'] and 'href' in request_json['object']['attachment']: if 'attachment' in request_json['object'] and 'href' in request_json['object']['attachment']:
post.url = request_json['object']['attachment']['href'] post.url = request_json['object']['attachment']['href']
post.nsfw = request_json['object']['sensitive'] if 'sensitive' in request_json['object']:
post.nsfw = request_json['object']['sensitive']
nsfl_in_title = '[NSFL]' in request_json['object']['name'].upper() or '(NSFL)' in request_json['object']['name'].upper() nsfl_in_title = '[NSFL]' in request_json['object']['name'].upper() or '(NSFL)' in request_json['object']['name'].upper()
if 'nsfl' in request_json['object'] or nsfl_in_title: if 'nsfl' in request_json['object'] or nsfl_in_title:
post.nsfl = request_json['object']['nsfl'] post.nsfl = request_json['object']['nsfl']