Mark Haines
							
						 
						
							 
							
							
							
								
							
								7e23476814 
								
							
								 
							
						 
						
							
							
								
								move filter_events_for_client out of base handler  
							
							 
							
							
							
						 
						
							2016-05-11 13:42:37 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								30057b1e15 
								
							
								 
							
						 
						
							
							
								
								Move _create_new_client_event and handle_new_client_event out of base handler  
							
							 
							
							
							
						 
						
							2016-05-11 09:09:20 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								fe97b81c09 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #759  from matrix-org/dbkr/email_notifs  
							
							 
							
							... 
							
							
							
							Send email notifications for missed messages 
							
						 
						
							2016-05-10 16:30:05 +02:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								997db04648 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs  
							
							 
							
							
							
						 
						
							2016-05-10 14:40:19 +02:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c9eb6dfc1b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_user  
							
							 
							
							
							
						 
						
							2016-05-09 13:21:06 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								08dfa8eee2 
								
							
								 
							
						 
						
							
							
								
								Add and use get_domian_from_id  
							
							 
							
							
							
						 
						
							2016-05-09 10:36:03 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								1f0f5ffa1e 
								
							
								 
							
						 
						
							
							
								
								Add bulk fetch storage API  
							
							 
							
							
							
						 
						
							2016-05-05 10:03:15 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a438a6d2bc 
								
							
								 
							
						 
						
							
							
								
								Implement basic ignore user  
							
							 
							
							
							
						 
						
							2016-05-04 10:16:46 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								424a7f48f8 
								
							
								 
							
						 
						
							
							
								
								Run filter_events_for_client  
							
							 
							
							... 
							
							
							
							so we don't accidentally mail out events people shouldn't see 
							
						 
						
							2016-04-27 17:50:49 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c53f9d561e 
								
							
								 
							
						 
						
							
							
								
								Don't auto log failed auth checks  
							
							 
							
							
							
						 
						
							2016-04-13 11:11:46 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								9c99ab4572 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into dbkr/pushers_use_event_actions  
							
							 
							
							
							
						 
						
							2016-04-07 16:35:22 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								7e2c89a37f 
								
							
								 
							
						 
						
							
							
								
								Make pushers use the event_push_actions table instead of listening on an event stream & running the rules again. Sytest passes, but remaining to do:  
							
							 
							
							... 
							
							
							
							* Make badges work again
 * Remove old, unused code 
							
						 
						
							2016-04-06 15:42:15 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								1e05637e37 
								
							
								 
							
						 
						
							
							
								
								Let users see their own leave events  
							
							 
							
							... 
							
							
							
							... otherwise clients get confused.
Fixes https://matrix.org/jira/browse/SYN-662 ,
https://github.com/vector-im/vector-web/issues/368  
							
						 
						
							2016-04-06 15:36:19 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								bf14883a04 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #689  from matrix-org/erikj/member  
							
							 
							
							... 
							
							
							
							Do checks for memberships before creating events 
							
						 
						
							2016-04-04 11:56:40 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d76d89323c 
								
							
								 
							
						 
						
							
							
								
								Use computed prev event ids  
							
							 
							
							
							
						 
						
							2016-04-01 17:39:32 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								aa82cb38e9 
								
							
								 
							
						 
						
							
							
								
								Remove state hack from _create_new_client_event  
							
							 
							
							
							
						 
						
							2016-04-01 16:36:54 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								89e6839a48 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #686  from matrix-org/markjh/doc_strings  
							
							 
							
							... 
							
							
							
							Use google style doc strings. 
							
						 
						
							2016-04-01 16:20:09 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								2a37467fa1 
								
							
								 
							
						 
						
							
							
								
								Use google style doc strings.  
							
							 
							
							... 
							
							
							
							pycharm supports them so there is no need to use the other format.
Might as well convert the existing strings to reduce the risk of
people accidentally cargo culting the wrong doc string format. 
							
						 
						
							2016-04-01 16:12:07 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								dc4c1579d4 
								
							
								 
							
						 
						
							
							
								
								Remove outlier parameter from compute_event_context  
							
							 
							
							... 
							
							
							
							Use event.internal_metadata.is_outlier instead. 
							
						 
						
							2016-03-31 15:32:24 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2ab0bf4b97 
								
							
								 
							
						 
						
							
							
								
								Send history visibility on boundary changes  
							
							 
							
							
							
						 
						
							2016-03-04 16:54:32 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								389d558a3b 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #598  from Rugvip/invite-state  
							
							 
							
							... 
							
							
							
							config,handlers/_base: added homeserver config for what state is included in a room invite 
							
						 
						
							2016-03-04 09:58:52 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								44b084a75e 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #596  from Rugvip/create  
							
							 
							
							... 
							
							
							
							handlers/_base: don't allow room create event to be changed 
							
						 
						
							2016-03-04 09:43:20 +00:00  
						
					 
				
					
						
							
							
								 
								Patrik Oldsberg
							
						 
						
							 
							
							
							
								
							
								5fc59f009c 
								
							
								 
							
						 
						
							
							
								
								config,handlers/_base: added homeserver config for what state is included in a room invite  
							
							 
							
							... 
							
							
							
							Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com> 
							
						 
						
							2016-03-04 10:43:17 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								a85179aff3 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into rav/SYN-642  
							
							 
							
							
							
						 
						
							2016-03-03 19:05:54 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								b4022cc487 
								
							
								 
							
						 
						
							
							
								
								Pass whole requester to ratelimiting  
							
							 
							
							... 
							
							
							
							This will enable more detailed decisions 
							
						 
						
							2016-03-03 16:43:42 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								863d3f26b3 
								
							
								 
							
						 
						
							
							
								
								fix pyflakes quibble  
							
							 
							
							
							
						 
						
							2016-03-02 15:52:50 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								9ff940a0ef 
								
							
								 
							
						 
						
							
							
								
								Address review comments  
							
							 
							
							
							
						 
						
							2016-03-02 15:40:30 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								05ea111c47 
								
							
								 
							
						 
						
							
							
								
								Fix pyflakes warning  
							
							 
							
							
							
						 
						
							2016-03-01 17:45:24 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								8a1d3b86af 
								
							
								 
							
						 
						
							
							
								
								Handle rejections of invites from local users locally  
							
							 
							
							... 
							
							
							
							Slightly hacky fix to SYN-642, which avoids the federation codepath when trying
to reject invites from local users. 
							
						 
						
							2016-03-01 17:27:22 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								0f0b011440 
								
							
								 
							
						 
						
							
							
								
								Send the invier's member event in room invite state so the invitee has their display name and avatar.  
							
							 
							
							
							
						 
						
							2016-02-25 18:12:09 +00:00  
						
					 
				
					
						
							
							
								 
								Patrik Oldsberg
							
						 
						
							 
							
							
							
								
							
								210b7d8e00 
								
							
								 
							
						 
						
							
							
								
								handlers/_base: don't allow room create event to be changed  
							
							 
							
							... 
							
							
							
							Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com> 
							
						 
						
							2016-02-23 00:22:41 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								5be3944730 
								
							
								 
							
						 
						
							
							
								
								address review comments  
							
							 
							
							... 
							
							
							
							drop commented-out special casing for historyvisibility event
s/he/they/ for users 
							
						 
						
							2016-02-22 15:27:44 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								6c5b147a39 
								
							
								 
							
						 
						
							
							
								
								Interpret unknown visibilities the same as shared  
							
							 
							
							
							
						 
						
							2016-02-19 17:11:11 +00:00  
						
					 
				
					
						
							
							
								 
								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  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								f8d21e1431 
								
							
								 
							
						 
						
							
							
								
								Review comments  
							
							 
							
							
							
						 
						
							2016-02-18 11:02:14 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								a4e278bfe7 
								
							
								 
							
						 
						
							
							
								
								Respond to federated invite with non-empty context  
							
							 
							
							... 
							
							
							
							Currently, we magically perform an extra database hit to find the
inviter, and use this to guess where we should send the event. Instead,
fill in a valid context, so that other callers relying on the context
actually have one. 
							
						 
						
							2016-02-17 15:25:12 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								1bbb67c452 
								
							
								 
							
						 
						
							
							
								
								Use update_membership to kick guests  
							
							 
							
							
							
						 
						
							2016-02-15 16:40:22 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								e71095801f 
								
							
								 
							
						 
						
							
							
								
								Merge implementation of /join by alias or ID  
							
							 
							
							... 
							
							
							
							This code is kind of rough (passing the remote servers down a long
chain), but is a step towards improvement. 
							
						 
						
							2016-02-15 15:39:16 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								7b0d846407 
								
							
								 
							
						 
						
							
							
								
								Atomically persit push actions when we persist the event  
							
							 
							
							
							
						 
						
							2016-02-09 16:19:15 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								f28cc45183 
								
							
								 
							
						 
						
							
							
								
								Pass in current state to push action handler  
							
							 
							
							
							
						 
						
							2016-02-09 16:01:40 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2c1fbea531 
								
							
								 
							
						 
						
							
							
								
								Fix up logcontexts  
							
							 
							
							
							
						 
						
							2016-02-08 14:26:45 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								d83d004ccd 
								
							
								 
							
						 
						
							
							
								
								Fix flake8 warnings for new flake8  
							
							 
							
							
							
						 
						
							2016-02-02 17:18:50 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								da417aa56d 
								
							
								 
							
						 
						
							
							
								
								Allow non-guests to peek on rooms using /events  
							
							 
							
							
							
						 
						
							2016-01-20 15:34:07 +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
							
						 
						
							 
							
							
							
								
							
								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
							
						 
						
							 
							
							
							
								
							
								cc66a9a5e3 
								
							
								 
							
						 
						
							
							
								
								Allow filtering events for multiple users at once  
							
							 
							
							
							
						 
						
							2016-01-18 14:43:50 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								b5ce4f0427 
								
							
								 
							
						 
						
							
							
								
								Remove unused parameters  
							
							 
							
							
							
						 
						
							2016-01-15 13:54:03 +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
							
						 
						
							 
							
							
							
								
							
								eb03625626 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into store_event_actions  
							
							 
							
							
							
						 
						
							2016-01-05 18:39:50 +00:00