wholetrans/docs-matrix-spec
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into appservice-swagger

Browse source 
Conflicts:
	specification/application_service_api.rst
This commit is contained in:
Kegan Dougal 2015-10-21 09:55:53 +01:00
commit f95d19cecd
24 changed files with 914 additions and 392 deletions
Download patch file Download diff file Expand all files Collapse all files

9
templating/matrix_templates/units.py
View file

@ -532,6 +532,15 @@ class MatrixUnits(Units):
Units.prop(json_schema, "properties/content")
)
# This is horrible because we're special casing a key on m.room.member.
# We need to do this because we want to document a non-content object.
if schema["type"] == "m.room.member":
invite_room_state = get_json_schema_object_fields(
json_schema["properties"]["invite_room_state"]["items"]
)
schema["content_fields"].extend(invite_room_state)
# grab msgtype if it is the right kind of event
msgtype = Units.prop(
json_schema, "properties/content/properties/msgtype/enum"