OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3391 from t3chguy/t3chguy/default_inviter_display_name_3pid 

if inviter_display_name == ""||None then default to inviter MXID
pull/3384/head
Richard van der Hoff 2018-07-27 10:08:39 +01:00 committed by GitHub
parent 781c2bd21a 38eaa5280d
commit b0b5566f36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/3391.bugfix Normal file
View File

@ -0,0 +1 @@
Default inviter_display_name to mxid for email invites

4
synapse/handlers/room_member.py
View File

@ -708,6 +708,10 @@ class RoomMemberHandler(object):
inviter_display_name = member_event.content.get("displayname", "") inviter_display_name = member_event.content.get("displayname", "")
inviter_avatar_url = member_event.content.get("avatar_url", "") 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_room_alias = ""
canonical_alias_event = room_state.get((EventTypes.CanonicalAlias, "")) canonical_alias_event = room_state.get((EventTypes.CanonicalAlias, ""))
if canonical_alias_event: if canonical_alias_event: