diff options
| author | Erik Johnston <erik@matrix.org> | 2018-07-30 09:56:18 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-07-30 09:56:18 +0100 |
| commit | 143f1a2532e4a583c4f4f215334800cb63a4117f (patch) | |
| tree | 2926318407e42844fcf70211f6596ccab919b184 /synapse/handlers/room_member.py | |
| parent | Newsfile (diff) | |
| parent | make /context lazyload & filter aware (#3567) (diff) | |
| download | synapse-143f1a2532e4a583c4f4f215334800cb63a4117f.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_fed_store
Diffstat (limited to 'synapse/handlers/room_member.py')
| -rw-r--r-- | synapse/handlers/room_member.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py index a832d91809..0d4a3f4677 100644 --- a/synapse/handlers/room_member.py +++ b/synapse/handlers/room_member.py @@ -708,6 +708,10 @@ class RoomMemberHandler(object): inviter_display_name = member_event.content.get("displayname", "") inviter_avatar_url = member_event.content.get("avatar_url", "") + # if user has no display name, default to their MXID + if not inviter_display_name: + inviter_display_name = user.to_string() + canonical_room_alias = "" canonical_alias_event = room_state.get((EventTypes.CanonicalAlias, "")) if canonical_alias_event: |