5437 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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	40d9765123	Merge pull request #505 from matrix-org/erikj/push_fast ... Push actions perf	2016-01-19 16:16:05 +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	f5fc8f2928	Merge pull request #486 from matrix-org/default_notify ... Change default pushrules back to notifying for all messages.	2016-01-19 12:49:29 +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
Daniel Wagner-Hall	88af7bb48b	Merge pull request #503 from matrix-org/daniel/nonghosts ... Don't error on AS non-ghost user use	2016-01-19 11:27:00 +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	5de1563997	Merge pull request #501 from matrix-org/daniel/unban ... Require unbanning before other membership changes	2016-01-15 16:27:29 +00:00
Daniel Wagner-Hall	ac5a4477ad	Require unbanning before other membership changes	2016-01-15 16:27:26 +00:00
Daniel Wagner-Hall	c049f60d4a	Merge pull request #500 from matrix-org/daniel/cleanup ... Remove unused parameters	2016-01-15 16:02:22 +00:00
Daniel Wagner-Hall	b5ce4f0427	Remove unused parameters	2016-01-15 13:54:03 +00:00
David Baker	ac12b6d332	Merge branch 'invalid_user_name' into develop	2016-01-15 10:07:01 +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	5bf1a3d6dc	Merge pull request #499 from matrix-org/invalid_user_name ... Add specific error code for invalid user names.	2016-01-15 09:18:02 +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