29bd4d45ee
Flatten the response to /sync
...
Now that we don't expect there to be duplication betwen the 'timeline' and
'state' results, there's no point in having the state map. (That does mean the
events themselves need event_id fields though).
Also:
- move the contents of the 'unsigned' dictionary into the events themselves
- replace the state list with two layers of dictionary keyed on type and
state_key
- rename the children of the 'rooms' dict from "joined/invited/archived" to
"join/invite/leave" to match the membership states
9 years ago
b41d771c15
Fix typos in /sync example response
9 years ago
57995a815a
Fix a number of untruths in the documentation about /sync.
...
Attempts to make the /sync documentation better represent fact as it currently
stands - in particular document the structure of the returned events.
9 years ago
3f0262081c
Update sync API defn to reflect SPEC-254 changes
...
State now corresponds to the start of the timeline, not the end.
9 years ago
838af2a23e
Updates to swagger table generation
...
A bunch of related fixes to the code for parsing the state and API yaml files:
1. Some of our objects are {key: {key: value}} - style nested key/value
dictionaries. Handle this by refactoring get_json_schema_object_fields so
that such objects are handled wherever they appear, rather than when they
are just subproperties of a 'proper' object.
2. Fix multi-level inheritance (so an object can have an 'allOf' property which
can successfully refer to an object which itself has an 'allOf' property).
3. $ref fields in event schemas weren't being expanded correctly
4. sort type tables breadth-first rather than depth-first so that the ordering
in complex structures like the /sync response makes a bit more sense.
9 years ago
cc8ef691fb
Rewrite the table templates
...
Allow columns to stretch if they end up with wide content.
Apart from the hassle of having to manually update the calculations, having the
columns wide enough to hold the widest thing they might ever have leads to
tables with lots of whitespace in the results.
9 years ago
988d773476
/make_join protoevent no longer needs the pointless 'prev_state' key (SYN-517)
9 years ago
885dd1e86c
Explain the 'prev_events' join protoevent key
9 years ago
db5a90edcd
Avoid using the words 'current state' when talking about the result of the /make_join request
9 years ago
aac45295ee
Remark that the directory server step could be skipped in an invite case
9 years ago
d7c69fae43
Fix typo 'process'
9 years ago
ea364a108b
Merge pull request #161 from matrix-org/daniel/guestdisplaynames
...
Merge pull request #161 from matrix-org/daniel/guestdisplaynames
Guests are allowed to set displaynames
9 years ago
c5e4d08e3b
Merge pull request #158 from matrix-org/daniel/guestroominitialsync
...
Merge pull request #158 from matrix-org/daniel/guestroominitialsync
Guest users are allowed room initialSync
9 years ago
29d9c8eec6
Guests are allowed to set displaynames
9 years ago
4d3175fc8b
Note that invite_room_state is optional
9 years ago
061105c9dc
Guest users are allowed room initialSync
9 years ago
703b9d456b
Merge pull request #157 from matrix-org/daniel/specfetch
...
speculator: Nessle up some more if statements
9 years ago
0f0359d9c1
speculator: Nessle up some more if statements
9 years ago
567ba6d22d
Merge pull request #156 from matrix-org/daniel/specfetch
...
speculator: Fetch before deciding head is fresh
9 years ago
740cc66a7c
speculator: Fetch before deciding head is fresh
9 years ago
a80fcfa83b
Merge pull request #155 from matrix-org/daniel/publicwritable2
...
Specify /publicRooms world_readable and guest_access
Depends on https://github.com/matrix-org/matrix-doc/pull/154
9 years ago
dcf54e11b1
Specify /publicRooms world_readable and guest_access
...
Depends on https://github.com/matrix-org/matrix-doc/pull/154
9 years ago
b6a4dfa7cd
Merge pull request #154 from matrix-org/daniel/publicwritable
...
Specify /publicRooms
9 years ago
d7357ef9b7
Specify /publicRooms
9 years ago
27ffe7bacd
Don't serve rst diffs as HTML
9 years ago
c00abe9f2f
Fix msgtype display
9 years ago
071edcd86e
Merge branch 'master' into daniel/multipleexamples
9 years ago
624756fb9a
Merge pull request #153 from matrix-org/daniel/3pidyetagain
...
3pid invites: remove mentions of display_name
9 years ago
bdf755632e
Merge pull request #152 from matrix-org/daniel/macaroons
...
Document macaroon type=login
9 years ago
c8f6ed1107
More formatting..
9 years ago
51fe4a90b6
More formatting fixes
9 years ago
c1866ebebc
Fix table formatting
9 years ago
24c2036a35
3pid invites: remove mentions of display_name
9 years ago
68bec3a61a
Merge pull request #151 from matrix-org/daniel/continuservconcurrency
...
continuserv: guard concurrent accesses to wg
9 years ago
c3608b3a69
Merge branch 'master' into daniel/continuservconcurrency
...
Conflicts:
scripts/continuserv/main.go
9 years ago
436a35e9f6
Document macaroon type=login
9 years ago
e72151f2c3
Specify guest room access
...
This was reviewed as PR #150 and merged from daniel/anonymousaccess
9 years ago
16b91086b0
Merge pull request #149 from matrix-org/daniel/continuservcontenttype
...
continuserv: set Content-Type header
9 years ago
bbf9e229a7
continuserv: guard concurrent accesses to wg
9 years ago
1be5b856bd
Preserve text/plain for errors
...
Newlines are nice
9 years ago
7f6eafdce5
continuserv: set Content-Type header
9 years ago
d5f96af1f1
Merge branch 'master' into daniel/multipleexamples
9 years ago
cfdcf9e5a3
Merge pull request #148 from matrix-org/daniel/leadingspacesucks
...
speculator: Send Content-Type: text/html header
9 years ago
937ff046d8
Force / to be HTML too
9 years ago
559747e77a
speculator: Sent Content-Type: text/html header
...
Go is auto-detecting that this is XML (because for some reason we
generate XHTML), and serving it with a Content-Type header text/xml.
This causes the browser to render it as XHTML, which gives interesting
quirks like extra newlines.
This forces the browser to interpret it as HTML.
What we should probably do instead of stop generating XHTML and start
generating HTML. But in the mean time, this will fix the rendering
issues.
9 years ago
2734f9f9f2
Merge branch 'master' into daniel/multipleexamples
...
Conflicts:
specification/modules/third_party_invites.rst
9 years ago
161441fa3a
Update 3pid spec based on new implementation
9 years ago
232b10b0f6
Merge branch 'master' of github.com:matrix-org/matrix-doc
9 years ago
8cba11b1cd
Add some links to spec bugs for display names
...
Just added a couple of TODO comments to useful jira bugs
9 years ago
2fd5fc39a0
Add spec for calculating display names for rooms and users
...
Merged from https://github.com/matrix-org/matrix-doc/pull/145
9 years ago
Richard van der Hoff