diff options
| author | Daniel Wagner-Hall <daniel@matrix.org> | 2016-02-12 15:11:49 +0000 |
|---|---|---|
| committer | review.rocks <nobody@review.rocks> | 2016-02-12 15:11:49 +0000 |
| commit | cf81375b94c4763766440471e632fc4b103450ab (patch) | |
| tree | 00826864651550411f164dcb510cd1f7d6e5b6de /synapse/handlers/profile.py | |
| parent | Merge pull request #574 from matrix-org/markjh/connection_closed (diff) | |
| download | synapse-cf81375b94c4763766440471e632fc4b103450ab.tar.xz | |
Merge two of the room join codepaths
There's at least one more to merge in. Side-effects: * Stop reporting None as displayname and avatar_url in some cases * Joining a room by alias populates guest-ness in join event * Remove unspec'd PUT version of /join/<room_id_or_alias> which has not been called on matrix.org according to logs * Stop recording access_token_id on /join/room_id - currently we don't record it on /join/room_alias; I can try to thread it through at some point.
Diffstat (limited to 'synapse/handlers/profile.py')
| -rw-r--r-- | synapse/handlers/profile.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/synapse/handlers/profile.py b/synapse/handlers/profile.py index 629e6e3594..32af622733 100644 --- a/synapse/handlers/profile.py +++ b/synapse/handlers/profile.py @@ -169,8 +169,15 @@ class ProfileHandler(BaseHandler): consumeErrors=True ).addErrback(unwrapFirstError) - state["displayname"] = displayname - state["avatar_url"] = avatar_url + if displayname is None: + del state["displayname"] + else: + state["displayname"] = displayname + + if avatar_url is None: + del state["avatar_url"] + else: + state["avatar_url"] = avatar_url defer.returnValue(None) |