Mark Haines
|
8bc3066e0b
|
Merge branch 'client_v2_filter' into client_v2_sync
|
2015-01-30 14:57:04 +00:00 |
|
Erik Johnston
|
471c47441d
|
Merge pull request #37 from matrix-org/client_v2_filter
Client v2 filter
|
2015-01-30 14:56:08 +00:00 |
|
Mark Haines
|
e97f756a05
|
Use 'in' to test if the key exists, remove unused _filters_for_user
|
2015-01-30 14:54:06 +00:00 |
|
Erik Johnston
|
2f4cb04f45
|
Be more specific in naming columns in selects.
|
2015-01-30 14:48:11 +00:00 |
|
Erik Johnston
|
472cf532b7
|
Put CREATE rejections into seperate .sql
|
2015-01-30 14:48:03 +00:00 |
|
David Baker
|
322a047502
|
Add room member count condition and default rule to make a noise on rooms of only 2 people.
|
2015-01-30 14:46:45 +00:00 |
|
Erik Johnston
|
3d7026e709
|
Add a slightly more helpful comment
|
2015-01-30 14:37:31 +00:00 |
|
Erik Johnston
|
c515d37797
|
Merge branch 'replication_split' of github.com:matrix-org/synapse into rejections
Conflicts:
synapse/storage/schema/delta/v12.sql
|
2015-01-30 14:19:49 +00:00 |
|
Erik Johnston
|
84b78c3b5f
|
Merge branch 'rejections_storage' of github.com:matrix-org/synapse into replication_split
|
2015-01-30 14:17:47 +00:00 |
|
Erik Johnston
|
2aaedab203
|
Merge branch 'develop' of github.com:matrix-org/synapse into new_state_resolution
|
2015-01-30 14:09:32 +00:00 |
|
Erik Johnston
|
e0b7c521cb
|
Merge branch 'develop' of github.com:matrix-org/synapse into rejections_storage
Conflicts:
synapse/storage/__init__.py
synapse/storage/schema/delta/v12.sql
|
2015-01-30 14:08:28 +00:00 |
|
Erik Johnston
|
875a481a1e
|
Merge branch 'new_state_resolution' of github.com:matrix-org/synapse into rejections_storage
|
2015-01-30 14:04:53 +00:00 |
|
Erik Johnston
|
7a9f6f083e
|
Remove commented line
|
2015-01-30 13:55:46 +00:00 |
|
Erik Johnston
|
76d7fd39cd
|
Style changes.
|
2015-01-30 13:52:02 +00:00 |
|
Mark Haines
|
8fe39a0311
|
Check if the user has joined the room between incremental syncs
|
2015-01-30 13:38:34 +00:00 |
|
Erik Johnston
|
a70a801184
|
Fix bug where we superfluously asked for current state. Change API of /query_auth/ so that we don't duplicate events in the response.
|
2015-01-30 13:34:01 +00:00 |
|
Mark Haines
|
4a67834bc8
|
Pass client info to the sync_config
|
2015-01-30 11:50:15 +00:00 |
|
Mark Haines
|
c562f237f6
|
Unused import
|
2015-01-30 11:43:00 +00:00 |
|
Mark Haines
|
8498d348d8
|
Fix token formatting
|
2015-01-30 11:42:09 +00:00 |
|
Mark Haines
|
e97de6d96a
|
Filter the recent events before applying the limit when doing an initial sync
|
2015-01-30 11:35:20 +00:00 |
|
Mark Haines
|
22dd1cde2d
|
Filter the recent events before applying the limit when doing an incremental sync with a gap
|
2015-01-30 11:32:35 +00:00 |
|
Erik Johnston
|
2c9e136d57
|
Fix bad merge fo python_dependencies.py
|
2015-01-30 11:14:33 +00:00 |
|
David Baker
|
bd03947c05
|
We do need Twisted 14, not 15: we use internal Twisted things that have been removed in 15.
|
2015-01-30 11:13:42 +00:00 |
|
Erik Johnston
|
2ebf795c0a
|
Merge branch 'develop' of github.com:matrix-org/synapse into rejections
Conflicts:
synapse/storage/__init__.py
synapse/storage/schema/delta/v12.sql
|
2015-01-30 11:10:37 +00:00 |
|
Erik Johnston
|
0c2d245fdf
|
Update the current state of an event if we update auth events.
|
2015-01-30 11:08:52 +00:00 |
|
Erik Johnston
|
823999716e
|
Fix bug in timeout handling in keyclient
|
2015-01-30 11:08:01 +00:00 |
|
Erik Johnston
|
c1d860870b
|
Fix regression where we no longer correctly handled the case of gaps in our event graph
|
2015-01-30 10:48:47 +00:00 |
|
Erik Johnston
|
c1c7b39827
|
Fix bug where we changes in outlier in metadata dict propogated to other events
|
2015-01-30 10:30:54 +00:00 |
|
David Baker
|
fc946f3b8d
|
Include content in notification pokes
|
2015-01-29 21:59:17 +00:00 |
|
David Baker
|
0b16886397
|
Change 'from' in notification pokes to 'sender' to match client API v2. Send sender display names where they exist.
|
2015-01-29 18:51:22 +00:00 |
|
David Baker
|
1235f7f383
|
Add default push rules including setting a sound for messages mentioning your username / display name
|
2015-01-29 18:38:22 +00:00 |
|
Mark Haines
|
ece828a7b7
|
Update todo for the filtering on sync
|
2015-01-29 18:15:24 +00:00 |
|
Mark Haines
|
365a186729
|
Add basic filtering support
|
2015-01-29 18:11:28 +00:00 |
|
Mark Haines
|
7ceda8bf3d
|
Merge branch 'client_v2_filter' into client_v2_sync
|
2015-01-29 18:04:07 +00:00 |
|
Mark Haines
|
93ed31dda2
|
Create a separate filter object to do the actual filtering, so that we can
split the storage and management of filters from the actual filter code
and don't have to load a filter from the db each time we filter an event
|
2015-01-29 17:45:07 +00:00 |
|
David Baker
|
4bdfce30d7
|
Renumber priority classes so we can use 0 for defaults.
|
2015-01-29 17:12:11 +00:00 |
|
David Baker
|
e0d2c6889b
|
Allow kind to be set to null to delete a pusher.
|
2015-01-29 17:05:00 +00:00 |
|
Erik Johnston
|
78015948a7
|
Initial implementation of auth conflict resolution
|
2015-01-29 16:52:33 +00:00 |
|
Mark Haines
|
4ad45f2582
|
Fix indent
|
2015-01-29 16:41:49 +00:00 |
|
Mark Haines
|
722b65f461
|
Move typing notifs to an "emphermal" event list on the room object
|
2015-01-29 16:41:21 +00:00 |
|
Mark Haines
|
cc42d3f907
|
Fix check for empty room update
|
2015-01-29 16:27:38 +00:00 |
|
Mark Haines
|
4d9dd9bdc0
|
Fix v2 initial sync
|
2015-01-29 16:23:03 +00:00 |
|
Mark Haines
|
8e571cbed8
|
Merge branch 'client_v2_filter' into client_v2_sync
|
2015-01-29 16:18:59 +00:00 |
|
Mark Haines
|
295322048d
|
Merge branch 'develop' into client_v2_filter
|
2015-01-29 16:18:34 +00:00 |
|
Mark Haines
|
acb68a39e0
|
Code style fixes.
|
2015-01-29 16:12:40 +00:00 |
|
David Baker
|
8b1dd9f57f
|
Only send a badge-reset if the user actually has unread notifications.
|
2015-01-29 16:10:01 +00:00 |
|
Mark Haines
|
9150a0d62e
|
Fix code-style
|
2015-01-29 16:01:14 +00:00 |
|
Mark Haines
|
cf7c54ec93
|
Merge branch 'client_v2_filter' into client_v2_sync
|
2015-01-29 15:55:58 +00:00 |
|
Mark Haines
|
33391db5f8
|
Merge in auth changes from develop
|
2015-01-29 15:54:54 +00:00 |
|
Mark Haines
|
396a67a09a
|
Merge branch 'client_v2_filter' into client_v2_sync
Conflicts:
synapse/rest/client/v2_alpha/__init__.py
|
2015-01-29 14:58:00 +00:00 |
|
Mark Haines
|
9d8f798a3f
|
Merge changes from develop
|
2015-01-29 14:55:27 +00:00 |
|
Mark Haines
|
e4f50fa0aa
|
Move bump schema delta
|
2015-01-29 14:53:18 +00:00 |
|
Mark Haines
|
e016f4043b
|
Use get_room_events_stream to get changes to the rooms if the number of changes is small
|
2015-01-29 14:40:28 +00:00 |
|
Erik Johnston
|
5a3a15f5c1
|
Make post_json(...) actually send data.
|
2015-01-29 13:58:22 +00:00 |
|
Erik Johnston
|
c183cec8f6
|
Add post_json(...) method to federation client
|
2015-01-29 13:44:52 +00:00 |
|
Kegan Dougal
|
83172487b0
|
Add basic filtering public API unit tests. Use defers in the right places.
|
2015-01-29 12:20:59 +00:00 |
|
Kegan Dougal
|
777d9914b5
|
Implement filter algorithm. Add basic event type unit tests to assert it works.
|
2015-01-29 11:38:06 +00:00 |
|
Kegan Dougal
|
50de1eaad9
|
Add filtering public API; outline filtering algorithm.
|
2015-01-29 10:24:57 +00:00 |
|
Kegan Dougal
|
2a4fda7b88
|
Add filtering.filter_events function, with stub passes_filter function.
|
2015-01-29 09:27:16 +00:00 |
|
Kegan Dougal
|
3773759c0f
|
Also edit the filter column on the delta SQL
|
2015-01-29 09:15:33 +00:00 |
|
Mark Haines
|
e3e72b8c5c
|
Remove typing TODO
|
2015-01-29 03:35:25 +00:00 |
|
Mark Haines
|
3dbce6f4a5
|
Add typing notifications to sync
|
2015-01-29 03:33:51 +00:00 |
|
Mark Haines
|
b9c442c85c
|
Include transaction ids in unsigned section of events in the sync results for the clients that made those requests
|
2015-01-29 02:46:00 +00:00 |
|
Mark Haines
|
1b4a164c02
|
Add support for formatting events in the way a v2 client expects
|
2015-01-29 02:34:35 +00:00 |
|
Mark Haines
|
b0b80074e0
|
SYN-252: Supply the stream and topological parts in the correct order to the constructor
|
2015-01-29 01:48:48 +00:00 |
|
David Baker
|
d5bdf3c0c7
|
Allow the push rule delete method to take more specifiers.
|
2015-01-28 18:06:04 +00:00 |
|
David Baker
|
8552ed8df2
|
Change uses of get_user_by_req because it returns a tuple now.
|
2015-01-28 18:04:40 +00:00 |
|
Kegan Dougal
|
11634017f4
|
s/definition/filter_json/ since definition is now used to mean a component of the filter, rather than the complete json
|
2015-01-28 17:42:19 +00:00 |
|
Mark Haines
|
c81a19552f
|
Add ports back to demo/start.sh
|
2015-01-28 17:32:49 +00:00 |
|
Mark Haines
|
9c61556504
|
Merge branch 'develop' into client_v2_sync
|
2015-01-28 17:29:30 +00:00 |
|
Mark Haines
|
26c8fff19e
|
Merge pull request #36 from matrix-org/device_id_from_access_token
Extract the device id and token id from the access token when autheniticating users
|
2015-01-28 17:19:28 +00:00 |
|
Mark Haines
|
3cca61e006
|
Rename ClientID to ClientInfo since it is a pair of IDs rather than a single identifier
|
2015-01-28 17:16:12 +00:00 |
|
Mark Haines
|
c18e551640
|
Add a : to the doc string after the type of the return value
|
2015-01-28 17:08:53 +00:00 |
|
Mark Haines
|
388581e087
|
Extract the id token of the token when authing users, include the token and device_id in the internal meta data for the event along with the transaction id when sending events
|
2015-01-28 16:58:23 +00:00 |
|
Kegan Dougal
|
c23e3db544
|
Add filter JSON sanity checks.
|
2015-01-28 16:45:18 +00:00 |
|
Erik Johnston
|
0ef5bfd6a9
|
Start implementing auth conflict res
|
2015-01-28 16:16:53 +00:00 |
|
David Baker
|
6840e7cece
|
Merge branch 'master' into develop
|
2015-01-28 16:03:35 +00:00 |
|
David Baker
|
60b143a52e
|
Move pushers delta to v12 and bump schema version
|
2015-01-28 15:48:28 +00:00 |
|
Mark Haines
|
c59bcabf0b
|
Return the device_id from get_auth_by_req
|
2015-01-28 15:43:41 +00:00 |
|
David Baker
|
e78dd33292
|
Use %s instead of +
|
2015-01-28 14:52:58 +00:00 |
|
David Baker
|
93aac9bb7b
|
Newline
|
2015-01-28 14:51:01 +00:00 |
|
David Baker
|
445ad9941e
|
Redundant parens
|
2015-01-28 14:49:59 +00:00 |
|
David Baker
|
6d485dd1c7
|
unnecessary newlines
|
2015-01-28 14:48:42 +00:00 |
|
David Baker
|
fb0928097a
|
More magic commas (including the place I copied it from...)
|
2015-01-28 14:48:07 +00:00 |
|
David Baker
|
0cbb6b0f52
|
Google doc style
|
2015-01-28 14:44:41 +00:00 |
|
David Baker
|
2cfdfee572
|
spaces
|
2015-01-28 14:41:51 +00:00 |
|
David Baker
|
289a249874
|
Unnecessary newlines.
|
2015-01-28 14:39:03 +00:00 |
|
David Baker
|
3cb5b73c0d
|
Unnecessary newline.
|
2015-01-28 14:37:55 +00:00 |
|
David Baker
|
8807f4170e
|
Better style
|
2015-01-28 14:35:00 +00:00 |
|
David Baker
|
032f8d4ed3
|
Another superfluous newline
|
2015-01-28 14:33:15 +00:00 |
|
David Baker
|
d93ce29a86
|
Ah, the comma of doom.
|
2015-01-28 14:27:01 +00:00 |
|
David Baker
|
6741c3dbd9
|
Brackets are nicer
|
2015-01-28 14:26:03 +00:00 |
|
David Baker
|
4fbf2328c2
|
Unnecessary new line
|
2015-01-28 14:24:28 +00:00 |
|
David Baker
|
30fbba168b
|
Easy on the newlines
|
2015-01-28 14:23:16 +00:00 |
|
David Baker
|
dd3abbd61f
|
2015
|
2015-01-28 14:22:39 +00:00 |
|
David Baker
|
6fde707add
|
doc style fix
|
2015-01-28 14:14:49 +00:00 |
|
David Baker
|
5f2665320f
|
It is 2015
|
2015-01-28 14:11:45 +00:00 |
|
David Baker
|
20c47383dc
|
Oops, bad merge: needed to change the base class of the rest servlets too.
|
2015-01-28 14:10:46 +00:00 |
|
David Baker
|
03149ad23a
|
More code style things
|
2015-01-28 14:01:24 +00:00 |
|
David Baker
|
e1ca0f1396
|
Brackets rather than slashes at end
|
2015-01-28 13:58:32 +00:00 |
|
David Baker
|
6df6f5e084
|
Redundant bracketing & missed space
|
2015-01-28 13:56:35 +00:00 |
|
David Baker
|
ca7240a2f0
|
Update copyright
|
2015-01-28 13:17:55 +00:00 |
|
David Baker
|
fb532d8425
|
Unused import
|
2015-01-28 13:06:09 +00:00 |
|
David Baker
|
c291a4d522
|
Merge branch 'develop' into pushers
Conflicts:
synapse/handlers/events.py
synapse/server.py
|
2015-01-28 12:51:05 +00:00 |
|
Kegan Dougal
|
42876969b9
|
Add basic application_services SQL, and hook up parts of the appservice store to read from it.
|
2015-01-28 11:59:38 +00:00 |
|
David Baker
|
273b12729b
|
Reset badge count to zero when last active time is bumped
|
2015-01-28 11:55:49 +00:00 |
|
David Baker
|
e32ded7b3e
|
Add matrix.org as a trusted ID server because it's now passed through on ports 80/443 and the web client defaults to that now. Fixes email validation (including signing up with an email address).
|
2015-01-28 10:09:54 +00:00 |
|
Kegan Dougal
|
b46fa8603e
|
Remove unused import
|
2015-01-28 09:17:48 +00:00 |
|
Mark Haines
|
e020574d65
|
Fix Formatting
|
2015-01-27 20:19:36 +00:00 |
|
Mark Haines
|
b19cf6a105
|
Wait for events if the incremental sync is empty and a timeout is given
|
2015-01-27 20:09:52 +00:00 |
|
Paul "LeoNerd" Evans
|
8398f19bce
|
Created schema delta
|
2015-01-27 19:00:09 +00:00 |
|
Paul "LeoNerd" Evans
|
06cc147012
|
Initial stab at real SQL storage implementation of user filter definitions
|
2015-01-27 18:46:03 +00:00 |
|
Paul "LeoNerd" Evans
|
54e513b4e6
|
Move storage of user filters into real datastore layer; now have to mock it out in the REST-level tests
|
2015-01-27 17:48:13 +00:00 |
|
Kegan Dougal
|
fbeaeb8689
|
Log when ASes are registered/unregistered.
|
2015-01-27 17:34:40 +00:00 |
|
Kegan Dougal
|
ec3719b583
|
Use ApplicationService when registering.
|
2015-01-27 17:15:06 +00:00 |
|
Kegan Dougal
|
92171f9dd1
|
Add stub methods, TODOs and docstrings for application services.
|
2015-01-27 16:53:59 +00:00 |
|
Mark Haines
|
a56008842b
|
Start implementing incremental initial sync
|
2015-01-27 16:24:22 +00:00 |
|
Kegan Dougal
|
7331d34839
|
Add AS specific classes with docstrings.
|
2015-01-27 16:23:46 +00:00 |
|
Paul "LeoNerd" Evans
|
059651efa1
|
Have the Filtering API return Deferreds, so we can do the Datastore implementation nicely
|
2015-01-27 16:17:56 +00:00 |
|
David Baker
|
f7c4daa8f9
|
Oops, remove debugging
|
2015-01-27 16:08:47 +00:00 |
|
David Baker
|
5eacaeb4a7
|
or of course we could just return the deferred
|
2015-01-27 16:05:23 +00:00 |
|
David Baker
|
eba89f093f
|
Need a defer.inlineCallbacks here as we yield in it: otherwise nothing in the cb gets executed.
|
2015-01-27 16:00:07 +00:00 |
|
David Baker
|
1d77969124
|
Unbreak bad presence merge - don't add these blocks together with an and: they're different things.
|
2015-01-27 15:58:27 +00:00 |
|
Kegan Dougal
|
51449e0665
|
Add appservice handler and store. Glue together rest > handler > store.
|
2015-01-27 15:50:28 +00:00 |
|
Kegan Dougal
|
6efdc11cc8
|
Parse /register and /unregister request JSON.
|
2015-01-27 15:03:19 +00:00 |
|
Paul "LeoNerd" Evans
|
05c7cba73a
|
Initial trivial implementation of an actual 'Filtering' object; move storage of user filters into there
|
2015-01-27 14:28:56 +00:00 |
|
Kegan Dougal
|
fa8e6ff900
|
Add stub application services REST API.
|
2015-01-27 14:01:51 +00:00 |
|
Paul "LeoNerd" Evans
|
0484d7f6e9
|
Merge branch 'develop' into client_v2_filter
|
2015-01-27 13:11:03 +00:00 |
|
Mark Haines
|
436513068d
|
Start implementing the non-incremental sync portion of the v2 /sync API
|
2015-01-26 18:53:31 +00:00 |
|
David Baker
|
b481889117
|
Support membership events and more camelcase/underscores
|
2015-01-26 17:27:28 +00:00 |
|
David Baker
|
69a75b7ebe
|
Add brackets to make get room name / alias work
|
2015-01-26 16:52:47 +00:00 |
|
Mark Haines
|
3186c5bdbc
|
Merge branch 'develop' into client_v2_sync
|
2015-01-26 16:32:40 +00:00 |
|
Mark Haines
|
e5725eb3b9
|
Remove unused import from server.py
|
2015-01-26 16:16:50 +00:00 |
|
Mark Haines
|
7f6f3f9d62
|
Pass the current time to serialize event, rather than passing an
HS and getting a clock from it and calling time_msec on the clock.
Remove the serialize_event method from the HS since it is no longer
needed.
|
2015-01-26 16:11:28 +00:00 |
|
Mark Haines
|
0cfb4591a7
|
Add handler for /sync API
|
2015-01-26 15:46:31 +00:00 |
|
David Baker
|
efac71d6ca
|
Pushers should only try & look for rejected devices in something that's a list or tuple.
|
2015-01-26 14:37:14 +00:00 |
|
Paul "LeoNerd" Evans
|
8d7accb28f
|
Initial minimal attempt at /user/:user_id/filter API - in-memory storage, no actual filter implementation
|
2015-01-26 14:33:30 +00:00 |
|
Erik Johnston
|
c92d64a6c3
|
Make it the responsibility of the replication layer to check signature and hashes.
|
2015-01-26 14:33:11 +00:00 |
|
Mark Haines
|
14ff33bd93
|
Merge branch 'develop' into client_v2_sync
Conflicts:
synapse/rest/client/v2_alpha/__init__.py
|
2015-01-26 13:14:59 +00:00 |
|
Erik Johnston
|
7b88619241
|
Split up replication_layer module into client, server and transaction queue
|
2015-01-26 10:45:24 +00:00 |
|
Mark Haines
|
7b814d3f7f
|
Add client v2_alpha resource to synapse server resource tree
|
2015-01-23 18:55:19 +00:00 |
|
Mark Haines
|
2b1799883d
|
Add client v2_alpha resource to synapse server resource tree
|
2015-01-23 18:49:05 +00:00 |
|
Mark Haines
|
e26340cee7
|
Start implementing the v2_alpha sync API
|
2015-01-23 18:48:17 +00:00 |
|
Paul "LeoNerd" Evans
|
85419e1257
|
Stop complaining about Synapse Angular SDK 0.6.1
|
2015-01-23 18:37:37 +00:00 |
|
David Baker
|
5f84ba8ea1
|
Add API to delete push rules.
|
2015-01-23 17:49:37 +00:00 |
|
David Baker
|
f21f9fa3c5
|
Use push settings!
|
2015-01-23 17:07:06 +00:00 |
|
Erik Johnston
|
9b1e552b51
|
Merge branch 'develop' of github.com:matrix-org/synapse into rejections
|
2015-01-23 15:51:48 +00:00 |
|
Erik Johnston
|
3b9cc882a5
|
Add storage method have_events
|
2015-01-23 15:42:52 +00:00 |
|
Mark Haines
|
e0bf18addf
|
Add RestServlet base class in synapse/http/servlet.py
|
2015-01-23 14:16:28 +00:00 |
|
Mark Haines
|
4be637cb12
|
Extract the client v1 base RestServlet to a separate class
|
2015-01-23 14:09:51 +00:00 |
|