Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix merge fail with anon access stuff | David Baker | 2015-12-22 | 1 | -2/+2 |
| | |||||
* | Merge remote-tracking branch 'origin/develop' into store_event_actions | David Baker | 2015-12-22 | 1 | -45/+107 |
|\ | |||||
| * | Include the list of bad room ids in the error | Mark Haines | 2015-12-22 | 1 | -2/+8 |
| | | |||||
| * | Use a list comprehension | Mark Haines | 2015-12-22 | 1 | -3/+4 |
| | | |||||
| * | Hook up read receipts and typing notifications for guest access | Mark Haines | 2015-12-22 | 1 | -13/+11 |
| | | |||||
| * | Allow guest access to /sync | Mark Haines | 2015-12-22 | 1 | -46/+98 |
| | | |||||
| * | Allow guest access if the user provides a list of rooms in the filter | Mark Haines | 2015-12-22 | 1 | -0/+1 |
| | | |||||
* | | Add some comments to areas that could be optimised. | David Baker | 2015-12-22 | 1 | -0/+3 |
| | | |||||
* | | Merge remote-tracking branch 'origin/develop' into store_event_actions | David Baker | 2015-12-21 | 1 | -4/+12 |
|\| | |||||
| * | Do the /sync in parallel accross the rooms like /initialSync does | Mark Haines | 2015-12-11 | 1 | -4/+12 |
| | | |||||
* | | pep8 | David Baker | 2015-12-21 | 1 | -3/+3 |
| | | |||||
* | | Make unread notification count sending work: put the correct count in ↵ | David Baker | 2015-12-18 | 1 | -11/+37 |
| | | | | | | | | incremental syncs too, where necessary, and fix silly bugs like only select the event actions for that user... | ||||
* | | still very WIP, but now sends unread_notifications_count in the room object ↵ | David Baker | 2015-12-16 | 1 | -0/+26 |
|/ | | | | on sync (only actually corrrect in a full sync: hardcoded to 0 in incremental syncs). | ||||
* | Only include the archived rooms if a include_leave flag in set in the filter | Mark Haines | 2015-12-04 | 1 | -6/+6 |
| | |||||
* | Add API for setting account_data globaly or on a per room basis | Mark Haines | 2015-12-01 | 1 | -15/+57 |
| | |||||
* | s/private_user_data/account_data/ | Mark Haines | 2015-11-18 | 1 | -14/+14 |
| | |||||
* | Fix a few race conditions in the state calculation | Richard van der Hoff | 2015-11-13 | 1 | -60/+63 |
| | | | | | | | | | | | | | | | | | | | Be a bit more careful about how we calculate the state to be returned by /sync. In a few places, it was possible for /sync to return slightly later state than that represented by the next_batch token and the timeline. In particular, the following cases were susceptible: * On a full state sync, for an active room * During a per-room incremental sync with a timeline gap * When the user has just joined a room. (Refactor check_joined_room to make it less magical) Also, use store.get_state_for_events() (and thus the existing stategroups) to calculate the state corresponding to a particular sync position, rather than state_handler.compute_event_context(), which recalculates from first principles (and tends to miss some state). Merged from PR https://github.com/matrix-org/synapse/pull/372 | ||||
* | Make handlers.sync return a state dictionary, instead of an event list. | Richard van der Hoff | 2015-11-13 | 1 | -31/+39 |
| | | | | | | | | | Basically this moves the process of flattening the existing dictionary into a list up to rest.client.*, instead of doing it in handlers.sync. This simplifies a bit of the code in handlers.sync, but it is also going to be somewhat beneficial in the next stage of my hacking on SPEC-254. Merged from PR #371 | ||||
* | Update some comments | Richard van der Hoff | 2015-11-13 | 1 | -10/+24 |
| | | | | | | | Add a couple of type annotations, docstrings, and other comments, in the interest of keeping track of what types I have. Merged from pull request #370. | ||||
* | Don't fiddle with results returned by event sources | Richard van der Hoff | 2015-11-09 | 1 | -4/+12 |
| | | | | | | Overwriting hashes returned by other methods is poor form. Fixes: SYN-516 | ||||
* | SYN-513: Include updates for rooms that have had all their tags deleted | Mark Haines | 2015-11-09 | 1 | -1/+1 |
| | |||||
* | Open up /events to anonymous users for room events only | Daniel Wagner-Hall | 2015-11-05 | 1 | -3/+17 |
| | | | | Squash-merge of PR #345 from daniel/anonymousevents | ||||
* | Merge branch 'develop' into daniel/removesomelies | Mark Haines | 2015-11-04 | 1 | -20/+82 |
|\ | | | | | | | | | Conflicts: synapse/notifier.py | ||||
| * | Merge branch 'develop' into markjh/v2_sync_receipts | Mark Haines | 2015-11-03 | 1 | -10/+57 |
| |\ | | | | | | | | | | | | | Conflicts: synapse/handlers/sync.py | ||||
| | * | Include room tags in v2 /sync | Mark Haines | 2015-11-02 | 1 | -11/+58 |
| | | | |||||
| * | | Include read receipts in v2 sync | Mark Haines | 2015-11-02 | 1 | -15/+30 |
| |/ | |||||
* | | Remove more unused parameters | Daniel Wagner-Hall | 2015-11-02 | 1 | -1/+0 |
| | | |||||
* | | Remove unused arguments and code | Daniel Wagner-Hall | 2015-11-02 | 1 | -14/+1 |
|/ | |||||
* | Update the other place check_joined_room is called | Mark Haines | 2015-10-30 | 1 | -1/+1 |
| | |||||
* | Don't mark newly joined room timelines as limited in an incremental sync | Mark Haines | 2015-10-29 | 1 | -3/+5 |
| | |||||
* | Implement full_state incremental sync | Richard van der Hoff | 2015-10-26 | 1 | -17/+34 |
| | | | | | | | | A hopefully-complete implementation of the full_state incremental sync, as specced at https://github.com/matrix-org/matrix-doc/pull/133. This actually turns out to be a relatively simple modification to the initial sync implementation. | ||||
* | Merge branch 'develop' into markjh/v2_sync_typing | Mark Haines | 2015-10-21 | 1 | -3/+127 |
|\ | | | | | | | | | Conflicts: synapse/handlers/sync.py | ||||
| * | Include banned rooms in the archived section of v2 sync | Mark Haines | 2015-10-21 | 1 | -6/+9 |
| | | |||||
| * | Fix pep8 | Mark Haines | 2015-10-19 | 1 | -1/+0 |
| | | |||||
| * | Add rooms that the user has left under archived in v2 sync. | Mark Haines | 2015-10-19 | 1 | -3/+125 |
| | | |||||
* | | Doc string for the SyncHandler.typing_by_room method | Mark Haines | 2015-10-21 | 1 | -0/+12 |
| | | |||||
* | | Include typing events in initial v2 sync | Mark Haines | 2015-10-20 | 1 | -14/+29 |
|/ | |||||
* | Amalgamate _filter_events_for_client | Erik Johnston | 2015-10-16 | 1 | -47/+1 |
| | |||||
* | Merge pull request #305 from matrix-org/markjh/v2_sync_api | Mark Haines | 2015-10-14 | 1 | -92/+105 |
|\ | | | | | Update the v2 sync API to work as specified in the current spec. | ||||
| * | Fix v2 sync polling | Mark Haines | 2015-10-14 | 1 | -3/+3 |
| | | |||||
| * | Add a get_invites_for_user method to the storage to find out the rooms a ↵ | Mark Haines | 2015-10-13 | 1 | -6/+2 |
| | | | | | | | | user is invited to | ||||
| * | Include invites in incremental sync | Mark Haines | 2015-10-13 | 1 | -6/+25 |
| | | |||||
| * | Include invited rooms in the initial sync | Mark Haines | 2015-10-13 | 1 | -10/+6 |
| | | |||||
| * | Start spliting out the rooms into joined and invited in v2 sync | Mark Haines | 2015-10-13 | 1 | -18/+40 |
| | | |||||
| * | Update the filters to match the latest spec. | Mark Haines | 2015-10-12 | 1 | -3/+3 |
| | | | | | | | | | | Apply the filter the 'timeline' and 'ephemeral' keys of rooms. Apply the filter to the 'presence' key of a sync response. | ||||
| * | Update the v2 room sync format to match the current v2 spec | Mark Haines | 2015-10-08 | 1 | -14/+11 |
| | | |||||
| * | Move the rooms out into a room_map mapping from room_id to room. | Mark Haines | 2015-10-05 | 1 | -18/+9 |
| | | |||||
| * | Start updating the sync API to match the specification | Mark Haines | 2015-10-01 | 1 | -36/+28 |
| | | |||||
* | | Remove unused room_id arg | Erik Johnston | 2015-10-14 | 1 | -1/+1 |
|/ | |||||
* | Fix up one more reference | Daniel Wagner-Hall | 2015-08-25 | 1 | -1/+0 |
| | |||||
* | Don't get apservice interested rooms in RoomHandler.get_joined_rooms_for_users | Erik Johnston | 2015-08-19 | 1 | -3/+21 |
| | |||||
* | Fix _filter_events_for_client | Erik Johnston | 2015-08-12 | 1 | -3/+1 |
| | |||||
* | Use list comprehension instead of filter | Erik Johnston | 2015-08-12 | 1 | -10/+3 |
| | |||||
* | Remove debug loggers | Erik Johnston | 2015-08-11 | 1 | -3/+0 |
| | |||||
* | Fix application of ACLs | Erik Johnston | 2015-08-11 | 1 | -4/+13 |
| | |||||
* | Speed up event filtering (for ACL) logic | Erik Johnston | 2015-08-04 | 1 | -1/+5 |
| | |||||
* | Rename key and values for m.room.history_visibility. Support 'invited' value | Erik Johnston | 2015-07-06 | 1 | -5/+20 |
| | |||||
* | Respect m.room.history_visibility in v2_alpha sync API | Erik Johnston | 2015-07-03 | 1 | -0/+33 |
| | |||||
* | Fix v2 sync, update the last_notified_ms only if there was an active listener | Mark Haines | 2015-05-14 | 1 | -1/+1 |
| | |||||
* | Change room handlers get_rooms_for_user to get_joined_rooms_for_user. This ↵ | Erik Johnston | 2015-03-09 | 1 | -2/+4 |
| | | | | uses the a storage api that is cached. | ||||
* | Fix code-style | Mark Haines | 2015-02-10 | 1 | -1/+1 |
| | |||||
* | During room intial sync, only calculate current state once. | Erik Johnston | 2015-02-09 | 1 | -3/+6 |
| | |||||
* | SYN-258: get_recent_events_for_room only accepts stream tokens, convert the ↵ | Mark Haines | 2015-02-06 | 1 | -1/+3 |
| | | | | topological token to a stream token before passing it to get_recent_events_for_room | ||||
* | Return empty list rather than None when there are no emphemeral events for a ↵ | Mark Haines | 2015-01-30 | 1 | -1/+1 |
| | | | | room | ||||
* | Add doc string for __nonzero__ overrides for sync results, raise not ↵ | Mark Haines | 2015-01-30 | 1 | -1/+8 |
| | | | | implemented if the client attempts to do a gapless sync | ||||
* | Check if the user has joined the room between incremental syncs | Mark Haines | 2015-01-30 | 1 | -4/+27 |
| | |||||
* | Pass client info to the sync_config | Mark Haines | 2015-01-30 | 1 | -2/+3 |
| | |||||
* | Fix token formatting | Mark Haines | 2015-01-30 | 1 | -3/+3 |
| | |||||
* | Filter the recent events before applying the limit when doing an initial sync | Mark Haines | 2015-01-30 | 1 | -11/+10 |
| | |||||
* | Filter the recent events before applying the limit when doing an incremental ↵ | Mark Haines | 2015-01-30 | 1 | -15/+38 |
| | | | | sync with a gap | ||||
* | Update todo for the filtering on sync | Mark Haines | 2015-01-29 | 1 | -1/+2 |
| | |||||
* | Fix indent | Mark Haines | 2015-01-29 | 1 | -1/+1 |
| | |||||
* | Move typing notifs to an "emphermal" event list on the room object | Mark Haines | 2015-01-29 | 1 | -5/+7 |
| | |||||
* | Fix check for empty room update | Mark Haines | 2015-01-29 | 1 | -1/+1 |
| | |||||
* | Fix v2 initial sync | Mark Haines | 2015-01-29 | 1 | -1/+2 |
| | |||||
* | Use get_room_events_stream to get changes to the rooms if the number of ↵ | Mark Haines | 2015-01-29 | 1 | -11/+45 |
| | | | | changes is small | ||||
* | Remove typing TODO | Mark Haines | 2015-01-29 | 1 | -1/+0 |
| | |||||
* | Add typing notifications to sync | Mark Haines | 2015-01-29 | 1 | -9/+21 |
| | |||||
* | Fix Formatting | Mark Haines | 2015-01-27 | 1 | -8/+5 |
| | |||||
* | Wait for events if the incremental sync is empty and a timeout is given | Mark Haines | 2015-01-27 | 1 | -7/+12 |
| | |||||
* | Start implementing incremental initial sync | Mark Haines | 2015-01-27 | 1 | -25/+208 |
| | |||||
* | Start implementing the non-incremental sync portion of the v2 /sync API | Mark Haines | 2015-01-26 | 1 | -25/+62 |
| | |||||
* | Add handler for /sync API | Mark Haines | 2015-01-26 | 1 | -0/+110 |