Merge pull request #557 from matrix-org/dbkr/profile_dont_return_null

Omit keys rather then returning null in profile API
matrix-org · Feb 4, 2016 · 34dda7c · 34dda7c
2 parents 4d36e73 + 156cea5
commit 34dda7c
Showing 1 changed file with 17 additions and 6 deletions.
diff --git a/synapse/rest/client/v1/profile.py b/synapse/rest/client/v1/profile.py
@@ -33,7 +33,11 @@ def on_GET(self, request, user_id):
             user,
         )
 
-        defer.returnValue((200, {"displayname": displayname}))
+        ret = {}
+        if displayname is not None:
+            ret["displayname"] = displayname
+
+        defer.returnValue((200, ret))
 
     @defer.inlineCallbacks
     def on_PUT(self, request, user_id):
@@ -66,7 +70,11 @@ def on_GET(self, request, user_id):
             user,
         )
 
-        defer.returnValue((200, {"avatar_url": avatar_url}))
+        ret = {}
+        if avatar_url is not None:
+            ret["avatar_url"] = avatar_url
+
+        defer.returnValue((200, ret))
 
     @defer.inlineCallbacks
     def on_PUT(self, request, user_id):
@@ -102,10 +110,13 @@ def on_GET(self, request, user_id):
             user,
         )
 
-        defer.returnValue((200, {
-            "displayname": displayname,
-            "avatar_url": avatar_url
-        }))
+        ret = {}
+        if displayname is not None:
+            ret["displayname"] = displayname
+        if avatar_url is not None:
+            ret["avatar_url"] = avatar_url
+
+        defer.returnValue((200, ret))
 
 
 def register_servlets(hs, http_server):