177 commits

Author	SHA1	Message	Date
Richard van der Hoff	05aee12652	Merge branch 'develop' into rav/guest_access_after_room_join	2016-02-19 12:00:16 +00:00
Richard van der Hoff	b71ca2b014	Allow guest users access to messages in rooms they have joined ... There should be no difference between guest users and non-guest users in terms of access to messages. Define the semantics of the is_peeking argument to filter_events_for_clients (slightly) better; interpret it appropriately, and set it correctly from /sync.	2016-02-19 11:41:02 +00:00
Mark Haines	b9977ea667	Remove dead code for setting device specific rules. ... It wasn't possible to hit the code from the API because of a typo in parsing the request path. Since no-one was using the feature we might as well remove the dead code.	2016-02-18 16:05:13 +00:00
Erik Johnston	f28cc45183	Pass in current state to push action handler	2016-02-09 16:01:40 +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
David Baker	7065b75bfd	Don't crash if a user has no push rule enabled entries	2016-01-22 15:13:44 +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	746f6e0eb3	'filtered' is a list of zero or 1	2016-01-20 13:44:04 +00:00
David Baker	259d1ecd1d	Don't generate push actions for our own events	2016-01-20 13:24:59 +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	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	29c353c553	Don't split at word boundaries, actually use regex	2016-01-18 16:48:17 +00:00
Erik Johnston	d1f56f732e	Use static for const dicts	2016-01-18 15:17:56 +00:00
Erik Johnston	f59b564507	Make notifications go quicker	2016-01-18 14:48:29 +00:00
David Baker	823b679232	more commas	2016-01-07 10:02:47 +00:00
David Baker	c79f221192	Add is_guest flag to users db to track whether a user is a guest user or not. Use this so we can run _filter_events_for_client when calculating event_push_actions.	2016-01-06 11:38:09 +00:00
David Baker	85ca8cb90c	comment typo	2016-01-05 13:32:39 +00:00
David Baker	3051c9d002	Address minor PR issues	2016-01-04 13:39:29 +00:00
David Baker	9b4cd0cd0f	pep8 & unused variable	2015-12-22 17:25:09 +00:00
David Baker	5645d9747b	Add some comments to areas that could be optimised.	2015-12-22 17:19:22 +00:00
David Baker	65c451cb38	Add bulk push rule evaluator which actually still evaluates rules one by one, but does far fewer db queries to fetch the rules	2015-12-22 15:19:34 +00:00