summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <daniel@matrix.org>2015-11-09 17:26:43 +0000
committerDaniel Wagner-Hall <daniel@matrix.org>2015-11-09 17:26:43 +0000
commit0d63dc3ec983f9ae21eeedd4276b1ac767e9cc1b (patch)
tree7c641d75b6b89a895bc6f6f40fc19145ba4ab9f1 /synapse/rest
parentMerge pull request #353 from matrix-org/daniel/oops (diff)
downloadsynapse-0d63dc3ec983f9ae21eeedd4276b1ac767e9cc1b.tar.xz
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 6e0d93766b..90ded26ff8 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