19fd425928
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sync
2016-01-28 14:46:08 +00:00
167d1df699
Merge pull request #534 from matrix-org/erikj/setup
...
Add a Homeserver.setup method
2016-01-28 14:45:36 +00:00
7ed2bbeb11
Clean up a bit. Add comment
2016-01-28 14:32:05 +00:00
571a566399
Change load limit params
2016-01-28 14:11:16 +00:00
3c6518ddbf
Amalgamate incremental and full sync for user
2016-01-28 14:03:48 +00:00
4e7948b47a
Allow paginating backwards from stream token
2016-01-28 11:52:34 +00:00
ba8931829b
Return correct type of token
2016-01-28 11:34:17 +00:00
61eaa6ec64
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sync
2016-01-28 10:50:57 +00:00
c5e7c0e436
Up get_rooms_for_user cache size
2016-01-28 09:58:45 +00:00
e26390ca46
Merge pull request #535 from matrix-org/rav/paginate_from_stream_token
...
Make it possible to paginate forwards from stream tokens
2016-01-28 09:49:46 +00:00
a6477d5933
Remove chdir
2016-01-28 09:19:55 +00:00
5cba88ea7c
Make it possible to paginate forwards from stream tokens
...
In order that we can fill the gap after a /sync, make it possible to paginate
forwards from a stream token.
2016-01-27 17:42:45 +00:00
5fc9b17518
No chdir
2016-01-27 17:39:20 +00:00
fa90c180ee
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/setup
2016-01-27 17:37:33 +00:00
5610880003
Merge pull request #530 from matrix-org/erikj/server_refactor
...
Remove redundant BaseHomeServer
2016-01-27 17:36:31 +00:00
e7febf4fbb
PEP8
2016-01-27 17:33:27 +00:00
aca3193efb
Use the same path for incremental with gap or without gap
2016-01-27 17:33:27 +00:00
b97f6626b6
Add cache to room stream
2016-01-27 17:33:26 +00:00
f93ecf8783
Don't turn on profiling
2016-01-27 17:33:26 +00:00
a955cbfa49
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/setup
2016-01-27 17:22:35 +00:00
8c97b49886
Merge pull request #533 from matrix-org/rav/hashtest_federation
...
Fix federation for #test:matrix.org
2016-01-27 17:19:36 +00:00
2152b320c5
PEP 8
2016-01-27 17:09:17 +00:00
d6d60b4d6c
Federation: drop events which cause SynapseErrors
...
... rather than rejecting any attempt to federate channels which contain such
events.
2016-01-27 17:02:10 +00:00
d6c831bd3d
Merge pull request #531 from matrix-org/markjh/relative_push_rules
...
Fix adding push rules relative to other rules
2016-01-27 17:13:36 +01:00
8c94833b72
Fix adding push rules relative to other rules
2016-01-27 10:24:20 +00:00
9fda8b5193
Don't turn on profiling
2016-01-26 18:27:23 +00:00
e4e33c743e
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/server_refactor
2016-01-26 17:30:00 +00:00
87f9477b10
Add a Homeserver.setup method.
...
This is for setting up dependencies that require work on startup. This
is useful for the DataStore that wants to read a bunch from the database
before initiliazing.
2016-01-26 15:51:06 +00:00
9959d9ece8
Remove redundated BaseHomeServer
2016-01-26 13:52:29 +00:00
766c24b2e6
Only notify for messages in one to one rooms, not every event
...
Fixes the fact that candidate events and hangups generated notifications.
2016-01-26 10:21:41 +00:00
7179fdd550
Merge pull request #528 from matrix-org/markjh/missing_yield
...
Add missing yield in push_rules set enabled
2016-01-25 21:26:30 +01:00
c887c4cbd5
Merge pull request #524 from matrix-org/erikj/sync
...
Move some sync logic from rest to handlers pacakege
2016-01-25 16:58:39 +00:00
e18257f0e5
Add missing yield in push_rules set enabled
2016-01-25 16:51:56 +00:00
8431f62ebb
Merge pull request #525 from matrix-org/erikj/select_many
...
Implement a `_simple_select_many_batch`
2016-01-25 16:30:36 +00:00
f091b73e69
Merge pull request #527 from matrix-org/erikj/push_cache
...
Push: Use storage apis that are cached
2016-01-25 16:16:34 +00:00
ce6fbbea94
Merge pull request #526 from matrix-org/erikj/push_index
...
Add index to event_push_actions
2016-01-25 16:06:07 +00:00
aea5da0ef6
Guard against empty iterables
2016-01-25 15:59:29 +00:00
3a75159832
Merge pull request #521 from matrix-org/erikj/underscores
...
Underscores are allowed in user ids
2016-01-25 15:56:31 +00:00
1ebf5e3d03
Correct docstring
2016-01-25 15:53:36 +00:00
dc2647cd3d
PEP8
2016-01-25 15:48:54 +00:00
86896408b0
Add index to event_push_actions
2016-01-25 15:30:32 +00:00
53cb173663
Push: Use storage apis that are cached
2016-01-25 13:55:18 +00:00
d59c58bc95
Remove weird stuff
2016-01-25 13:38:53 +00:00
ddd25def01
Implement a _simple_select_many_batch
2016-01-25 13:36:02 +00:00
8c6012a4af
Fix tests
2016-01-25 13:12:35 +00:00
42deca50c2
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sync
2016-01-25 12:49:45 +00:00
d685ae73b4
Merge branch 'erikj/filters' of github.com:matrix-org/synapse into develop
2016-01-25 12:35:25 +00:00
4021f95261
Move logic from rest/ to handlers/
2016-01-25 10:10:44 +00:00
f92fe15897
Merge pull request #523 from matrix-org/dbkr/no_push_unless_notify
...
Better fix for actions with both dont_notify and tweaks
2016-01-22 17:27:25 +00:00
3fe8c56736
Better fix for actions with both dont_notify and tweaks
2016-01-22 17:21:58 +00:00
60965bd7e5
Revert b4a41aa542 as it's just broken.
2016-01-22 17:21:15 +00:00
0e0e441b33
Merge pull request #522 from matrix-org/dbkr/no_push_unless_notify
...
Don't add notifications to the table unless there's actually a 'notify' action
2016-01-22 17:06:52 +00:00
b4a41aa542
Don't add notifications to the table unless there's actually a 'notify' action
2016-01-22 16:56:48 +00:00
db6e26bb8c
Don't mutate cached values
2016-01-22 16:03:55 +00:00
88baa3865e
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sync
2016-01-22 15:57:12 +00:00
7065b75bfd
Don't crash if a user has no push rule enabled entries
2016-01-22 15:13:44 +00:00
7959e8b764
Underscores are allowed in user ids
2016-01-22 14:59:49 +00:00
52bdd1b834
Overlay the push_rules_enabled map for users, otherwise they won't be able to disable server default rules.
2016-01-22 14:58:19 +00:00
7cd418d38e
Don't add the member functiopn if we're not using treecache
2016-01-22 13:40:37 +00:00
cd80019eec
docs
2016-01-22 12:21:13 +00:00
d552861346
Revert all the bits changing keys of eeverything that used LRUCaches to tuples
2016-01-22 12:18:14 +00:00
10f76dc5da
Make LRU cache not default to treecache & add options to use it
2016-01-22 12:10:33 +00:00
5b142788d2
Add __contains__
2016-01-22 11:49:59 +00:00
eaa836e8ca
Docs for treecache
2016-01-22 11:47:22 +00:00
42eae4634f
Use new invalidate_many cache invalidation to invalidate the event_push_actions cache appropriately.
2016-01-22 11:22:48 +00:00
8acc5cb60f
Add invalidate_many here too
2016-01-22 11:22:32 +00:00
975903ae17
Sanitize filters
2016-01-22 10:41:30 +00:00
330be18ec5
peppate
2016-01-21 19:17:32 +00:00
f1f8122120
Change LRUCache to be tree-based so we can delete subtrees.
2016-01-21 19:16:25 +00:00
0e07f2e15d
Only fetch events for rooms and receipts
2016-01-21 16:10:37 +00:00
8f66fe6392
Cache get_unread_event_push_actions_by_room_for_user
2016-01-21 15:02:07 +00:00
3a00f13436
Only compute badge count when necessary.
...
This reverts commit d726597737
2016-01-21 14:56:11 +00:00
c6549117a2
Fix AttributeError
2016-01-21 14:02:14 +00:00
ed1d189e10
Merge pull request #515 from matrix-org/erikj/syn-606
...
SYN-606: Peeking does not wake up /events
2016-01-21 13:40:20 +00:00
dfe1273d14
Merge pull request #509 from matrix-org/erikj/dns_cache
...
Cache dns lookups, and use the cache if we fail to lookup servers later
2016-01-21 13:37:23 +00:00
91a222c66d
SYN-606: Peeking does not wake up /events
...
If a real user attempted to first peek into one room, and then another,
their room event stream would not be woken up for events in the later
room.
2016-01-21 13:22:26 +00:00
930ba003f8
Remove member event rule as per SYN-607
2016-01-21 11:50:27 +00:00
c1a3021771
Merge pull request #507 from matrix-org/push_badge_counts
...
Push badge counts
2016-01-21 10:09:11 +00:00
d049e81b10
Merge pull request #513 from matrix-org/erikj/register_user_chars
...
Don't explode when given a unicode username in /register/
2016-01-21 09:53:35 +00:00
c43b6dcc75
Fix change_password
2016-01-20 16:14:48 +00:00
367cfab4e6
peppate
2016-01-20 16:05:09 +00:00
73ca8e5834
Whine if we give a from param to /sync
2016-01-20 15:42:57 +00:00
b088291f14
Don't explode when given a unicode username in /register/
2016-01-20 15:40:25 +00:00
da417aa56d
Allow non-guests to peek on rooms using /events
2016-01-20 15:34:07 +00:00
d4315bbf6b
Add index by user id on receipts_linearized
2016-01-20 15:33:27 +00:00
3fa344c037
Add storage function to get all receipts for a user. Also add some cache invalidation to the receipts storage because there wasn't any, and remove a method that was unused.
2016-01-20 15:30:31 +00:00
7cc047455e
Inline membership specifier
2016-01-20 13:50:28 +00:00
d726597737
Simplify badge updating code by just updating it every time we get woken up and it's not an event
2016-01-20 13:49:00 +00:00
2309450a76
Merge branch 'develop' into push_badge_counts
2016-01-20 13:45:13 +00:00
746f6e0eb3
'filtered' is a list of zero or 1
2016-01-20 13:44:04 +00:00
7441d8cc0c
Merge remote-tracking branch 'origin/develop' into push_badge_counts
2016-01-20 13:40:22 +00:00
ccf9387d57
Merge branch 'develop' into push_badge_counts
2016-01-20 13:33:45 +00:00
259d1ecd1d
Don't generate push actions for our own events
2016-01-20 13:24:59 +00:00
191070123d
Cache dns lookups, and use the cache if we fail to lookup servers later
2016-01-20 11:34:09 +00:00
afb7b377f2
Merge branch 'develop' into push_badge_counts
2016-01-19 18:17:23 +00:00
af30140621
Merge pull request #506 from matrix-org/erikj/push_fast
...
Only compute unread notifications for rooms we send down stream
2016-01-19 17:31:10 +00:00
ac2842ff1e
Only compute unread notifications for rooms we send down stream
2016-01-19 17:19:53 +00:00
892ee473d9
Don't use form of get_state_for_events with None state_key
2016-01-19 17:14:46 +00:00
2818a000aa
Use split rather than endswith
2016-01-19 16:11:39 +00:00
fb5d8e58ff
Change regex cache size to 5000
2016-01-19 16:07:07 +00:00
5a7d1ecffc
Add regex cache. Only caculate push actions for users that have sent read receipts, and are on that server
2016-01-19 16:01:05 +00:00
d056a0a3d8
Handle glob -> regex errors
2016-01-19 14:43:24 +00:00
7a079adc8f
Merge pull request #477 from matrix-org/erikj/access_token_log
...
Don't log urlencoded access_tokens
2016-01-19 14:28:29 +00:00
b8518ffe65
Use all_ephemeral_by_room in incremental_sync_with_gap_for_room
2016-01-19 14:26:58 +00:00
9654ee0848
Return don't break
2016-01-19 14:24:59 +00:00
7ecd211163
Except truthy values
2016-01-19 14:22:02 +00:00
05f78b3b52
Merge pull request #504 from matrix-org/erikj/highlight_count
...
Return highlight_count in /sync
2016-01-19 13:21:48 +00:00
9a8949f022
Merge branch 'develop' of github.com:matrix-org/synapse into default_notify
2016-01-19 11:37:05 +00:00
3adcc4c86a
Return highlight_count in /sync
2016-01-19 11:35:50 +00:00
47e7963e50
Merge pull request #502 from matrix-org/erikj/push_notif_perf
...
Unread notification performance.
2016-01-19 11:27:27 +00:00
0d241e1114
Take a deepcopy of push rules before mutating them
2016-01-19 10:15:12 +00:00
f750a442f7
Update _id
2016-01-19 10:14:53 +00:00
003853e702
Preserve truthiness
2016-01-18 17:34:02 +00:00
a284ad4092
You need to escape backslashes
2016-01-18 17:20:44 +00:00
47f82e4408
Fix branch didn't check word_boundary
2016-01-18 17:04:36 +00:00
5cd2126a6a
Remove dead code
2016-01-18 16:49:46 +00:00
29c353c553
Don't split at word boundaries, actually use regex
2016-01-18 16:48:17 +00:00
808a8aedab
Don't error on AS non-ghost user use
...
This will probably go away either when we fix our existing ASes, or when
we kill the concept of non-ghost users.
2016-01-18 16:33:05 +00:00
74474a6d63
Pull out app service user lookup
...
I find this a lot simpler than nested try-catches and stuff
2016-01-18 16:32:33 +00:00
d16dcf642e
Drop log levels
2016-01-18 15:44:04 +00:00
7dd14e5d1c
Add comments and remove dead code
2016-01-18 15:42:23 +00:00
866fe27e78
Do for loop once at start
2016-01-18 15:29:41 +00:00
d1f56f732e
Use static for const dicts
2016-01-18 15:17:56 +00:00
0e39dcd135
Remove internal ids
2016-01-18 14:50:17 +00:00
345ff2196a
Don't edit ruleset
2016-01-18 14:50:17 +00:00
2c176e02ae
Make unit tests work
2016-01-18 14:48:50 +00:00
63485b3029
Re-enable urnead notifications
2016-01-18 14:48:30 +00:00
f59b564507
Make notifications go quicker
2016-01-18 14:48:29 +00:00
2068678b8c
Make Event objects behave more like dicts
2016-01-18 14:43:50 +00:00
cc66a9a5e3
Allow filtering events for multiple users at once
2016-01-18 14:43:50 +00:00
ac5a4477ad
Require unbanning before other membership changes
2016-01-15 16:27:26 +00:00
b5ce4f0427
Remove unused parameters
2016-01-15 13:54:03 +00:00
5819b7a78c
M_INVALID_USERNAME to be consistent with the parameter name
2016-01-15 10:06:34 +00:00
3f8db3d597
Add specific error code for invalid user names.
2016-01-14 17:21:04 +00:00
a50013fd99
Merge pull request #497 from matrix-org/erikj/max_limit
...
Clamp pagination limits to at most 1000
2016-01-14 16:28:52 +00:00
2978053d16
Merge branch 'release-v0.12.1' into develop
2016-01-14 15:04:08 +00:00
2680043bc6
Require ID and as_token be unique for ASs
...
Defaults ID to as_token if not specified. This will change
when IDs are fully supported.
2016-01-14 14:34:01 +00:00
8db451f652
Merge pull request #498 from matrix-org/push_rule_enabled_fix
...
Fix enabling & disabling push rules
2016-01-14 13:34:05 +00:00
d14fcfd24a
Merge pull request #487 from matrix-org/daniel/forceregistration
...
Require AS users to be registered before use
2016-01-14 11:06:43 +00:00
27927463a1
Merge pull request #494 from matrix-org/daniel/2
...
Don't start server if ASes are invalidly configured
2016-01-14 11:06:19 +00:00
fcb6df45e5
Merge pull request #493 from matrix-org/daniel/1
...
Delete unused code
2016-01-14 11:06:14 +00:00
a7927c13fd
Fix enabling & disabling push rules
2016-01-14 10:53:44 +00:00
339c8f0133
Clamp pagination limits to at most 1000
2016-01-14 10:22:02 +00:00
bce602eb4e
Use logger not logging
2016-01-14 09:56:26 +00:00
12623c99b6
Use the unread notification count to send accurate badge counts in push notifications.
2016-01-13 18:55:57 +00:00
2655d61d70
Don't change signature. Return empty list
2016-01-13 17:43:39 +00:00
fcb05b4c82
Temporarily disable notification branch
2016-01-13 17:39:58 +00:00
f6fcff3602
Don't start server if ASes are invalidly configured
2016-01-13 17:09:24 +00:00
244b356a37
Delete unused code
2016-01-13 17:03:58 +00:00
49f33f6438
Add 'event' result to 'context' endpoint
...
... because the context isn't much use without the event.
2016-01-13 16:42:14 +00:00
Erik Johnston