350331d466 
								
							
								 
							
						 
						
							
							
								
								_remote_join and co take a requester  
							
							
							
						 
						
							2018-03-13 17:50:39 +00:00  
				
					
						
							
							
								 
						
							
							
								1a69c6d590 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2987  from matrix-org/erikj/split_room_member_handler  
							
							... 
							
							
							
							Split RoomMemberHandler into base and master class 
							
						 
						
							2018-03-13 17:40:00 +00:00  
				
					
						
							
							
								 
						
							
							
								6dbebef141 
								
							
								 
							
						 
						
							
							
								
								Add missing param to docstrings  
							
							
							
						 
						
							2018-03-13 17:15:32 +00:00  
				
					
						
							
							
								 
						
							
							
								16adb11cc0 
								
							
								 
							
						 
						
							
							
								
								Correct import order  
							
							
							
						 
						
							2018-03-13 16:57:07 +00:00  
				
					
						
							
							
								 
						
							
							
								82f16faa78 
								
							
								 
							
						 
						
							
							
								
								Move user_*_room distributor stuff to master class  
							
							... 
							
							
							
							I added yields when calling user_left_room, but they shouldn't matter on
the master process as they always return None anyway. 
							
						 
						
							2018-03-13 16:38:15 +00:00  
				
					
						
							
							
								 
						
							
							
								b78717b87b 
								
							
								 
							
						 
						
							
							
								
								Split RoomMemberHandler into base and master class  
							
							... 
							
							
							
							The intention here is to split the class into the bits that can be done
on workers and the bits that have to be done on the master.
In future there will also be a class that can be run on the worker,
which will delegate work to the master when necessary. 
							
						 
						
							2018-03-13 16:37:41 +00:00  
				
					
						
							
							
								 
						
							
							
								5d8476d8ff 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2981  from matrix-org/erikj/factor_remote_leave  
							
							... 
							
							
							
							Factor out _remote_reject_invite in RoomMember 
							
						 
						
							2018-03-13 15:44:56 +00:00  
				
					
						
							
							
								 
						
							
							
								56e709857c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2979  from matrix-org/erikj/no_handlers  
							
							... 
							
							
							
							Don't build handlers on workers unnecessarily 
							
						 
						
							2018-03-13 13:46:38 +00:00  
				
					
						
							
							
								 
						
							
							
								bf8e97bd3c 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/factor_remote_leave  
							
							
							
						 
						
							2018-03-13 13:17:08 +00:00  
				
					
						
							
							
								 
						
							
							
								ea3442c15c 
								
							
								 
							
						 
						
							
							
								
								Add docstring  
							
							
							
						 
						
							2018-03-13 13:16:21 +00:00  
				
					
						
							
							
								 
						
							
							
								16469a4f15 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2980  from matrix-org/erikj/rm_priv  
							
							... 
							
							
							
							Make RoomMemberHandler functions private that can be 
							
						 
						
							2018-03-13 13:11:11 +00:00  
				
					
						
							
							
								 
						
							
							
								8b3573a8b2 
								
							
								 
							
						 
						
							
							
								
								Refactor get_or_register_3pid_guest  
							
							
							
						 
						
							2018-03-13 12:08:58 +00:00  
				
					
						
							
							
								 
						
							
							
								0f942f68c1 
								
							
								 
							
						 
						
							
							
								
								Factor out _remote_reject_invite in RoomMember  
							
							
							
						 
						
							2018-03-13 11:22:45 +00:00  
				
					
						
							
							
								 
						
							
							
								31becf4ac3 
								
							
								 
							
						 
						
							
							
								
								Make functions private that can be  
							
							
							
						 
						
							2018-03-13 11:15:16 +00:00  
				
					
						
							
							
								 
						
							
							
								265b993b8a 
								
							
								 
							
						 
						
							
							
								
								Split replication layer into two  
							
							
							
						 
						
							2018-03-13 10:55:47 +00:00  
				
					
						
							
							
								 
						
							
							
								d960d23830 
								
							
								 
							
						 
						
							
							
								
								Add missing yield during 3pid signature checks  
							
							
							
						 
						
							2018-03-02 11:03:18 +00:00  
				
					
						
							
							
								 
						
							
							
								529c026ac1 
								
							
								 
							
						 
						
							
							
								
								Move back to hs.is_mine  
							
							
							
						 
						
							2018-03-01 16:49:12 +00:00  
				
					
						
							
							
								 
						
							
							
								784f036306 
								
							
								 
							
						 
						
							
							
								
								Move RoomMemberHandler out of Handlers  
							
							
							
						 
						
							2018-03-01 14:36:50 +00:00  
				
					
						
							
							
								 
						
							
							
								3e1e69ccaf 
								
							
								 
							
						 
						
							
							
								
								Update copyright  
							
							
							
						 
						
							2018-02-06 16:40:38 +00:00  
				
					
						
							
							
								 
						
							
							
								3fa362502c 
								
							
								 
							
						 
						
							
							
								
								Update places where we create events  
							
							
							
						 
						
							2018-02-05 16:01:48 +00:00  
				
					
						
							
							
								 
						
							
							
								ef045dcd71 
								
							
								 
							
						 
						
							
							
								
								Copy dict in update_membership too  
							
							
							
						 
						
							2017-12-07 14:17:15 +00:00  
				
					
						
							
							
								 
						
							
							
								535cc49f27 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2466  from matrix-org/erikj/groups_merged  
							
							... 
							
							
							
							Initial Group Implementation 
							
						 
						
							2017-10-11 13:20:07 +01:00  
				
					
						
							
							
								 
						
							
							
								f878e6f8af 
								
							
								 
							
						 
						
							
							
								
								Spam checking: add the invitee to user_may_invite  
							
							
							
						 
						
							2017-10-05 14:02:28 +01:00  
				
					
						
							
							
								 
						
							
							
								1e375468de 
								
							
								 
							
						 
						
							
							
								
								pass room id too  
							
							
							
						 
						
							2017-10-03 17:13:14 +01:00  
				
					
						
							
							
								 
						
							
							
								c2c188b699 
								
							
								 
							
						 
						
							
							
								
								Federation was passing strings anyway  
							
							... 
							
							
							
							so pass string everywhere 
							
						 
						
							2017-10-03 15:46:19 +01:00  
				
					
						
							
							
								 
						
							
							
								c46a0d7eb4 
								
							
								 
							
						 
						
							
							
								
								this shouldn't be debug  
							
							
							
						 
						
							2017-10-03 15:20:14 +01:00  
				
					
						
							
							
								 
						
							
							
								bd769a81e1 
								
							
								 
							
						 
						
							
							
								
								better logging  
							
							
							
						 
						
							2017-10-03 15:16:40 +01:00  
				
					
						
							
							
								 
						
							
							
								41fd9989a2 
								
							
								 
							
						 
						
							
							
								
								Skip spam check for admin users  
							
							
							
						 
						
							2017-10-03 14:17:44 +01:00  
				
					
						
							
							
								 
						
							
							
								84716d267c 
								
							
								 
							
						 
						
							
							
								
								Allow spam checker to reject invites too  
							
							
							
						 
						
							2017-10-03 13:56:43 +01:00  
				
					
						
							
							
								 
						
							
							
								27955056e0 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into erikj/groups_merged  
							
							
							
						 
						
							2017-10-02 16:20:41 +01:00  
				
					
						
							
							
								 
						
							
							
								aa620d09a0 
								
							
								 
							
						 
						
							
							
								
								Add a config option to block all room invites ( #2457 )  
							
							... 
							
							
							
							- allows sysadmins the ability to lock down their servers so that people can't
send their users room invites. 
							
						 
						
							2017-09-19 16:08:14 +01:00  
				
					
						
							
							
								 
						
							
							
								bf81f3cf2c 
								
							
								 
							
						 
						
							
							
								
								Split out profile handler to fix tests  
							
							
							
						 
						
							2017-08-25 14:34:56 +01:00  
				
					
						
							
							
								 
						
							
							
								e5ae386ea4 
								
							
								 
							
						 
						
							
							
								
								Handle all cases of sending membership events  
							
							
							
						 
						
							2017-06-19 16:07:54 +01:00  
				
					
						
							
							
								 
						
							
							
								d7fe6b356c 
								
							
								 
							
						 
						
							
							
								
								Add shutdown room API  
							
							
							
						 
						
							2017-06-19 12:37:27 +01:00  
				
					
						
							
							
								 
						
							
							
								13f540ef1b 
								
							
								 
							
						 
						
							
							
								
								Speed up get_joined_hosts  
							
							
							
						 
						
							2017-05-16 16:05:22 +01:00  
				
					
						
							
							
								 
						
							
							
								3e5a62ecd8 
								
							
								 
							
						 
						
							
							
								
								Add more granular event send metrics  
							
							
							
						 
						
							2017-05-02 14:23:26 +01:00  
				
					
						
							
							
								 
						
							
							
								838810b76a 
								
							
								 
							
						 
						
							
							
								
								Broaden the conditions for locally_rejecting invites  
							
							... 
							
							
							
							The logic for marking invites as locally rejected was all well and good, but
didn't happen when the remote server returned a 500, or wasn't reachable, or
had no DNS, or whatever.
Just expand the except clause to catch everything.
Fixes https://github.com/matrix-org/synapse/issues/761 . 
							
						 
						
							2017-04-21 01:31:37 +01:00  
				
					
						
							
							
								 
						
							
							
								736b9a4784 
								
							
								 
							
						 
						
							
							
								
								Remove redundant function  
							
							... 
							
							
							
							inline `reject_remote_invite`, which only existed to make tracing the callflow
more difficult. 
							
						 
						
							2017-04-21 01:31:09 +01:00  
				
					
						
							
							
								 
						
							
							
								474c9aadbe 
								
							
								 
							
						 
						
							
							
								
								Allow forgetting rooms you're banned from  
							
							
							
						 
						
							2017-02-15 19:32:20 +00:00  
				
					
						
							
							
								 
						
							
							
								7b62d0bc70 
								
							
								 
							
						 
						
							
							
								
								Add missing None check  
							
							
							
						 
						
							2017-01-11 10:57:03 +00:00  
				
					
						
							
							
								 
						
							
							
								7d0981b312 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1787  from matrix-org/erikj/linearize_member  
							
							... 
							
							
							
							Linearize updates to membership via PUT /state/ 
							
						 
						
							2017-01-10 14:04:54 +00:00  
				
					
						
							
							
								 
						
							
							
								6823fe5241 
								
							
								 
							
						 
						
							
							
								
								Linearize updates to membership via PUT /state/  
							
							
							
						 
						
							2017-01-09 18:25:13 +00:00  
				
					
						
							
							
								 
						
							
							
								f7085ac84f 
								
							
								 
							
						 
						
							
							
								
								Name linearizer's for better logs  
							
							
							
						 
						
							2017-01-09 17:17:10 +00:00  
				
					
						
							
							
								 
						
							
							
								1ef6084b75 
								
							
								 
							
						 
						
							
							
								
								handlers/room_member: fix guest access check when joining rooms  
							
							... 
							
							
							
							Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com> 
							
						 
						
							2017-01-06 14:36:56 +00:00  
				
					
						
							
							
								 
						
							
							
								f2690c6423 
								
							
								 
							
						 
						
							
							
								
								Fix membership changes to be idempotent  
							
							
							
						 
						
							2016-09-02 19:23:22 +01:00  
				
					
						
							
							
								 
						
							
							
								c10cb581c6 
								
							
								 
							
						 
						
							
							
								
								Correctly handle the difference between prev and current state  
							
							
							
						 
						
							2016-08-31 14:26:22 +01:00  
				
					
						
							
							
								 
						
							
							
								a3dc1e9cbe 
								
							
								 
							
						 
						
							
							
								
								Replace context.current_state with context.current_state_ids  
							
							
							
						 
						
							2016-08-25 17:32:22 +01:00  
				
					
						
							
							
								 
						
							
							
								4b31426a02 
								
							
								 
							
						 
						
							
							
								
								Pass through user-supplied content in /join/$room_id  
							
							... 
							
							
							
							It was always intended to allow custom keys on the join event, but this has
at some point been lost. Restore it.
If the user specifies keys like "avatar_url" then they will be clobbered. 
							
						 
						
							2016-08-23 16:32:04 +01:00  
				
					
						
							
							
								 
						
							
							
								448ac6cf0d 
								
							
								 
							
						 
						
							
							
								
								Only process one local membership event per room at a time  
							
							
							
						 
						
							2016-08-12 09:32:19 +01:00  
				
					
						
							
							
								 
						
							
							
								eb359eced4 
								
							
								 
							
						 
						
							
							
								
								Add `create_requester` function  
							
							... 
							
							
							
							Wrap the `Requester` constructor with a function which provides sensible
defaults, and use it throughout 
							
						 
						
							2016-07-26 16:46:53 +01:00