0f48e22ef6
PEP8
2015-02-03 10:43:29 +00:00
51969f9e5f
Return rejected events if asked for it over federation.
2015-02-03 10:40:14 +00:00
e7ca813dd4
Try to ensure we don't persist an event we have already persisted. In persist_event check if we already have the event, if so then update instead of replacing so that we don't cause a bump of the stream_ordering.
2015-02-03 10:39:41 +00:00
09601255f5
Merge pull request #46 from matrix-org/identicons
...
Add a media/v1/identicon resource for generating identicons
2015-02-02 18:56:34 +00:00
9ff349a3cb
Add defers in the right places.
2015-02-02 17:42:49 +00:00
1a2de0c5fe
Implement txns for AS (un)registration.
2015-02-02 17:39:41 +00:00
a2da04b8ab
Add pydenticon to python_dependencies
2015-02-02 17:37:26 +00:00
4574b5a9e6
Generate a list of dependencies from synapse/python_dependencies.py
2015-02-02 17:23:51 +00:00
40c6fe1b81
Don't bother requesting PDUs with bad signatures from the same server
2015-02-02 17:06:37 +00:00
1bb0528316
Add Cache-Control header to identicon
2015-02-02 16:57:26 +00:00
941f59101b
Don't fail an entire request if one of the returned events fails a signature check. If an event does fail a signature check, look in the local database and request it from the originator.
2015-02-02 16:56:01 +00:00
f2eda123b7
Fix setting identicon width and height
2015-02-02 16:32:33 +00:00
038f5afb07
Spell height more correctly
2015-02-02 16:29:18 +00:00
a006d168c5
Actually merge into develop.
2015-02-02 16:05:34 +00:00
22c1ffb0a0
Add a media/v1/identicon resource for generating identicons using pydenticon
2015-02-02 16:02:31 +00:00
c059c9fea5
Merge branch 'develop' into application-services
...
Conflicts:
synapse/handlers/__init__.py
synapse/storage/__init__.py
2015-02-02 15:57:59 +00:00
6e856d7729
Merge master into develop
...
Conflicts:
README.rst
setup.py
2015-02-02 14:05:42 +00:00
d8cf06e525
Bump version to 0.6.1d
2015-02-02 13:18:36 +00:00
3b33529dfd
Bump version
2015-02-02 13:03:25 +00:00
365e007bee
Ignore empty strings for display names & room names in notifications
2015-01-31 12:48:06 +00:00
0b354fcb84
Again, don't assume all member events have displayname.
2015-01-30 23:10:35 +00:00
fe10b882b7
Don't assume all member events have a display nme.
2015-01-30 23:06:39 +00:00
4c0da49d7c
Resign events when we return them via /query_auth/
2015-01-30 22:53:13 +00:00
0b1cc7cc0b
Return empty list rather than None when there are no emphemeral events for a room
2015-01-30 16:56:13 +00:00
2cd29dbdd9
Fix bug where accepting invite over federation didn't work. Add logging.
2015-01-30 16:51:58 +00:00
7d897f5bfc
Merge pull request #43 from matrix-org/rejections
...
Rejections
2015-01-30 16:11:14 +00:00
776ac820f9
Briefly doc structure of query_auth API.
2015-01-30 15:58:28 +00:00
b724a809c4
Only auth_events with event if event in event.auth_events
2015-01-30 15:57:53 +00:00
7a1e881665
Remove debug logging
2015-01-30 15:56:32 +00:00
b4b892f4a3
Spit out server default rules too.
2015-01-30 15:54:51 +00:00
6dc92d3427
Merge pull request #41 from matrix-org/client_v2_sync
...
Client v2 sync
2015-01-30 15:54:25 +00:00
017dfaef4c
Add doc string for __nonzero__ overrides for sync results, raise not implemented if the client attempts to do a gapless sync
2015-01-30 15:52:05 +00:00
1bd540ef79
Merge branch 'develop' of github.com:matrix-org/synapse into rejections
...
Conflicts:
synapse/storage/schema/im.sql
2015-01-30 15:16:38 +00:00
9ec9d6f2cb
Merge pull request #42 from matrix-org/replication_split
...
Replication split
2015-01-30 15:14:10 +00:00
4ffac34a64
Add glob asterisks when running rules.
...
Means that now you can't do exact matches even in override rules,
but I think we can live with that. Advantage is that you'll now
always get back what was put in to the API.
2015-01-30 15:03:56 +00:00
91015ad008
Remove merge conflict
2015-01-30 14:58:54 +00:00
4f7fe63b6d
Remember to add schema file to list
2015-01-30 14:57:53 +00:00
fdd2ac495a
Merge branch 'develop' of github.com:matrix-org/synapse into rejections_storage
...
Conflicts:
synapse/storage/__init__.py
2015-01-30 14:57:33 +00:00
8bc3066e0b
Merge branch 'client_v2_filter' into client_v2_sync
2015-01-30 14:57:04 +00:00
471c47441d
Merge pull request #37 from matrix-org/client_v2_filter
...
Client v2 filter
2015-01-30 14:56:08 +00:00
e97f756a05
Use 'in' to test if the key exists, remove unused _filters_for_user
2015-01-30 14:54:06 +00:00
2f4cb04f45
Be more specific in naming columns in selects.
2015-01-30 14:48:11 +00:00
472cf532b7
Put CREATE rejections into seperate .sql
2015-01-30 14:48:03 +00:00
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
3d7026e709
Add a slightly more helpful comment
2015-01-30 14:37:31 +00:00
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
84b78c3b5f
Merge branch 'rejections_storage' of github.com:matrix-org/synapse into replication_split
2015-01-30 14:17:47 +00:00
2aaedab203
Merge branch 'develop' of github.com:matrix-org/synapse into new_state_resolution
2015-01-30 14:09:32 +00:00
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
875a481a1e
Merge branch 'new_state_resolution' of github.com:matrix-org/synapse into rejections_storage
2015-01-30 14:04:53 +00:00
7a9f6f083e
Remove commented line
2015-01-30 13:55:46 +00:00
76d7fd39cd
Style changes.
2015-01-30 13:52:02 +00:00
8fe39a0311
Check if the user has joined the room between incremental syncs
2015-01-30 13:38:34 +00:00
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
4a67834bc8
Pass client info to the sync_config
2015-01-30 11:50:15 +00:00
c562f237f6
Unused import
2015-01-30 11:43:00 +00:00
8498d348d8
Fix token formatting
2015-01-30 11:42:09 +00:00
e97de6d96a
Filter the recent events before applying the limit when doing an initial sync
2015-01-30 11:35:20 +00:00
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
2c9e136d57
Fix bad merge fo python_dependencies.py
2015-01-30 11:14:33 +00:00
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
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
0c2d245fdf
Update the current state of an event if we update auth events.
2015-01-30 11:08:52 +00:00
823999716e
Fix bug in timeout handling in keyclient
2015-01-30 11:08:01 +00:00
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
c1c7b39827
Fix bug where we changes in outlier in metadata dict propogated to other events
2015-01-30 10:30:54 +00:00
fc946f3b8d
Include content in notification pokes
2015-01-29 21:59:17 +00:00
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
1235f7f383
Add default push rules including setting a sound for messages mentioning your username / display name
2015-01-29 18:38:22 +00:00
ece828a7b7
Update todo for the filtering on sync
2015-01-29 18:15:24 +00:00
365a186729
Add basic filtering support
2015-01-29 18:11:28 +00:00
7ceda8bf3d
Merge branch 'client_v2_filter' into client_v2_sync
2015-01-29 18:04:07 +00:00
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
4bdfce30d7
Renumber priority classes so we can use 0 for defaults.
2015-01-29 17:12:11 +00:00
e0d2c6889b
Allow kind to be set to null to delete a pusher.
2015-01-29 17:05:00 +00:00
78015948a7
Initial implementation of auth conflict resolution
2015-01-29 16:52:33 +00:00
4ad45f2582
Fix indent
2015-01-29 16:41:49 +00:00
722b65f461
Move typing notifs to an "emphermal" event list on the room object
2015-01-29 16:41:21 +00:00
cc42d3f907
Fix check for empty room update
2015-01-29 16:27:38 +00:00
4d9dd9bdc0
Fix v2 initial sync
2015-01-29 16:23:03 +00:00
8e571cbed8
Merge branch 'client_v2_filter' into client_v2_sync
2015-01-29 16:18:59 +00:00
295322048d
Merge branch 'develop' into client_v2_filter
2015-01-29 16:18:34 +00:00
acb68a39e0
Code style fixes.
2015-01-29 16:12:40 +00:00
8b1dd9f57f
Only send a badge-reset if the user actually has unread notifications.
2015-01-29 16:10:01 +00:00
9150a0d62e
Fix code-style
2015-01-29 16:01:14 +00:00
cf7c54ec93
Merge branch 'client_v2_filter' into client_v2_sync
2015-01-29 15:55:58 +00:00
33391db5f8
Merge in auth changes from develop
2015-01-29 15:54:54 +00:00
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
9d8f798a3f
Merge changes from develop
2015-01-29 14:55:27 +00:00
e4f50fa0aa
Move bump schema delta
2015-01-29 14:53:18 +00:00
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
5a3a15f5c1
Make post_json(...) actually send data.
2015-01-29 13:58:22 +00:00
c183cec8f6
Add post_json(...) method to federation client
2015-01-29 13:44:52 +00:00
83172487b0
Add basic filtering public API unit tests. Use defers in the right places.
2015-01-29 12:20:59 +00:00
777d9914b5
Implement filter algorithm. Add basic event type unit tests to assert it works.
2015-01-29 11:38:06 +00:00
50de1eaad9
Add filtering public API; outline filtering algorithm.
2015-01-29 10:24:57 +00:00
2a4fda7b88
Add filtering.filter_events function, with stub passes_filter function.
2015-01-29 09:27:16 +00:00
3773759c0f
Also edit the filter column on the delta SQL
2015-01-29 09:15:33 +00:00
e3e72b8c5c
Remove typing TODO
2015-01-29 03:35:25 +00:00
3dbce6f4a5
Add typing notifications to sync
2015-01-29 03:33:51 +00:00
Erik Johnston