97 commits

Author	SHA1	Message	Date
David Baker	b8690dd840	Catch any exceptions in the pusher loop. Use a lower timeout for pushers so we can see if they're actually still running.	2015-06-05 11:40:22 +01:00
Mark Haines	00dd207f60	Take a dict of the rule, not the rule list	2015-05-26 14:57:48 +01:00
Mark Haines	804b732aab	SYN-390: Don't modify the dictionary returned from the database here either	2015-05-26 10:35:08 +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
Mark Haines	d61ce3f670	Add a cache for get_current_state with state_key	2015-05-21 16:41:39 +01:00
Erik Johnston	3e71d13acf	Also log when we've started pushers	2015-04-29 18:37:42 +01:00
Erik Johnston	c27d6ad6b5	Only start pushers when synapse has fully started	2015-04-29 18:25:24 +01:00
Erik Johnston	46daf2d200	Start pushers on reactor thread	2015-04-29 18:22:20 +01:00
David Baker	12d381bd5d	Decode the data json in the storage layer (was moved but this part was missed)	2015-04-29 17:13:51 +01:00
Erik Johnston	327ca883ec	Merge branch 'develop' of github.com:matrix-org/synapse into postgres	2015-04-28 13:39:42 +01:00
Mark Haines	9182f87664	Merge pull request #126 from matrix-org/csauth ... Client / Server Auth Refactor	2015-04-28 11:00:27 +01:00
Erik Johnston	6f8e2d517e	Merge branch 'develop' of github.com:matrix-org/synapse into postgres	2015-04-27 14:41:40 +01:00
David Baker	ed83638668	Make one-to-one rule an underride otherwise bings don't work in one-to-one wrooms. Likewise a couple of other rules.	2015-04-24 14:27:17 +01:00
Mark Haines	4e2f8b8722	Copyright notices	2015-04-24 10:35:29 +01:00
Erik Johnston	bc9e69e160	Move encoding and decoding of JSON into storage layer	2015-04-16 11:01:09 +01:00
David Baker	6f4f7e4e22	pep8	2015-03-26 14:12:06 +00:00
David Baker	a32e876ef4	Delete pushers when changing password	2015-03-26 13:40:16 +00:00
David Baker	df4c12c762	pep8 blank lines	2015-03-25 19:08:17 +00:00
David Baker	c1a256cc4c	Allow multiple pushers for a single app ID & pushkey, honouring the 'append' flag in the API.	2015-03-25 19:06:22 +00:00
David Baker	c7023f2155	1) Pushers are now associated with an access token ... 2) Change places where we mean unauthenticated to 401, not 403, in C/S v2: hack so it stays as 403 in v1 because web client relies on it.	2015-03-24 17:24:15 +00:00
David Baker	bbb010a30f	More sacrifices to the pep8 gods.	2015-03-12 16:53:12 +00:00
David Baker	c92fdf88a3	Log the matching push rule.	2015-03-11 22:17:31 +00:00
David Baker	cdb2e045ee	Again, underscore, not hyphen	2015-03-11 14:22:35 +00:00
David Baker	465354ffde	'false' is not False	2015-03-11 11:24:50 +00:00
David Baker	83b1e7fb3c	PEP8 blank lines	2015-03-11 10:01: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	1df3ccf7ee	D'oh: underscore, not hyphen	2015-03-09 12:39:56 +00:00
David Baker	118c883429	Call notifications should be override else they'll get clobbered by sender/room rules.	2015-03-06 19:41:36 +00:00
David Baker	be9dafcd37	Dial down logging for failed pushers	2015-03-06 15:32:38 +00:00
David Baker	96eda876a4	Specify when we don't want to highlight	2015-03-06 15:12:37 +00:00
David Baker	e7d7152c3c	Remove the fallback rule - we probably don't want to be notifying for everything even if we don't know what it is.	2015-03-06 15:03:34 +00:00
David Baker	5ecc768970	Add attribute so push gateways can tell if a member event is about the user in question	2015-03-06 14:41:50 +00:00
David Baker	c06b45129c	Add more server default rules so we have default rules for whether you get notifs for invites / random member events	2015-03-06 11:50:51 +00:00
David Baker	657a0d2568	Comment typo	2015-03-06 11:34:30 +00:00
David Baker	1487bba226	Suppress notices should trump content/room/sender rules.	2015-03-06 10:27:32 +00:00
David Baker	83d31144eb	Add the highlight tweak where messages should be highlighted a different colour in appropriate clients.	2015-03-06 10:26:08 +00:00
David Baker	590b544f67	Add default rule to suppress notices.	2015-03-04 15:29:02 +00:00
David Baker	6fab7bd2c1	s/user_name/user/ as per mjark's comment	2015-03-02 18:17:19 +00:00
David Baker	769f8b58e8	Rename the room-with-two-people rule to be more compatible if we have actual one to one rooms.	2015-03-02 13:28:24 +00:00
David Baker	cfac3b7873	SYN-267 Add a fallback rule as an explicit server default rule and make the default dont-notify so you effectively have a "notify for everything else" switch you can turn on and off.	2015-02-26 18:58:14 +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	94fa334b01	Add enable/disable overlay for push rules (REST API not yet hooked up)	2015-02-25 19:17:07 +00:00
David Baker	b457f1677c	Send room ID in http notifications so clients know which room to go to if the user responds to the notification.	2015-02-19 10:06:17 +00:00
David Baker	8d5cce62ab	Update pushers by app id and pushkey, not user id and pushkey	2015-02-13 16:16:16 +00:00
Erik Johnston	e9e54449f5	Use encode_canonical_json for pushes	2015-02-11 17:32:42 +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	8f616684a3	Need to use re.search if looking for matches not at the start of the string. Also comparisons with None should be 'is'.	2015-02-09 17:01:40 +00:00
Matthew Hodgson	a578251b48	only do word-boundary patches on bodies for now	2015-02-09 16:44:47 +00:00