Commit Graph

1288 Commits (c96848d1bc9d95cefc4c6891b0bab06a83a01307)
 

Author SHA1 Message Date
Kegsay 2b19b50f4f Merge pull request #167 from matrix-org/more_nesting
Support more nesting
9 years ago
Erik Johnston e2eb0c7ad9 Add new request options 9 years ago
Paul "LeoNerd" Evans 923f05e554 More consistency around 'resident homeserver' 9 years ago
Paul "LeoNerd" Evans 36af793f05 s/full object/full event/ 9 years ago
Kegan Dougal 8648f86032 Moar spaces 9 years ago
Erik Johnston 96be7ff241 Support more nesting 9 years ago
Richard van der Hoff e1b12a753e Fix typos and missing file 9 years ago
Richard van der Hoff 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
Richard van der Hoff b41d771c15 Fix typos in /sync example response 9 years ago
Richard van der Hoff 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
Richard van der Hoff 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
Richard van der Hoff 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
Richard van der Hoff 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
Paul "LeoNerd" Evans 988d773476 /make_join protoevent no longer needs the pointless 'prev_state' key (SYN-517) 9 years ago
Paul "LeoNerd" Evans 885dd1e86c Explain the 'prev_events' join protoevent key 9 years ago
Paul "LeoNerd" Evans db5a90edcd Avoid using the words 'current state' when talking about the result of the /make_join request 9 years ago
Paul "LeoNerd" Evans aac45295ee Remark that the directory server step could be skipped in an invite case 9 years ago
Paul "LeoNerd" Evans d7c69fae43 Fix typo 'process' 9 years ago
Daniel Wagner-Hall 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
Daniel Wagner-Hall 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
Daniel Wagner-Hall 29d9c8eec6 Guests are allowed to set displaynames 9 years ago
Daniel Wagner-Hall 4d3175fc8b Note that invite_room_state is optional 9 years ago
Daniel Wagner-Hall 061105c9dc Guest users are allowed room initialSync 9 years ago
Daniel Wagner-Hall 703b9d456b Merge pull request #157 from matrix-org/daniel/specfetch
speculator: Nessle up some more if statements
9 years ago
Daniel Wagner-Hall 0f0359d9c1 speculator: Nessle up some more if statements 9 years ago
Daniel Wagner-Hall 567ba6d22d Merge pull request #156 from matrix-org/daniel/specfetch
speculator: Fetch before deciding head is fresh
9 years ago
Daniel Wagner-Hall 740cc66a7c speculator: Fetch before deciding head is fresh 9 years ago
Daniel Wagner-Hall 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
Daniel Wagner-Hall dcf54e11b1 Specify /publicRooms world_readable and guest_access
Depends on https://github.com/matrix-org/matrix-doc/pull/154
9 years ago
Daniel Wagner-Hall b6a4dfa7cd Merge pull request #154 from matrix-org/daniel/publicwritable
Specify /publicRooms
9 years ago
Daniel Wagner-Hall d7357ef9b7 Specify /publicRooms 9 years ago
Daniel Wagner-Hall 27ffe7bacd Don't serve rst diffs as HTML 9 years ago
Daniel Wagner-Hall c00abe9f2f Fix msgtype display 9 years ago
Daniel Wagner-Hall 071edcd86e Merge branch 'master' into daniel/multipleexamples 9 years ago
Daniel Wagner-Hall 624756fb9a Merge pull request #153 from matrix-org/daniel/3pidyetagain
3pid invites: remove mentions of display_name
9 years ago
Daniel Wagner-Hall bdf755632e Merge pull request #152 from matrix-org/daniel/macaroons
Document macaroon type=login
9 years ago
Kegsay c8f6ed1107 More formatting.. 9 years ago
Kegsay 51fe4a90b6 More formatting fixes 9 years ago
Kegsay c1866ebebc Fix table formatting 9 years ago
Daniel Wagner-Hall 24c2036a35 3pid invites: remove mentions of display_name 9 years ago
Daniel Wagner-Hall 68bec3a61a Merge pull request #151 from matrix-org/daniel/continuservconcurrency
continuserv: guard concurrent accesses to wg
9 years ago
Daniel Wagner-Hall c3608b3a69 Merge branch 'master' into daniel/continuservconcurrency
Conflicts:
	scripts/continuserv/main.go
9 years ago
Daniel Wagner-Hall 436a35e9f6 Document macaroon type=login 9 years ago
Daniel Wagner-Hall e72151f2c3 Specify guest room access
This was reviewed as PR #150 and merged from daniel/anonymousaccess
9 years ago
Daniel Wagner-Hall 16b91086b0 Merge pull request #149 from matrix-org/daniel/continuservcontenttype
continuserv: set Content-Type header
9 years ago
Daniel Wagner-Hall bbf9e229a7 continuserv: guard concurrent accesses to wg 9 years ago
Daniel Wagner-Hall 1be5b856bd Preserve text/plain for errors
Newlines are nice
9 years ago
Daniel Wagner-Hall 7f6eafdce5 continuserv: set Content-Type header 9 years ago
Daniel Wagner-Hall d5f96af1f1 Merge branch 'master' into daniel/multipleexamples 9 years ago
Daniel Wagner-Hall cfdcf9e5a3 Merge pull request #148 from matrix-org/daniel/leadingspacesucks
speculator: Send Content-Type: text/html header
9 years ago