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
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
05c7cba73a
Initial trivial implementation of an actual 'Filtering' object; move storage of user filters into there
2015-01-27 14:28:56 +00:00
0484d7f6e9
Merge branch 'develop' into client_v2_filter
2015-01-27 13:11:03 +00:00
436513068d
Start implementing the non-incremental sync portion of the v2 /sync API
2015-01-26 18:53:31 +00:00
b481889117
Support membership events and more camelcase/underscores
2015-01-26 17:27:28 +00:00
69a75b7ebe
Add brackets to make get room name / alias work
2015-01-26 16:52:47 +00:00
3186c5bdbc
Merge branch 'develop' into client_v2_sync
2015-01-26 16:32:40 +00:00
e5725eb3b9
Remove unused import from server.py
2015-01-26 16:16:50 +00:00
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
0cfb4591a7
Add handler for /sync API
2015-01-26 15:46:31 +00:00
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
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
c92d64a6c3
Make it the responsibility of the replication layer to check signature and hashes.
2015-01-26 14:33:11 +00:00
14ff33bd93
Merge branch 'develop' into client_v2_sync
...
Conflicts:
synapse/rest/client/v2_alpha/__init__.py
2015-01-26 13:14:59 +00:00
7b88619241
Split up replication_layer module into client, server and transaction queue
2015-01-26 10:45:24 +00:00
7b814d3f7f
Add client v2_alpha resource to synapse server resource tree
2015-01-23 18:55:19 +00:00
2b1799883d
Add client v2_alpha resource to synapse server resource tree
2015-01-23 18:49:05 +00:00
e26340cee7
Start implementing the v2_alpha sync API
2015-01-23 18:48:17 +00:00
85419e1257
Stop complaining about Synapse Angular SDK 0.6.1
2015-01-23 18:37:37 +00:00
5f84ba8ea1
Add API to delete push rules.
2015-01-23 17:49:37 +00:00
f21f9fa3c5
Use push settings!
2015-01-23 17:07:06 +00:00
9b1e552b51
Merge branch 'develop' of github.com:matrix-org/synapse into rejections
2015-01-23 15:51:48 +00:00
3b9cc882a5
Add storage method have_events
2015-01-23 15:42:52 +00:00
e0bf18addf
Add RestServlet base class in synapse/http/servlet.py
2015-01-23 14:16:28 +00:00
4be637cb12
Extract the client v1 base RestServlet to a separate class
2015-01-23 14:09:51 +00:00
fc7a05c443
more pep8 suggestions
2015-01-23 13:36:01 +00:00
b3f66ea6fb
more pep8
2015-01-23 13:28:00 +00:00
d3e72b4d87
Make string format tuple an actual tuple
2015-01-23 13:25:58 +00:00
98e1080555
redundant parens
2015-01-23 13:25:36 +00:00
54c689c819
stray space
2015-01-23 13:25:14 +00:00
c4652d7772
Remove hs.parse_eventid
2015-01-23 13:25:07 +00:00
6188c4f69c
make per-device rules work
2015-01-23 13:23:10 +00:00
ada711504e
Replace hs.parse_roomalias with RoomAlias.from_string
2015-01-23 13:21:58 +00:00
1c06c48ce2
Replace hs.parse_roomid with RoomID.from_string
2015-01-23 11:55:12 +00:00
5759bec43c
Replace hs.parse_userid with UserID.from_string
2015-01-23 11:47:15 +00:00
49fe31792b
Add slightly pedantic trailing slash error.
2015-01-23 11:19:02 +00:00
7256def8e4
Merge rest servlets into the client json resource object
2015-01-23 10:37:38 +00:00
f87586e661
right super() param
2015-01-23 10:32:40 +00:00
bcd48b9636
Fix adding rules without before/after & add the rule that we couldn't find to the error
2015-01-23 10:28:25 +00:00
6927b6b197
This really serves me right for ever making a map called 'map'.
2015-01-23 10:21:47 +00:00
8a850573c9
As yet fairly untested GET API for push rules
2015-01-22 19:32:17 +00:00
673773b217
oops, this is not its own schema file
2015-01-22 18:27:07 +00:00
7ecb49ef25
Insufficient newlines
2015-01-22 17:53:30 +00:00
5c6189ea3e
Merge branch 'develop' into pushers
...
Conflicts:
synapse/rest/__init__.py
2015-01-22 17:46:16 +00:00
ede491b4e0
Oops: second part of commit dc938606
2015-01-22 17:38:53 +00:00
dc93860619
Add rest API & store for creating push rules
...
Also make unrecognised request error look more like synapse errors
because it makes it easier to throw them from within rest classes.
2015-01-22 17:37:12 +00:00
ca65a9d03e
Split out TransactionQueue from replication layer
2015-01-22 16:37:08 +00:00
97c68c508d
Move rest APIs back under the rest directory
2015-01-22 16:10:07 +00:00
c2f9768740
Merge branch 'new_state_resolution' of github.com:matrix-org/synapse into rejections
2015-01-22 15:57:26 +00:00
73dd81ca62
fix pyflakes
2015-01-22 15:57:08 +00:00
b1b85753d7
Add support for storing rejected events in EventContext and data stores
2015-01-22 15:50:17 +00:00
1d2016b4a8
Move client v1 api rest servlets into a "client/v1" directory
2015-01-22 14:59:08 +00:00
b390bf39f2
Remove unused function. Add comment.
2015-01-21 16:44:04 +00:00
6dcade97be
Implement new state resolution algorithm
2015-01-21 16:27:04 +00:00
5d5932d493
use underscores everywhere, not camelcase.
2015-01-20 11:52:08 +00:00
afb714f7be
add instance_handles to pushers so we have a way to refer to them even if the push token changes.
2015-01-20 11:49:48 +00:00
dc70d1fef8
Only start the notifier timeout once we've had a chance to check for updates. Otherwise the timeout could fire while we are waiting for the database to return any updates it might have
2015-01-19 16:24:54 +00:00
42529cbced
Fix pyflakes errors
2015-01-19 15:33:04 +00:00
00e9c08609
Fix syntax
2015-01-19 15:30:48 +00:00
3e85e52b3f
Allow ':memory:' as the database path for sqlite3
2015-01-19 15:26:19 +00:00
5fed042640
Finish renaming "context" to "room_id" in federation codebase
2015-01-16 19:01:03 +00:00
2408c4b0a4
Fold _do_request_for_transaction into the methods that called it since it was a trivial wrapper around client.get_json
2015-01-16 19:01:03 +00:00
602684eac5
Split transport layer into client and server parts
2015-01-16 19:01:03 +00:00
2bdee98269
Remove temporary debug logging that was accidentally committed
2015-01-16 19:00:40 +00:00
2d2953cf5f
Require device language when adding a pusher.
...
Because this seems like it might be useful to do sooner rather
than later.
2015-01-16 11:24:10 +00:00
2ca2dbc821
Send room name and first alias in notification poke.
2015-01-15 16:56:18 +00:00
e3e2fc3255
Don't make the pushers' event streams cause people to appear online
2015-01-15 16:17:21 +00:00
2cb30767fa
Honour the 'rejected' return from push gateways
...
Add a timestamp to push tokens so we know the last time they we
got them from the device. Send it to the push gateways so it can
determine whether its failure is more recent than the token.
Stop and remove pushers that have been rejected.
2015-01-13 19:48:37 +00:00
34a5fbe2b7
Have /join/:room_id return the room ID in response anyway, for consistency of clients (SYN-234)
2015-01-13 17:29:24 +00:00
c2e7c84e58
Don't try to cancel already-expired timers - SYN-230
2015-01-13 16:58:36 +00:00
3891597eb3
Remove unused functions
2015-01-13 15:57:26 +00:00
fda63064fc
get_room_events isn't called anywhere
2015-01-13 14:43:26 +00:00
895fcb377e
Fix stream token ordering
2015-01-13 14:38:53 +00:00
c06a9063e1
Merge branch 'develop' into pushers
2015-01-13 13:15:51 +00:00
70d0a453f3
Split out function to decide whether to notify or a given event
2015-01-13 13:14:41 +00:00
38e3241eb7
Merge branch 'hotfixes-v0.6.1b' of github.com:matrix-org/synapse into develop
2015-01-13 10:01:22 +00:00
1d3d37937d
Bump version
2015-01-13 09:59:47 +00:00
39585bf556
Insert 'age' into top level when returning events to clients
2015-01-13 09:57:32 +00:00
02ffbb20d0
Use float rather than integer divisions to turn msec into sec - so timeouts under 1000msec will actually work
2015-01-12 19:09:14 +00:00
67d8305aea
Make typing notification timeouts print a (debug) logging message
2015-01-12 18:22:00 +00:00
c43d898119
SYN-178: Fix off by one.
2015-01-12 17:38:40 +00:00
63403aa7a5
Check the existance and versions of necessary modules when starting synapse, log which modules are used
2015-01-08 17:08:57 +00:00
9d0dcf2e3c
SYN-142: Rotate logs if logging to file. Fixed to a 4 file rotate with 100MB/file for now.
2015-01-08 15:31:29 +00:00
7f83613733
make our JPEG thumbnail quality less horrifically ugly
2015-01-08 15:11:22 +00:00
b5924cae04
Add raw query param for scrollback.
2015-01-08 14:37:55 +00:00
379a653ae3
Add better help message for --server-name config option.
2015-01-08 14:32:53 +00:00
edb557b2ad
Return the raw federation event rather than adding extra keys for federation data.
2015-01-08 14:28:08 +00:00
5940ec993b
Add missing continuation indent.
2015-01-08 13:59:29 +00:00
5720ab59e0
Add 'raw' query parameter to expose the event graph and signatures to savvy clients.
2015-01-08 13:57:40 +00:00
8ac9199f56
Merge branch 'master' into develop
2015-01-08 09:43:48 +00:00
5a0e687d5c
Bump version
2015-01-08 09:42:23 +00:00
c9d2cecac9
SYN-231: User agent header broken
2015-01-08 09:41:11 +00:00
42507b0011
Log server version on startup
2015-01-07 17:25:28 +00:00
76e1565200
Change error message for missing pillow libs.
2015-01-07 17:11:19 +00:00
333836ff92
PEP8 and pyflakes warnings
2015-01-07 16:18:12 +00:00
4c68460392
SYN-154: Tweak how the m.room.create check is done.
...
Don't perform the check in auth.is_host_in_room but instead do it in _do_join
and also assert that there are no m.room.members in the room before doing so.
2015-01-07 16:09:00 +00:00
9cb4f75d53
SYN-154: Better error messages when joining an unknown room by ID.
...
The simple fix doesn't work here because room creation also involves
unknown room IDs. The check relies on the presence of m.room.create for
rooms being created, whereas bogus room IDs have no state events at all.
2015-01-07 15:21:48 +00:00
9b8e348b15
*cough*
2015-01-07 15:08:32 +00:00
89fc09c3d1
Bump version and changelog
2015-01-07 13:56:56 +00:00
a039e2544c
Remove unused import
2015-01-07 09:48:03 +00:00
1497e50649
Merge branch 'develop' of github.com:matrix-org/synapse into erikj-perf
2015-01-07 09:40:42 +00:00
5cf45c4319
Merge branch 'master' into develop
2015-01-06 19:48:53 +00:00
dfa05f0cd6
Optimize FrozenEvent creation
2015-01-06 18:51:03 +00:00
36a2a877e2
Use time.time() instead of time.clock()
2015-01-06 16:34:41 +00:00
d5ae67e67d
Fix typo where we used wrong var.
2015-01-06 16:05:01 +00:00
fd9a8db7ea
Only fetch the columns we need.
2015-01-06 15:59:31 +00:00
9e5545a6fa
RoomsForUser now has sender instead of user_id
2015-01-06 15:53:50 +00:00
a01416cf21
Add delta and bump DB version
2015-01-06 15:42:18 +00:00
f6da237c35
Add index on transaction_id to sent_transcations
2015-01-06 15:40:38 +00:00
9bd07bed23
Actually time that function
2015-01-06 15:28:56 +00:00
03a501456c
Time how long calls to _get_destination_retry_timings take
2015-01-06 15:22:28 +00:00
52b2c6c9c7
Don't include None's in _get_events_txn
2015-01-06 14:56:57 +00:00
8a12df8cf3
Merge branch 'erikj-perf' of github.com:matrix-org/synapse into develop
2015-01-06 14:45:57 +00:00
96707ed718
Name 'user_rooms_intersect' transaction
2015-01-06 14:44:27 +00:00
76ec154e95
We don't need the full events for get_rooms_for_user_where_membership_is
2015-01-06 14:37:00 +00:00
bc2ec808f4
SYN-32 Use the ANTIALIAS resize method for thumbnailing images
2015-01-06 14:14:17 +00:00
0529a7e2e9
Add some logging for when we are sending transactions.
2015-01-06 14:06:25 +00:00
b9f77d1ae1
Increase default maximum attachment size to 10M
2015-01-06 14:04:58 +00:00
5e23a19204
Merge pull request #28 from matrix-org/erikj-perf
...
Database performance improvements.
2015-01-06 13:33:40 +00:00
adb04b1e57
Update copyright notices
2015-01-06 13:21:39 +00:00
af1c7c7808
PEP8
2015-01-06 13:13:17 +00:00
12819d5082
Remove debug lines
2015-01-06 13:12:30 +00:00
52d8519008
Don't do batching when getting events.
2015-01-06 13:10:27 +00:00
773de09774
Set a content-length for JSON responses
2015-01-06 13:05:19 +00:00
98933e3db6
Only fetch prev_content when a client is streaming/paginating. Use transactions for event streams.
2015-01-06 13:03:23 +00:00
78edb47cc5
SYN-208/SYN-228: Add runtime checks on startup to enforce that JPEG/PNG support is included when installing pillow.
2015-01-06 11:43:04 +00:00
3c8c3bf3b7
SYN-229: Include Content-Length when downloading files
2015-01-06 11:32:36 +00:00
3e26720e05
Temporarily turn off 'redacted_because' and 'prev_content' keys
2015-01-06 11:26:58 +00:00
f4ea78e9e2
More debug logging
2015-01-06 11:24:18 +00:00
753126b8cc
Add some debug logging
2015-01-06 11:18:12 +00:00
d7e8ea67b3
Reformat
2015-01-06 11:18:02 +00:00
f0128f9600
Add RoomMemberStore.get_users_in_room, so that we can get the list of joined users without having to retrieve the full events
2015-01-06 10:55:43 +00:00
96a5ba41f5
Merge branch 'develop' of github.com:matrix-org/synapse into erikj-perf
2015-01-06 10:53:04 +00:00
90d60e3fe4
Merge branch 'hotfixes-v0.6.0a'
2014-12-29 14:01:07 +00:00
af61c29527
Return the argument passed to the callback in a deferred callback, otherwise twisted will replace the deferred result with 'None'
2014-12-29 13:54:05 +00:00
407c299828
improve error msg
2014-12-24 17:50:42 +00:00
24b5d01853
Include version in User-Agent and Server headers
2014-12-22 10:16:02 +00:00
74ee4048c2
Merge branch 'master' of github.com:matrix-org/synapse into erikj-perf
2014-12-21 11:47:45 +00:00
67a406a754
Rate limit display names and avatar urls per request rather than per event.
2014-12-19 17:36:33 +00:00
d61109f578
Merge branch 'hotfixes-v0.6.0' of github.com:matrix-org/synapse into erikj-perf
2014-12-19 16:37:08 +00:00
efd27ff01b
Set a state_key for the topic and room name, otherwise they won't be treated as room state
2014-12-19 15:31:27 +00:00
9c71d945d6
Look for name, topic in the event content rather than the event itself when persisting room name and topic events
2014-12-19 15:16:48 +00:00
f70e622d59
bump_presence_active_time when sending a message event
2014-12-19 14:30:57 +00:00
a999f0dec3
Don't ratelimit room create events
2014-12-19 14:18:27 +00:00
1e7f83b91d
Set display name when joining via alias
2014-12-19 12:31:46 +00:00
5dbe820e9a
Remove unneeded federation keys from events
2014-12-19 12:16:26 +00:00
390e48a8b0
SYN-203: Handle requests for thunbnails for images that are small
2014-12-19 12:05:38 +00:00
5739e6c606
s/user_id/sender/
2014-12-19 11:43:46 +00:00
41ce544abe
Merge branch 'release-v0.6.0' of github.com:matrix-org/synapse into erikj-perf
2014-12-18 18:57:21 +00:00
041ac476a5
Supply auth_chain along with current state in '/state/', fetch auth events from a remote server if we are missing some of them
2014-12-18 18:47:13 +00:00
fead431c18
If we didn't get any events, advance the token or we'll just keep not getting the same events again.
2014-12-18 18:44:33 +00:00
dbe77ec79a
Replace distributor deferred list, with a simple for loop until I understand why the former breaks and the latter doesn't
2014-12-18 17:47:00 +00:00
b56730bb6e
Merge branch 'develop' into pushers
...
Conflicts:
synapse/api/errors.py
synapse/server.py
synapse/storage/__init__.py
2014-12-18 15:15:22 +00:00
afa953a293
schema version is now 10
2014-12-18 15:11:06 +00:00
0a6664493a
Merge branch 'master' into pushers
2014-12-18 15:06:11 +00:00
4c7ad50f6e
Thank you, pyflakes
2014-12-18 14:55:04 +00:00
173264b656
...and bump SCHEMA_VERSION
2014-12-18 14:53:10 +00:00
fc7c5e9cd7
Rename the pusher SQL delta to v9 which the next free one
2014-12-18 14:51:29 +00:00
9728c305a3
after a few rethinks, a working implementation of pushers.
2014-12-18 14:49:22 +00:00
dea5d4b03b
Don't yield on sending the event accross federation.
2014-12-18 11:29:46 +00:00
f3788e3c78
Test some ideas that might help performance a bit
2014-12-17 23:37:08 +00:00
dec5b62339
Use _get_events_txn instead of _parse_events_txn
2014-12-16 19:16:41 +00:00
21cab3a7ec
Fix where we pulled in event.state_events from hotfixes branch
2014-12-16 19:16:15 +00:00
2215faa361
Merge branch 'hotfixes-v0.5.4a' of github.com:matrix-org/synapse into release-v0.6.0
2014-12-16 19:11:13 +00:00
3defd5b3ee
Add FIXME
2014-12-16 19:07:20 +00:00
96779d2490
Fix bug where we did not send the full auth chain to people that joined over federation
2014-12-16 18:57:36 +00:00
2d7716d4d0
Make error messages slightly more helpful
2014-12-16 18:41:48 +00:00
f76269392b
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.6.0
...
Conflicts:
synapse/state.py
2014-12-16 18:35:46 +00:00
52f99243ab
Use is_outlier() so that we don't get AttributeError
2014-12-16 18:33:50 +00:00
5b39cfff69
Don't assume an event exists
2014-12-16 18:25:24 +00:00
56db465047
Merge branch 'release-v0.6.0' into develop
2014-12-16 17:29:49 +00:00
4dcad143dd
SYN-142: Use a default log file 'homeserver.log' so people get logging by default.
2014-12-16 17:24:49 +00:00
f06161a307
Enable rate limiting for all events
2014-12-16 16:10:17 +00:00
627e4f01d2
Remove send_message since nothing was calling it. Remove Snapshot because only send_message was using it
2014-12-16 16:07:41 +00:00
23da4a4051
Fix typo where we thought a list was a dict
2014-12-16 15:59:40 +00:00
c3eae8a88c
Construct the EventContext in the state handler rather than constructing one and then immediately calling state_handler.annotate_context_with_state
2014-12-16 15:59:17 +00:00
3c7857e49b
clean up coding style a bit
2014-12-16 15:24:03 +00:00
42b725ce52
Fix upgrade script to run all the missing deltas.
2014-12-16 15:13:34 +00:00
8b8beba194
Remove annotate_event_with_state as nothing was using it. Update state tests to call annotate_context_with_state
2014-12-16 15:08:37 +00:00
b3c793e362
Do run all deltas up to missing delta 10
2014-12-16 14:44:53 +00:00
2e44714214
Make failure to run appropraite upgrade scripts more helpful.
2014-12-16 14:20:32 +00:00
ef5a141050
Bump database version
2014-12-16 13:57:47 +00:00
96cc7c8740
Bump version
2014-12-16 13:57:27 +00:00
5a465b67ba
Fix pyflakes
2014-12-16 13:41:43 +00:00
58168498b0
Remove FrozenEncoder
2014-12-16 13:38:38 +00:00
8133cdcc88
Better english in docstrings are helpful.
2014-12-16 13:32:06 +00:00
35f4f6b070
Update upgrade script
2014-12-16 13:27:53 +00:00
882dc8dcab
Persist internal_metadata
2014-12-16 13:17:09 +00:00
4afac88390
Add basic docstring to annotate_context_with_state
2014-12-16 13:09:44 +00:00
3c77d13aa5
Kill off synapse.api.events.*
2014-12-16 11:29:05 +00:00
6a1da99fab
Add fixme to raising of AuthError in federation land
2014-12-16 09:35:31 +00:00
65b2e49429
Fix pyflakes
2014-12-15 17:35:37 +00:00
9c49054f1d
Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor
2014-12-15 17:33:23 +00:00
f280929a12
Use frozenutils
2014-12-15 17:31:36 +00:00
009e4b5637
User.is_mine is no longer a thing. Use hs.is_mine instead.
2014-12-15 17:17:51 +00:00
cf6e5f1dbf
Rename MessageHandler.handle_event. Add a few comments.
2014-12-15 17:01:12 +00:00
67c9585656
Update media_repository.py
...
_ not -
2014-12-15 16:57:53 +00:00
670dcdfc14
Remove unused functions
2014-12-15 16:16:58 +00:00
0c1deca574
Remember to hook up the typing event stream to the notifier as well
2014-12-15 16:14:53 +00:00
David Baker