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  
				
					
						
							
							
								 
						
							
							
								526bf8126f 
								
							
								 
							
						 
						
							
							
								
								Remove unused get_joined_rooms_for_user  
							
							
							
						 
						
							2016-05-17 10:20:51 +01:00  
				
					
						
							
							
								 
						
							
							
								80cb9becd8 
								
							
								 
							
						 
						
							
							
								
								Remove get_joined_rooms_for_user from RoomMemberHandler  
							
							
							
						 
						
							2016-05-16 20:06:55 +01:00  
				
					
						
							
							
								 
						
							
							
								821306120a 
								
							
								 
							
						 
						
							
							
								
								Replaces calls to fetch_room_distributions_into with get_joined_hosts_for_room  
							
							
							
						 
						
							2016-05-16 19:48:07 +01:00  
				
					
						
							
							
								 
						
							
							
								458a435114 
								
							
								 
							
						 
						
							
							
								
								Fix typo  
							
							
							
						 
						
							2016-05-11 10:35:33 +01:00  
				
					
						
							
							
								 
						
							
							
								30057b1e15 
								
							
								 
							
						 
						
							
							
								
								Move _create_new_client_event and handle_new_client_event out of base handler  
							
							
							
						 
						
							2016-05-11 09:09:20 +01:00  
				
					
						
							
							
								 
						
							
							
								aebd0c9717 
								
							
								 
							
						 
						
							
							
								
								fix typo  
							
							
							
						 
						
							2016-04-28 15:09:25 +01:00  
				
					
						
							
							
								 
						
							
							
								7e2f971c08 
								
							
								 
							
						 
						
							
							
								
								Remove some unused functions ( #711 )  
							
							... 
							
							
							
							* Remove some unused functions
* get_room_events_stream is only used in tests
* is_exclusive_room might actually be something we want 
							
						 
						
							2016-04-08 14:01:56 +01:00  
				
					
						
							
							
								 
						
							
							
								b9ee5650b0 
								
							
								 
							
						 
						
							
							
								
								Move all the wrapper functions for distributor.fire  
							
							... 
							
							
							
							Move the functions inside the distributor and import them
where needed. This reduces duplication and makes it possible
for flake8 to detect when the functions aren't used in a
given file. 
							
						 
						
							2016-04-08 11:01:38 +01:00  
				
					
						
							
							
								 
						
							
							
								a294b04bf0 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #700  from matrix-org/erikj/deduplicate_joins  
							
							... 
							
							
							
							Deduplicate membership changes 
							
						 
						
							2016-04-07 16:35:40 +01:00  
				
					
						
							
							
								 
						
							
							
								af03ecf352 
								
							
								 
							
						 
						
							
							
								
								Deduplicate joins  
							
							
							
						 
						
							2016-04-07 14:19:02 +01:00  
				
					
						
							
							
								 
						
							
							
								1ef0365670 
								
							
								 
							
						 
						
							
							
								
								Set profile information when joining rooms remotely  
							
							
							
						 
						
							2016-04-07 09:42:52 +01:00  
				
					
						
							
							
								 
						
							
							
								b29f98377d 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #691  from matrix-org/erikj/member  
							
							... 
							
							
							
							Fix stuck invites 
							
						 
						
							2016-04-05 12:44:39 +01:00  
				
					
						
							
							
								 
						
							
							
								df727f2126 
								
							
								 
							
						 
						
							
							
								
								Fix stuck invites  
							
							... 
							
							
							
							If rejecting a remote invite fails with an error response don't fail
the entire request; instead mark the invite as locally rejected.
This fixes the bug where users can get stuck invites which they can
neither accept nor reject. 
							
						 
						
							2016-04-05 11:13:24 +01:00  
				
					
						
							
							
								 
						
							
							
								7a77f8b6d5 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #690  from matrix-org/erikj/member  
							
							... 
							
							
							
							Store invites in a separate table. 
							
						 
						
							2016-04-05 09:12:27 +01:00  
				
					
						
							
							
								 
						
							
							
								0c53d750e7 
								
							
								 
							
						 
						
							
							
								
								Docs and indents  
							
							
							
						 
						
							2016-04-04 18:02:48 +01:00  
				
					
						
							
							
								 
						
							
							
								3d76b7cb2b 
								
							
								 
							
						 
						
							
							
								
								Store invites in a separate table.  
							
							
							
						 
						
							2016-04-04 16:30:15 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								d76d89323c 
								
							
								 
							
						 
						
							
							
								
								Use computed prev event ids  
							
							
							
						 
						
							2016-04-01 17:39:32 +01:00  
				
					
						
							
							
								 
						
							
							
								c906f30661 
								
							
								 
							
						 
						
							
							
								
								Do checks for memberships before creating events  
							
							
							
						 
						
							2016-04-01 16:17:32 +01:00  
				
					
						
							
							
								 
						
							
							
								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