Erik Johnston
|
d4b5621e0a
|
Remove duplicate _filter_events_for_client
|
2015-10-16 15:19:52 +01:00 |
|
Erik Johnston
|
23ed7dc0e7
|
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search
|
2015-10-16 15:18:42 +01:00 |
|
Erik Johnston
|
366af6b73a
|
Amalgamate _filter_events_for_client
|
2015-10-16 14:52:48 +01:00 |
|
Erik Johnston
|
b62da463e1
|
docstring
|
2015-10-16 11:52:16 +01:00 |
|
Erik Johnston
|
bcfb653816
|
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search
|
2015-10-15 16:37:32 +01:00 |
|
Mark Haines
|
a059760954
|
Merge pull request #305 from matrix-org/markjh/v2_sync_api
Update the v2 sync API to work as specified in the current spec.
|
2015-10-14 13:56:23 +01:00 |
|
Mark Haines
|
c185c1c413
|
Fix v2 sync polling
|
2015-10-14 13:16:53 +01:00 |
|
Erik Johnston
|
8c9df8774e
|
Make 'keys' optional
|
2015-10-14 10:35:50 +01:00 |
|
Erik Johnston
|
1d9e109820
|
More TODO markers
|
2015-10-14 09:49:00 +01:00 |
|
Erik Johnston
|
d25b0f65ea
|
Add TODO markers
|
2015-10-14 09:46:31 +01:00 |
|
Erik Johnston
|
858634e1d0
|
Remove unused room_id arg
|
2015-10-14 09:31:20 +01:00 |
|
Erik Johnston
|
3e2a1297b5
|
Remove constraints in preperation of using filters
|
2015-10-13 15:22:14 +01:00 |
|
Mark Haines
|
cacf0688c6
|
Add a get_invites_for_user method to the storage to find out the rooms a user is invited to
|
2015-10-13 14:08:38 +01:00 |
|
Mark Haines
|
54414221e4
|
Include invites in incremental sync
|
2015-10-13 11:43:12 +01:00 |
|
Mark Haines
|
ab9cf73258
|
Include invited rooms in the initial sync
|
2015-10-13 11:03:48 +01:00 |
|
Erik Johnston
|
30c2783d2f
|
Search left rooms too
|
2015-10-13 10:36:36 +01:00 |
|
Mark Haines
|
f96b480670
|
Merge branch 'develop' into markjh/v2_sync_api
|
2015-10-13 10:33:00 +01:00 |
|
Mark Haines
|
956509dfec
|
Start spliting out the rooms into joined and invited in v2 sync
|
2015-10-13 10:24:51 +01:00 |
|
Mark Haines
|
586beb8318
|
Update the filters to match the latest spec.
Apply the filter the 'timeline' and 'ephemeral' keys of rooms.
Apply the filter to the 'presence' key of a sync response.
|
2015-10-12 16:54:58 +01:00 |
|
Erik Johnston
|
ca53ad7425
|
Filter events to only thsoe that the user is allowed to see
|
2015-10-12 15:52:55 +01:00 |
|
Erik Johnston
|
f6fde343a1
|
Merge remote-tracking branch 'origin/develop' into erikj/search
|
2015-10-12 15:06:18 +01:00 |
|
Erik Johnston
|
927004e349
|
Remove unused room_id parameter
|
2015-10-12 15:06:14 +01:00 |
|
Mark Haines
|
54cb509d64
|
Merge pull request #296 from matrix-org/markjh/eventstream_presence
Split the sections of EventStreamHandler.get_stream that handle presence
|
2015-10-12 14:48:09 +01:00 |
|
Mark Haines
|
885301486c
|
Merge pull request #297 from matrix-org/markjh/presence_races
Fix some races in the synapse presence handler caused by not yielding…
|
2015-10-12 14:47:53 +01:00 |
|
Erik Johnston
|
ae72e247fa
|
PEP8
|
2015-10-12 10:50:46 +01:00 |
|
Erik Johnston
|
61561b9df7
|
Keep FTS indexes up to date. Only search through rooms currently joined
|
2015-10-12 10:49:53 +01:00 |
|
Steven Hammerton
|
22112f8d14
|
Formatting changes
|
2015-10-10 10:49:42 +01:00 |
|
Steven Hammerton
|
c33f5c1a24
|
Provide ability to login using CAS
|
2015-10-10 10:49:42 +01:00 |
|
Mark Haines
|
1a46daf621
|
Merge branch 'markjh/presence_races' into markjh/v2_sync_api
|
2015-10-09 20:02:30 +01:00 |
|
Mark Haines
|
987803781e
|
Fix some races in the synapse presence handler caused by not yielding on deferreds
|
2015-10-09 19:59:50 +01:00 |
|
Mark Haines
|
af7b214476
|
Merge branch 'markjh/eventstream_presence' into markjh/v2_sync_api
|
2015-10-09 19:18:09 +01:00 |
|
Mark Haines
|
1b9802a0d9
|
Split the sections of EventStreamHandler.get_stream that handle presence
into separate functions.
This makes the code a bit easier to read, and means that we can reuse
the logic when implementing the v2 sync API.
|
2015-10-09 19:13:08 +01:00 |
|
Erik Johnston
|
c85c912562
|
Add basic full text search impl.
|
2015-10-09 15:48:31 +01:00 |
|
Mark Haines
|
dc72021748
|
Add a flag to initial sync to indicate we want rooms that the user has left
|
2015-10-08 17:26:23 +01:00 |
|
Mark Haines
|
dfef2b41aa
|
Update the v2 room sync format to match the current v2 spec
|
2015-10-08 15:17:43 +01:00 |
|
Mark Haines
|
471555b3a8
|
Move the rooms out into a room_map mapping from room_id to room.
|
2015-10-05 16:39:36 +01:00 |
|
Erik Johnston
|
49ebd472fa
|
Explicitly add Create event as auth event
|
2015-10-02 13:22:36 +01:00 |
|
Erik Johnston
|
40017a9a11
|
Add 'trusted_private_chat' to room creation presets
|
2015-10-02 11:22:56 +01:00 |
|
Erik Johnston
|
a086b7aa00
|
Merge pull request #275 from matrix-org/erikj/invite_state
Bundle in some room state in invites.
|
2015-10-02 11:15:43 +01:00 |
|
Erik Johnston
|
9c311dfce5
|
Also bundle in sender
|
2015-10-02 11:04:23 +01:00 |
|
Erik Johnston
|
d5e081c7ae
|
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatable
|
2015-10-02 10:33:49 +01:00 |
|
Erik Johnston
|
5879edbb09
|
Merge pull request #283 from matrix-org/erikj/atomic_join_federation
Atomically persist events when joining a room over federation/
|
2015-10-02 09:18:44 +01:00 |
|
Mark Haines
|
f31014b18f
|
Start updating the sync API to match the specification
|
2015-10-01 17:53:07 +01:00 |
|
Erik Johnston
|
0ec78b360c
|
Merge pull request #287 from matrix-org/erikj/canonical_alias
Set m.room.canonical_alias on room creation.
|
2015-09-30 17:14:55 +01:00 |
|
Erik Johnston
|
ecd0c0dfc5
|
Remove double indentation
|
2015-09-30 16:46:24 +01:00 |
|
Erik Johnston
|
83892d0d30
|
Comment
|
2015-09-30 16:41:48 +01:00 |
|
Erik Johnston
|
9d39615b7d
|
Rename var
|
2015-09-30 16:37:59 +01:00 |
|
Mark Haines
|
301141515a
|
Merge pull request #288 from matrix-org/markjh/unused_definitions
Remove some of the unused definitions from synapse
|
2015-09-28 14:22:44 +01:00 |
|
Erik Johnston
|
a14665bde7
|
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/invite_state
|
2015-09-25 11:38:28 +01:00 |
|
Mark Haines
|
57338a9768
|
synapse/handlers/room.py:_should_invite_join was unused
|
2015-09-23 10:26:45 +01:00 |
|