rei-mirrors
/
synapse
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Omit keys rather then returning null in profile API
This commit is contained in:
David Baker 2016-02-04 15:39:12 +00:00
parent 4d36e73230 156cea5b45
commit 34dda7cc7f
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
synapse/rest/client/v1/profile.py
View File

@ -33,7 +33,11 @@ class ProfileDisplaynameRestServlet(ClientV1RestServlet):
user, user,
) )
defer.returnValue((200, {"displayname": displayname})) ret = {}
if displayname is not None:
ret["displayname"] = displayname
defer.returnValue((200, ret))
@defer.inlineCallbacks @defer.inlineCallbacks
def on_PUT(self, request, user_id): def on_PUT(self, request, user_id):
@ -66,7 +70,11 @@ class ProfileAvatarURLRestServlet(ClientV1RestServlet):
user, 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 @defer.inlineCallbacks
def on_PUT(self, request, user_id): def on_PUT(self, request, user_id):
@ -102,10 +110,13 @@ class ProfileRestServlet(ClientV1RestServlet):
user, user,
) )
defer.returnValue((200, { ret = {}
"displayname": displayname, if displayname is not None:
"avatar_url": avatar_url ret["displayname"] = displayname
})) if avatar_url is not None:
ret["avatar_url"] = avatar_url
defer.returnValue((200, ret))
def register_servlets(hs, http_server): def register_servlets(hs, http_server):