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

Merge remote-tracking branch 'origin/main'

Browse source
This commit is contained in:
rimu 2024-05-26 14:09:59 +12:00
commit 11ce2919dd
1 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
app/activitypub/util.py
View file

@ -490,17 +490,19 @@ def refresh_user_profile_task(user_id):
if 'icon' in activity_json: if 'icon' in activity_json:
if user.avatar_id and activity_json['icon']['url'] != user.avatar.source_url: if user.avatar_id and activity_json['icon']['url'] != user.avatar.source_url:
user.avatar.delete_from_disk() user.avatar.delete_from_disk()
avatar = File(source_url=activity_json['icon']['url']) if not user.avatar_id or (user.avatar_id and activity_json['icon']['url'] != user.avatar.source_url):
user.avatar = avatar avatar = File(source_url=activity_json['icon']['url'])
db.session.add(avatar) user.avatar = avatar
avatar_changed = True db.session.add(avatar)
avatar_changed = True
if 'image' in activity_json: if 'image' in activity_json:
if user.cover_id and activity_json['image']['url'] != user.cover.source_url: if user.cover_id and activity_json['image']['url'] != user.cover.source_url:
user.cover.delete_from_disk() user.cover.delete_from_disk()
cover = File(source_url=activity_json['image']['url']) if not user.cover_id or (user.cover_id and activity_json['image']['url'] != user.cover.source_url):
user.cover = cover cover = File(source_url=activity_json['image']['url'])
db.session.add(cover) user.cover = cover
cover_changed = True db.session.add(cover)
cover_changed = True
db.session.commit() db.session.commit()
if user.avatar_id and avatar_changed: if user.avatar_id and avatar_changed:
make_image_sizes(user.avatar_id, 40, 250, 'users') make_image_sizes(user.avatar_id, 40, 250, 'users')
@ -564,17 +566,19 @@ def refresh_community_profile_task(community_id):
if 'icon' in activity_json: if 'icon' in activity_json:
if community.icon_id and activity_json['icon']['url'] != community.icon.source_url: if community.icon_id and activity_json['icon']['url'] != community.icon.source_url:
community.icon.delete_from_disk() community.icon.delete_from_disk()
icon = File(source_url=activity_json['icon']['url']) if not community.icon_id or (community.icon_id and activity_json['icon']['url'] != community.icon.source_url):
community.icon = icon icon = File(source_url=activity_json['icon']['url'])
db.session.add(icon) community.icon = icon
icon_changed = True db.session.add(icon)
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 community.image_id and activity_json['image']['url'] != community.image.source_url:
community.image.delete_from_disk() community.image.delete_from_disk()
image = File(source_url=activity_json['image']['url']) if not community.image_id or (community.image_id and activity_json['image']['url'] != community.image.source_url):
community.image = image image = File(source_url=activity_json['image']['url'])
db.session.add(image) community.image = image
cover_changed = True db.session.add(image)
cover_changed = True
if 'language' in activity_json and isinstance(activity_json['language'], list) and not community.ignore_remote_language: if 'language' in activity_json and isinstance(activity_json['language'], list) and not community.ignore_remote_language:
for ap_language in activity_json['language']: for ap_language in activity_json['language']:
new_language = find_language_or_create(ap_language['identifier'], ap_language['name']) new_language = find_language_or_create(ap_language['identifier'], ap_language['name'])