diff --git a/src/api/schedule.py b/src/api/schedule.py index d518eee8c54efc101eaa39ba1f4274b8a383b45a..65ad5f1a108010745e321f4a14f85c05396e7ee6 100644 --- a/src/api/schedule.py +++ b/src/api/schedule.py @@ -115,7 +115,7 @@ class ScheduleEncoder(json.JSONEncoder): 'guid': p.uuid, 'name': name, 'public_name': name, - 'avatar_url': p.avatar_url, + 'avatar': p.avatar_url, 'biography': member.description if member else None, # 'links': person.links, # TODO # 'url': p.get_absolute_url(), @@ -129,7 +129,7 @@ class ScheduleEncoder(json.JSONEncoder): 'guid': p.participant.uuid, 'name': name, 'public_name': name, - 'avatar_url': p.participant.avatar_url, + 'avatar': p.participant.avatar_url, 'biography': member.description if member else '', # 'links': person.participant.links, # TODO # 'url': p.participant.get_absolute_url(), @@ -140,7 +140,7 @@ class ScheduleEncoder(json.JSONEncoder): 'guid': p.get('guid', None), 'id': p.get('id', None), 'name': p.get('name', p.get('public_name')), - 'avatar_url': p.get('avatar', None), + 'avatar': p.get('avatar', None), 'biography': p.get('biography') or p.get('description', ''), 'links': p.get('links', []), } diff --git a/src/core/models/schedules.py b/src/core/models/schedules.py index bb0cb67d6d3a3722277be9aaaf9eade652e417ac..658c56ce1df319fa699e8fcad854cafbf7309513 100644 --- a/src/core/models/schedules.py +++ b/src/core/models/schedules.py @@ -450,7 +450,7 @@ class ScheduleSource(models.Model): } ], "biography": "Das Projekt-Team vom Hub, der Daten-Integrationsplattform von Congress & Camp.", - "avatar_url": "https://www.ccc.de/images/events.png", + "avatar": "https://www.ccc.de/images/events.png", "public_name": "Hub Team" } ``` diff --git a/src/core/models/users.py b/src/core/models/users.py index d1ee7f4a852dd24ccf14efa264477ef1464c6d8e..37cb8fcb19cc24ec6ce59b9f942e61ff80b69739 100644 --- a/src/core/models/users.py +++ b/src/core/models/users.py @@ -387,7 +387,7 @@ class PlatformUser(AbstractUser): ) # load avatar, if an URL is given (and has not changed since last time) - if avatar_url := data.get('avatar_url'): + if avatar_url := data.get('avatar'): if obj.avatar_url != avatar_url: try: obj.load_avatar_from_url(avatar_url) diff --git a/src/core/schedules/schedulejsonfrab.py b/src/core/schedules/schedulejsonfrab.py index 314ec2c4d7d5996be3866e4116063d752cae5917..d2285b429d6d2b92bb02358c31fd12e2636e8925 100644 --- a/src/core/schedules/schedulejsonfrab.py +++ b/src/core/schedules/schedulejsonfrab.py @@ -79,8 +79,8 @@ class ScheduleJSONFrabSupport(ScheduleJSONSupport): images_base_url = schedule.get('base_url') def overwrite_avatar_url(p): - if p.get('avatar_url'): - return {**p, 'avatar_url': p['avatar_url'].replace('/original/', '/large/').replace(f'{host}/', images_base_url)} + if p.get('avatar'): + return {**p, 'avatar': p['avatar'].replace('/original/', '/large/').replace(f'{host}/', images_base_url)} return p for e in schedule.events(): @@ -153,7 +153,7 @@ class SpeakerJSON: 'name': s.get('name'), 'public_name': s.get('public_name'), 'biography': SpeakerJSON.build_biogaphy(s), - 'avatar_url': f"{base_url}{s['image']}" if s.get('image') else None, + 'avatar': f"{base_url}{s['image']}" if s.get('image') else None, 'links': s.get('links', []), } )