96 Commits

Author	SHA1	Message	Date
Mark Haines	8c94833b72	Fix adding push rules relative to other rules	2016-01-27 10:24:20 +00:00
Erik Johnston	ddd25def01	Implement a _simple_select_many_batch	2016-01-25 13:36:02 +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
Mark Haines	9c1f853d58	Rename 'user_name' to 'user_id' in push to make it consistent with the rest of the code	2016-01-13 13:32:59 +00:00
Mark Haines	f4dad9f639	Merge remote-tracking branch 'origin/erikj/bulk_get_push_rules' into markjh/table_name ... Conflicts: synapse/storage/push_rule.py	2016-01-13 11:46:07 +00:00
Erik Johnston	8740e4e94a	bulk_get_push_rules should handle empty lists	2016-01-13 11:37:17 +00:00
Mark Haines	31de2953a3	Remove the PushRuleTable and PushRuleEnableTable objects	2016-01-12 14:36:16 +00:00
David Baker	c232780081	Merge pull request #456 from matrix-org/store_event_actions ... Send unread notification counts	2016-01-08 14:47:15 +00:00
Matthew Hodgson	6c28ac260c	copyrights	2016-01-07 04:26:29 +00:00
David Baker	3051c9d002	Address minor PR issues	2016-01-04 13:39:29 +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
Erik Johnston	2df8dd9b37	Move all the caches into their own package, synapse.util.caches	2015-08-11 18:00:59 +01:00
Erik Johnston	b8e386db59	Change Cache to not use *args in its interface	2015-08-07 11:52:21 +01:00
Erik Johnston	39e21ea51c	Add support for using keyword arguments with cached functions	2015-07-27 13:57:29 +01:00
Mark Haines	a04cde613e	Add a cache for get_push rules for user, fix cache invalidation	2015-05-22 10:39:45 +01:00
Erik Johnston	4429e720ae	Merge branch 'master' of github.com:matrix-org/synapse into develop	2015-05-22 10:33:00 +01:00
Mark Haines	2043527b9b	Don't try to use a txn when not in one, remove spurious debug logging	2015-05-21 16:53:03 +01:00
Mark Haines	53447e9cd3	Add caches for things requested by the pushers	2015-05-21 16:41:39 +01:00
David Baker	7c549dd557	Add ID generator for push_rules_enable to #resolve SYN-378	2015-05-14 11:44:03 +01:00
Erik Johnston	b036596b75	Prefer to use _simple_*.	2015-05-11 11:24:01 +01:00
Erik Johnston	cd525c0f5a	push_rules table expects an 'id' field	2015-05-11 11:24:01 +01:00
Erik Johnston	22d2f498fa	Fix push rule bug: can't insert bool into small int column	2015-05-10 10:50:51 +01:00
Erik Johnston	f6583796fe	Merge branch 'develop' of github.com:matrix-org/synapse into mysql	2015-03-20 16:31:48 +00:00
Erik Johnston	dc0c989ef4	Give sensible names for '_simple_...' transactions	2015-03-20 15:59:18 +00:00
Erik Johnston	d7a0496f3e	Convert storage layer to be mysql compatible	2015-03-19 15:59:48 +00:00
Paul "LeoNerd" Evans	59a5f012cc	Also give _execute() a description	2015-03-11 17:19:17 +00:00
David Baker	04f8478aaa	Add the master push rule for the break-my-push button. Allow server default rules to be disabled by default.	2015-03-10 17:26:25 +00:00
David Baker	2a45f3d448	Use if not results rather than len, as per feedback.	2015-03-04 14:17:59 +00:00
David Baker	6fab7bd2c1	s/user_name/user/ as per mjark's comment	2015-03-02 18:17:19 +00:00
David Baker	20436cdf75	Blank lines	2015-03-02 15:58:12 +00:00
David Baker	1959088156	Add API for getting/setting enabled-ness of push rules.	2015-02-26 18:07:44 +00:00
David Baker	944003021b	whitespace	2015-02-26 13:43:05 +00:00
David Baker	94fa334b01	Add enable/disable overlay for push rules (REST API not yet hooked up)	2015-02-25 19:17:07 +00:00
Erik Johnston	4ebbaf0d43	Blunty replace json with simplejson	2015-02-11 14:23:10 +00:00
Mark Haines	b085fac735	Code-style fixes	2015-02-10 16:30:48 +00:00
David Baker	aaf50bf6f3	Give server default rules the 'default' attribute and fix various brokenness.	2015-02-05 15:11:38 +00:00
Mark Haines	acb68a39e0	Code style fixes.	2015-01-29 16:12:40 +00:00
David Baker	d5bdf3c0c7	Allow the push rule delete method to take more specifiers.	2015-01-28 18:06:04 +00:00
David Baker	e78dd33292	Use %s instead of +	2015-01-28 14:52:58 +00:00
David Baker	93aac9bb7b	Newline	2015-01-28 14:51:01 +00:00
David Baker	445ad9941e	Redundant parens	2015-01-28 14:49:59 +00:00
David Baker	5f84ba8ea1	Add API to delete push rules.	2015-01-23 17:49:37 +00:00
David Baker	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
David Baker	8a850573c9	As yet fairly untested GET API for push rules	2015-01-22 19:32:17 +00:00
David Baker	7ecb49ef25	Insufficient newlines	2015-01-22 17:53:30 +00:00
David Baker	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