Erik Johnston
|
42deca50c2
|
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sync
|
2016-01-25 12:49:45 +00:00 |
|
Erik Johnston
|
d685ae73b4
|
Merge branch 'erikj/filters' of github.com:matrix-org/synapse into develop
|
2016-01-25 12:35:25 +00:00 |
|
Erik Johnston
|
4021f95261
|
Move logic from rest/ to handlers/
|
2016-01-25 10:10:44 +00:00 |
|
David Baker
|
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 |
|
David Baker
|
3fe8c56736
|
Better fix for actions with both dont_notify and tweaks
|
2016-01-22 17:21:58 +00:00 |
|
David Baker
|
60965bd7e5
|
Revert b4a41aa542 as it's just broken.
|
2016-01-22 17:21:15 +00:00 |
|
David Baker
|
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 |
|
David Baker
|
b4a41aa542
|
Don't add notifications to the table unless there's actually a 'notify' action
|
2016-01-22 16:56:48 +00:00 |
|
Erik Johnston
|
db6e26bb8c
|
Don't mutate cached values
|
2016-01-22 16:03:55 +00:00 |
|
Erik Johnston
|
88baa3865e
|
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sync
|
2016-01-22 15:57:12 +00:00 |
|
David Baker
|
7065b75bfd
|
Don't crash if a user has no push rule enabled entries
|
2016-01-22 15:13:44 +00:00 |
|
Erik Johnston
|
7959e8b764
|
Underscores are allowed in user ids
|
2016-01-22 14:59:49 +00:00 |
|
David Baker
|
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 |
|
David Baker
|
7cd418d38e
|
Don't add the member functiopn if we're not using treecache
|
2016-01-22 13:40:37 +00:00 |
|
David Baker
|
cd80019eec
|
docs
|
2016-01-22 12:21:13 +00:00 |
|
David Baker
|
d552861346
|
Revert all the bits changing keys of eeverything that used LRUCaches to tuples
|
2016-01-22 12:18:14 +00:00 |
|
David Baker
|
10f76dc5da
|
Make LRU cache not default to treecache & add options to use it
|
2016-01-22 12:10:33 +00:00 |
|
David Baker
|
5b142788d2
|
Add __contains__
|
2016-01-22 11:49:59 +00:00 |
|
David Baker
|
eaa836e8ca
|
Docs for treecache
|
2016-01-22 11:47:22 +00:00 |
|
David Baker
|
42eae4634f
|
Use new invalidate_many cache invalidation to invalidate the event_push_actions cache appropriately.
|
2016-01-22 11:22:48 +00:00 |
|
David Baker
|
8acc5cb60f
|
Add invalidate_many here too
|
2016-01-22 11:22:32 +00:00 |
|
Erik Johnston
|
975903ae17
|
Sanitize filters
|
2016-01-22 10:41:30 +00:00 |
|
David Baker
|
330be18ec5
|
peppate
|
2016-01-21 19:17:32 +00:00 |
|
David Baker
|
f1f8122120
|
Change LRUCache to be tree-based so we can delete subtrees.
|
2016-01-21 19:16:25 +00:00 |
|
Erik Johnston
|
0e07f2e15d
|
Only fetch events for rooms and receipts
|
2016-01-21 16:10:37 +00:00 |
|
Erik Johnston
|
8f66fe6392
|
Cache get_unread_event_push_actions_by_room_for_user
|
2016-01-21 15:02:07 +00:00 |
|
Erik Johnston
|
3a00f13436
|
Only compute badge count when necessary.
This reverts commit d726597737.
|
2016-01-21 14:56:11 +00:00 |
|
Erik Johnston
|
c6549117a2
|
Fix AttributeError
|
2016-01-21 14:02:14 +00:00 |
|
Erik Johnston
|
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 |
|
Erik Johnston
|
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 |
|
Erik Johnston
|
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 |
|
David Baker
|
930ba003f8
|
Remove member event rule as per SYN-607
|
2016-01-21 11:50:27 +00:00 |
|
David Baker
|
c1a3021771
|
Merge pull request #507 from matrix-org/push_badge_counts
Push badge counts
|
2016-01-21 10:09:11 +00:00 |
|
Erik Johnston
|
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 |
|
Erik Johnston
|
c43b6dcc75
|
Fix change_password
|
2016-01-20 16:14:48 +00:00 |
|
David Baker
|
367cfab4e6
|
peppate
|
2016-01-20 16:05:09 +00:00 |
|
Erik Johnston
|
73ca8e5834
|
Whine if we give a from param to /sync
|
2016-01-20 15:42:57 +00:00 |
|
Erik Johnston
|
b088291f14
|
Don't explode when given a unicode username in /register/
|
2016-01-20 15:40:25 +00:00 |
|
Daniel Wagner-Hall
|
da417aa56d
|
Allow non-guests to peek on rooms using /events
|
2016-01-20 15:34:07 +00:00 |
|
David Baker
|
d4315bbf6b
|
Add index by user id on receipts_linearized
|
2016-01-20 15:33:27 +00:00 |
|
David Baker
|
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 |
|
David Baker
|
7cc047455e
|
Inline membership specifier
|
2016-01-20 13:50:28 +00:00 |
|
David Baker
|
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 |
|
David Baker
|
2309450a76
|
Merge branch 'develop' into push_badge_counts
|
2016-01-20 13:45:13 +00:00 |
|
David Baker
|
746f6e0eb3
|
'filtered' is a list of zero or 1
|
2016-01-20 13:44:04 +00:00 |
|
David Baker
|
7441d8cc0c
|
Merge remote-tracking branch 'origin/develop' into push_badge_counts
|
2016-01-20 13:40:22 +00:00 |
|
David Baker
|
ccf9387d57
|
Merge branch 'develop' into push_badge_counts
|
2016-01-20 13:33:45 +00:00 |
|
David Baker
|
259d1ecd1d
|
Don't generate push actions for our own events
|
2016-01-20 13:24:59 +00:00 |
|
Erik Johnston
|
191070123d
|
Cache dns lookups, and use the cache if we fail to lookup servers later
|
2016-01-20 11:34:09 +00:00 |
|
David Baker
|
afb7b377f2
|
Merge branch 'develop' into push_badge_counts
|
2016-01-19 18:17:23 +00:00 |
|
Erik Johnston
|
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 |
|
Erik Johnston
|
ac2842ff1e
|
Only compute unread notifications for rooms we send down stream
|
2016-01-19 17:19:53 +00:00 |
|
Erik Johnston
|
892ee473d9
|
Don't use form of get_state_for_events with None state_key
|
2016-01-19 17:14:46 +00:00 |
|
Erik Johnston
|
2818a000aa
|
Use split rather than endswith
|
2016-01-19 16:11:39 +00:00 |
|
Erik Johnston
|
fb5d8e58ff
|
Change regex cache size to 5000
|
2016-01-19 16:07:07 +00:00 |
|
Erik Johnston
|
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 |
|
Erik Johnston
|
d056a0a3d8
|
Handle glob -> regex errors
|
2016-01-19 14:43:24 +00:00 |
|
Erik Johnston
|
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 |
|
Erik Johnston
|
b8518ffe65
|
Use all_ephemeral_by_room in incremental_sync_with_gap_for_room
|
2016-01-19 14:26:58 +00:00 |
|
Erik Johnston
|
9654ee0848
|
Return don't break
|
2016-01-19 14:24:59 +00:00 |
|
Erik Johnston
|
7ecd211163
|
Except truthy values
|
2016-01-19 14:22:02 +00:00 |
|
Erik Johnston
|
05f78b3b52
|
Merge pull request #504 from matrix-org/erikj/highlight_count
Return highlight_count in /sync
|
2016-01-19 13:21:48 +00:00 |
|
Erik Johnston
|
9a8949f022
|
Merge branch 'develop' of github.com:matrix-org/synapse into default_notify
|
2016-01-19 11:37:05 +00:00 |
|
Erik Johnston
|
3adcc4c86a
|
Return highlight_count in /sync
|
2016-01-19 11:35:50 +00:00 |
|
Erik Johnston
|
47e7963e50
|
Merge pull request #502 from matrix-org/erikj/push_notif_perf
Unread notification performance.
|
2016-01-19 11:27:27 +00:00 |
|
Erik Johnston
|
0d241e1114
|
Take a deepcopy of push rules before mutating them
|
2016-01-19 10:15:12 +00:00 |
|
Erik Johnston
|
f750a442f7
|
Update _id
|
2016-01-19 10:14:53 +00:00 |
|
Erik Johnston
|
003853e702
|
Preserve truthiness
|
2016-01-18 17:34:02 +00:00 |
|
Erik Johnston
|
a284ad4092
|
You need to escape backslashes
|
2016-01-18 17:20:44 +00:00 |
|
Erik Johnston
|
47f82e4408
|
Fix branch didn't check word_boundary
|
2016-01-18 17:04:36 +00:00 |
|
Erik Johnston
|
5cd2126a6a
|
Remove dead code
|
2016-01-18 16:49:46 +00:00 |
|
Erik Johnston
|
29c353c553
|
Don't split at word boundaries, actually use regex
|
2016-01-18 16:48:17 +00:00 |
|
Daniel Wagner-Hall
|
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 |
|
Daniel Wagner-Hall
|
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 |
|
Erik Johnston
|
d16dcf642e
|
Drop log levels
|
2016-01-18 15:44:04 +00:00 |
|
Erik Johnston
|
7dd14e5d1c
|
Add comments and remove dead code
|
2016-01-18 15:42:23 +00:00 |
|
Erik Johnston
|
866fe27e78
|
Do for loop once at start
|
2016-01-18 15:29:41 +00:00 |
|
Erik Johnston
|
d1f56f732e
|
Use static for const dicts
|
2016-01-18 15:17:56 +00:00 |
|
Erik Johnston
|
0e39dcd135
|
Remove internal ids
|
2016-01-18 14:50:17 +00:00 |
|
Erik Johnston
|
345ff2196a
|
Don't edit ruleset
|
2016-01-18 14:50:17 +00:00 |
|
Erik Johnston
|
2c176e02ae
|
Make unit tests work
|
2016-01-18 14:48:50 +00:00 |
|
Erik Johnston
|
63485b3029
|
Re-enable urnead notifications
|
2016-01-18 14:48:30 +00:00 |
|
Erik Johnston
|
f59b564507
|
Make notifications go quicker
|
2016-01-18 14:48:29 +00:00 |
|
Erik Johnston
|
2068678b8c
|
Make Event objects behave more like dicts
|
2016-01-18 14:43:50 +00:00 |
|
Erik Johnston
|
cc66a9a5e3
|
Allow filtering events for multiple users at once
|
2016-01-18 14:43:50 +00:00 |
|
Daniel Wagner-Hall
|
ac5a4477ad
|
Require unbanning before other membership changes
|
2016-01-15 16:27:26 +00:00 |
|
Daniel Wagner-Hall
|
b5ce4f0427
|
Remove unused parameters
|
2016-01-15 13:54:03 +00:00 |
|
David Baker
|
5819b7a78c
|
M_INVALID_USERNAME to be consistent with the parameter name
|
2016-01-15 10:06:34 +00:00 |
|
David Baker
|
3f8db3d597
|
Add specific error code for invalid user names.
|
2016-01-14 17:21:04 +00:00 |
|
Erik Johnston
|
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 |
|
Richard van der Hoff
|
2978053d16
|
Merge branch 'release-v0.12.1' into develop
|
2016-01-14 15:04:08 +00:00 |
|
Daniel Wagner-Hall
|
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 |
|
David Baker
|
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 |
|
Daniel Wagner-Hall
|
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 |
|
Daniel Wagner-Hall
|
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 |
|
Daniel Wagner-Hall
|
fcb6df45e5
|
Merge pull request #493 from matrix-org/daniel/1
Delete unused code
|
2016-01-14 11:06:14 +00:00 |
|
David Baker
|
a7927c13fd
|
Fix enabling & disabling push rules
|
2016-01-14 10:53:44 +00:00 |
|
Erik Johnston
|
339c8f0133
|
Clamp pagination limits to at most 1000
|
2016-01-14 10:22:02 +00:00 |
|
Erik Johnston
|
bce602eb4e
|
Use logger not logging
|
2016-01-14 09:56:26 +00:00 |
|
David Baker
|
12623c99b6
|
Use the unread notification count to send accurate badge counts in push notifications.
|
2016-01-13 18:55:57 +00:00 |
|