Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 10:46:06 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #356 from matrix-org/daniel/3pidyetagain

Browse source 
Get display name from identity server, not client
This commit is contained in:
Daniel Wagner-Hall 2015-11-10 12:44:17 +00:00
commit 82e8a2d763
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
synapse/rest/client/v1/room.py
View file

@ -459,7 +459,6 @@ class RoomMembershipRestServlet(ClientV1RestServlet):
content["medium"],
content["address"],
content["id_server"],
content["display_name"],
token_id,
txn_id
)
@ -494,7 +493,7 @@ class RoomMembershipRestServlet(ClientV1RestServlet):
defer.returnValue((200, {}))
def _has_3pid_invite_keys(self, content):
for key in {"id_server", "medium", "address", "display_name"}:
for key in {"id_server", "medium", "address"}:
if key not in content:
return False
return True