From 27f40e60239b558ac728934d4c155a3d57d46f49 Mon Sep 17 00:00:00 2001
From: Agate <me@agate.blue>
Date: Wed, 22 Apr 2020 10:22:19 +0200
Subject: [PATCH] Fixed UI crash when updating avatar

---
 api/funkwhale_api/users/serializers.py | 7 +++++++
 api/tests/users/test_views.py          | 1 +
 2 files changed, 8 insertions(+)

diff --git a/api/funkwhale_api/users/serializers.py b/api/funkwhale_api/users/serializers.py
index 8952c5a194..e0d9517557 100644
--- a/api/funkwhale_api/users/serializers.py
+++ b/api/funkwhale_api/users/serializers.py
@@ -179,6 +179,13 @@ class UserWriteSerializer(serializers.ModelSerializer):
             obj.actor.save(update_fields=["attachment_icon"])
         return obj
 
+    def to_representation(self, instance):
+        r = super().to_representation(instance)
+        r["avatar"] = common_serializers.AttachmentSerializer(
+            instance.get_avatar()
+        ).data
+        return r
+
 
 class UserReadSerializer(serializers.ModelSerializer):
 
diff --git a/api/tests/users/test_views.py b/api/tests/users/test_views.py
index 3a8929cd46..1b75d98168 100644
--- a/api/tests/users/test_views.py
+++ b/api/tests/users/test_views.py
@@ -319,6 +319,7 @@ def test_user_can_patch_their_own_avatar(logged_in_api_client, factories):
     user.refresh_from_db()
 
     assert user.actor.attachment_icon == attachment
+    assert "avatar" in response.data
 
 
 def test_creating_user_creates_actor_as_well(
-- 
GitLab