michael/pyfedi
1
0
Fork 0
mirror of https://codeberg.org/rimu/pyfedi synced 2025-01-24 03:43:42 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

PeerTube: 'icon' and 'image' in Community are lists

Browse source
This commit is contained in:
freamon 2024-05-26 01:20:46 +01:00
parent 5bb7af84cd
commit d839afb8b3
1 changed files with 50 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
app/activitypub/util.py
View file

@ -571,18 +571,32 @@ def refresh_community_profile_task(community_id):
icon_changed = cover_changed = False icon_changed = cover_changed = False
if 'icon' in activity_json: if 'icon' in activity_json:
if community.icon_id and activity_json['icon']['url'] != community.icon.source_url: if isinstance(activity_json['icon'], dict) and 'url' in activity_json['icon']:
icon_entry = activity_json['icon']['url']
elif isinstance(activity_json['icon'], list) and 'url' in activity_json['icon'][-1]:
icon_entry = activity_json['icon'][-1]['url']
else:
icon_entry = None
if icon_entry:
if community.icon_id and icon_entry != community.icon.source_url:
community.icon.delete_from_disk() community.icon.delete_from_disk()
if not community.icon_id or (community.icon_id and activity_json['icon']['url'] != community.icon.source_url): if not community.icon_id or (community.icon_id and icon_entry != community.icon.source_url):
icon = File(source_url=activity_json['icon']['url']) icon = File(source_url=icon_entry)
community.icon = icon community.icon = icon
db.session.add(icon) db.session.add(icon)
icon_changed = True icon_changed = True
if 'image' in activity_json: if 'image' in activity_json:
if community.image_id and activity_json['image']['url'] != community.image.source_url: if isinstance(activity_json['image'], dict) and 'url' in activity_json['image']:
image_entry = activity_json['image']['url']
elif isinstance(activity_json['image'], list) and 'url' in activity_json['image'][0]:
image_entry = activity_json['image'][0]['url']
else:
image_entry = None
if image_entry:
if community.image_id and image_entry != community.image.source_url:
community.image.delete_from_disk() community.image.delete_from_disk()
if not community.image_id or (community.image_id and activity_json['image']['url'] != community.image.source_url): if not community.image_id or (community.image_id and image_entry != community.image.source_url):
image = File(source_url=activity_json['image']['url']) image = File(source_url=image_entry)
community.image = image community.image = image
db.session.add(image) db.session.add(image)
cover_changed = True cover_changed = True
@ -733,12 +747,26 @@ def actor_json_to_model(activity_json, address, server):
elif 'content' in activity_json: elif 'content' in activity_json:
community.description_html = allowlist_html(activity_json['content']) community.description_html = allowlist_html(activity_json['content'])
community.description = '' community.description = ''
if 'icon' in activity_json and activity_json['icon'] is not None and 'url' in activity_json['icon']: if 'icon' in activity_json and activity_json['icon'] is not None:
icon = File(source_url=activity_json['icon']['url']) if isinstance(activity_json['icon'], dict) and 'url' in activity_json['icon']:
icon_entry = activity_json['icon']['url']
elif isinstance(activity_json['icon'], list) and 'url' in activity_json['icon'][-1]:
icon_entry = activity_json['icon'][-1]['url']
else:
icon_entry = None
if icon_entry:
icon = File(source_url=icon_entry)
community.icon = icon community.icon = icon
db.session.add(icon) db.session.add(icon)
if 'image' in activity_json and activity_json['image'] is not None and 'url' in activity_json['image']: if 'image' in activity_json and activity_json['image'] is not None:
image = File(source_url=activity_json['image']['url']) if isinstance(activity_json['image'], dict) and 'url' in activity_json['image']:
image_entry = activity_json['image']['url']
elif isinstance(activity_json['image'], list) and 'url' in activity_json['image'][0]:
image_entry = activity_json['image'][0]['url']
else:
image_entry = None
if image_entry:
image = File(source_url=image_entry)
community.image = image community.image = image
db.session.add(image) db.session.add(image)
if 'language' in activity_json and isinstance(activity_json['language'], list): if 'language' in activity_json and isinstance(activity_json['language'], list):