Merge pull request #237 from matrix-org/daniel/3pid

Add display_name to 3pid invites in m.room.member

event-schemas/examples/m.room.member#third_party_invite

@@ -5,6 +5,7 @@
     "avatar_url": "mxc://localhost/SEsfnsuifSDFSSEF#auto",
     "displayname": "Alice Margatroid",
     "third_party_invite": {
+      "display_name": "alice",
       "signed": {
         "mxid": "@alice:localhost",
         "signatures": {

event-schemas/schema/m.room.member

@@ -27,6 +27,10 @@
                     "type": "object",
                     "title": "Invite",
                     "properties": {
+                        "display_name": {
+                            "type": "string",
+                            "description": "A name which can be displayed to represent the user instead of their third party identifier"
+                        },
                         "signed": {
                             "type": "object",
                             "title": "signed",
@@ -49,7 +53,7 @@
                             "required": ["mxid", "signatures", "token"]
                         }
                     },
-                    "required": ["signed"]
+                    "required": ["display_name", "signed"]
                 }
             },
             "required": ["membership"]