Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Omit keys rather then returning null in profile API #557

Merged
merged 2 commits into from
Feb 4, 2016
Merged

Omit keys rather then returning null in profile API #557

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24277fb
Don't return null if profile display name / avatar url isn't set: omi…
dbkr Feb 3, 2016
156cea5
No braces here
dbkr Feb 3, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions synapse/rest/client/v1/profile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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):
Expand Down Expand Up @@ -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):
Expand Down