summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2015-11-10 12:44:17 +0000
committerDaniel Wagner-Hall <dawagner@gmail.com>2015-11-10 12:44:17 +0000
commit82e8a2d7636a589b107b39b990bcd55ca691880e (patch)
tree48e34214aa6ca33ec695440fbcf7145add9b7523 /synapse/rest
parentMerge pull request #357 from matrix-org/rav/SYN-516 (diff)
parentGet display name from identity server, not client (diff)
downloadsynapse-82e8a2d7636a589b107b39b990bcd55ca691880e.tar.xz
Merge pull request #356 from matrix-org/daniel/3pidyetagain
Get display name from identity server, not client
Diffstat (limited to 'synapse/rest')
-rw-r--r--synapse/rest/client/v1/room.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py
index f7012067f7..e88a1ae290 100644
--- a/synapse/rest/client/v1/room.py
+++ b/synapse/rest/client/v1/room.py
@@ -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