5416 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Richard van der Hoff	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
David Baker	27b9775073	Merge pull request #529 from matrix-org/dbkr/one_to_one_only_messages ... Only notify for messages in one to one rooms, not every event	2016-01-26 11:50:26 +00:00
David Baker	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
Mark Haines	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
Erik Johnston	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
Mark Haines	e18257f0e5	Add missing yield in push_rules set enabled	2016-01-25 16:51:56 +00:00
Erik Johnston	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
Erik Johnston	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
Erik Johnston	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
Erik Johnston	aea5da0ef6	Guard against empty iterables	2016-01-25 15:59:29 +00:00
Erik Johnston	3a75159832	Merge pull request #521 from matrix-org/erikj/underscores ... Underscores are allowed in user ids	2016-01-25 15:56:31 +00:00
Erik Johnston	1ebf5e3d03	Correct docstring	2016-01-25 15:53:36 +00:00
Erik Johnston	dc2647cd3d	PEP8	2016-01-25 15:48:54 +00:00
Erik Johnston	86896408b0	Add index to event_push_actions	2016-01-25 15:30:32 +00:00
Erik Johnston	53cb173663	Push: Use storage apis that are cached	2016-01-25 13:55:18 +00:00
Erik Johnston	d59c58bc95	Remove weird stuff	2016-01-25 13:38:53 +00:00
Erik Johnston	ddd25def01	Implement a _simple_select_many_batch	2016-01-25 13:36:02 +00:00
Erik Johnston	8c6012a4af	Fix tests	2016-01-25 13:12:35 +00:00
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	74f49f99f9	Merge pull request #520 from matrix-org/dbkr/bulk_push_overlay_enabled ... Overlay the push_rules_enabled map for users	2016-01-22 15:25:52 +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	7a3fe48ba4	Merge pull request #519 from matrix-org/dbkr/treecache ... Make LRU caching tree-based so subtrees of the cache can be invalidated cheaply.	2016-01-22 14:47:48 +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
David Baker	31a051b677	Test treecache directly	2016-01-22 11:22:00 +00:00
Erik Johnston	8f9c74e9f1	Fix tests	2016-01-22 10:48:27 +00:00
Erik Johnston	975903ae17	Sanitize filters	2016-01-22 10:41:30 +00:00
David Baker	4efcaa43c8	Add tests for treecache directly and test del_multi at the LruCache level too.	2016-01-22 10:37:37 +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	297eded261	Merge pull request #517 from matrix-org/erikj/push_only_room ... Only fetch events for rooms and receipts	2016-01-21 16:12:39 +00:00
Erik Johnston	0e07f2e15d	Only fetch events for rooms and receipts	2016-01-21 16:10:37 +00:00
Erik Johnston	82b46f556d	Merge pull request #516 from matrix-org/erikj/push_perf ... Reduce number of calls to get_unread_event_push_actions_by_room	2016-01-21 15:12:56 +00:00