Mark Haines
d39494b6df
Fix typo in sync example
2015-11-26 16:55:12 +00:00
Mark Haines
5bae15d47b
Merge branch 'master' into markjh/room_tags
...
Conflicts:
api/client-server/v2_alpha/sync.yaml
2015-11-20 18:39:15 +00:00
Richard van der Hoff
d7d59d78e1
/sync: Put state dict back to being a list
...
Turning the state into a dict-of-dicts caused more pain than it solved. Put it
back to a list.
2015-11-18 16:17:29 +00:00
Mark Haines
fcbb985073
s/private_user_data/account_data/
2015-11-18 15:27:26 +00:00
Mark Haines
299af673da
Specify how ordering of tags is supposed to work
2015-11-16 17:04:19 +00:00
Mark Haines
3b390bff3c
Merge branch 'master' into markjh/room_tags
...
Conflicts:
api/client-server/v1/rooms.yaml
specification/targets.yaml
2015-11-16 16:56:35 +00:00
Richard van der Hoff
e1b12a753e
Fix typos and missing file
2015-11-16 00:17:22 +00:00
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
2015-11-16 00:00:48 +00:00
Richard van der Hoff
b41d771c15
Fix typos in /sync example response
2015-11-15 23:58:04 +00:00
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.
2015-11-15 23:47:35 +00:00
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.
2015-11-15 23:47:35 +00:00
Mark Haines
d53814097f
Add example content to the tags in example tag events
2015-11-03 15:57:06 +00:00
Mark Haines
e9d361841b
Fix tag examples
2015-11-03 15:42:58 +00:00
Mark Haines
451801bf38
Add an example of `prev_content in unsigned` to v2 /sync
2015-10-29 18:40:05 +00:00
Richard van der Hoff
ece42688d0
Clarify the interaction between full_state and timeout.
2015-10-26 19:20:58 +00:00
Mark Haines
65066a76b3
Add the m.tags event to a `private_user_data key rather than including it under the ephemeral` key
2015-10-26 18:30:04 +00:00
Richard van der Hoff
13eddd456f
Proposal for adding full_state param to v2 sync
2015-10-26 15:52:45 +00:00
Mark Haines
4f606cf3a7
Add the fields required by the templating system to v2 sync
2015-10-06 17:31:05 +01:00
Mark Haines
0ce533d153
Split the room_map into separate sections based on whether they are
...
"joined/invited/archived".
Rename the room_map to rooms and remove the grouping indirection. When we
want groups then we can add them under a separate key, either at the
top-level or as part of the events themselves.
2015-10-06 13:42:03 +01:00
Mark Haines
0e5b00feaa
Fix event type in v2 sync example
2015-10-05 16:10:25 +01:00
Mark Haines
bbb5fa9398
Fix the state_key in the example v2 response, include the "sender" key in the list of keys included with invite_state events
2015-10-05 15:36:01 +01:00
Mark Haines
a7b808c5cd
Add a invite_state key for holding the state that is bundled with an
...
invite. This is kept separate from the actual state for the room as
it may be derived from an incomplete, unverified copy of the state
that was bundled with an invite event received over federation.
2015-10-05 15:26:33 +01:00
Mark Haines
ed0f6d3ff3
Typo
2015-10-05 14:22:50 +01:00
Mark Haines
97cdd8106c
s|client/api/v2_alpha|/client/v2_alpha|
2015-10-05 14:21:16 +01:00
Mark Haines
047419f2ad
Remove the room_id since it is redundent. Remove text about invite event handling till we've thought about it some more.
2015-10-02 16:21:48 +01:00
Mark Haines
bde003fe86
Split the rooms out into a separate top level key.
...
Divide the rooms into separate groups in preparation for adding tag
support.
Further subdivide the rooms into "joined/invited/archived" based the
membership of the user in the room because that membership affects what
events the user can view from the room. E.g only users that are joined
to a room may see the ephemeral events for the room.
2015-10-02 16:14:24 +01:00
Mark Haines
a73cc50aa9
s|client/api/v2_alpha|client/v2_alpha|
2015-10-02 13:03:39 +01:00
Mark Haines
931057accf
Add a top level presence key for the presence events and remove the public_user_data/private_user_data for now
2015-09-30 10:30:39 +01:00
Mark Haines
4cb3f78d2b
Wrap the "rooms" list inside an object so that we can add keys for pagination later
2015-09-29 19:48:48 +01:00
Mark Haines
218cf94ead
Replace the events array with events_map inside the room objects.
...
Only use indirection for the state and timeline events.
Use event_ids to reference the state and timeline events.
2015-09-29 19:10:31 +01:00
Mark Haines
c115b4c2f4
Document the valid values for the "set_presence" parameter
2015-09-28 13:47:04 +01:00
Mark Haines
00fd4aac26
s/publically/publicly/
2015-09-28 13:06:04 +01:00
Mark Haines
3204c2f2b6
Fix spelling
2015-09-28 13:04:37 +01:00
Mark Haines
f50e6d4c0a
Add x-example fields for v2 /sync
2015-09-28 13:02:52 +01:00
Mark Haines
c3b3b2df63
Add "set_presence" in the sync parameters
2015-09-25 19:37:41 +01:00
Mark Haines
a0068e1ada
Draft documention for the v2 sync api
2015-09-25 18:10:28 +01:00
