Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								c4cdafa81f 
								
							
								 
							
						 
						
							
							
								
								Destructure account data tuple before use  
							
							 
							
							
							
						 
						
							2019-01-25 11:24:28 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								516456b763 
								
							
								 
							
						 
						
							
							
								
								Remove unnecessary null check  
							
							 
							
							
							
						 
						
							2019-01-25 11:22:14 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								6f3fda79ce 
								
							
								 
							
						 
						
							
							
								
								Move room_tag declaration to be closer to its use  
							
							 
							
							
							
						 
						
							2019-01-25 11:21:25 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								0862d35b8e 
								
							
								 
							
						 
						
							
							
								
								Move tag and direct state copying into separate function  
							
							 
							
							
							
						 
						
							2019-01-25 11:09:34 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								766a172b99 
								
							
								 
							
						 
						
							
							
								
								lint  
							
							 
							
							
							
						 
						
							2019-01-22 13:51:40 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								c4875d8c76 
								
							
								 
							
						 
						
							
							
								
								Prevent duplicate room IDs in m.direct  
							
							 
							
							
							
						 
						
							2019-01-22 12:13:46 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								8086a5c05e 
								
							
								 
							
						 
						
							
							
								
								Fix comments  
							
							 
							
							
							
						 
						
							2019-01-22 11:16:23 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								8c85f0833d 
								
							
								 
							
						 
						
							
							
								
								tags, m.direct copying over correctly  
							
							 
							
							
							
						 
						
							2019-01-22 11:00:04 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								25d64a846a 
								
							
								 
							
						 
						
							
							
								
								Fix typos  
							
							 
							
							
							
						 
						
							2019-01-22 11:00:04 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								a219ce8726 
								
									
								
							
								 
							
						 
						
							
							
								
								Use directory server for room joins ( #3899 )  
							
							 
							
							... 
							
							
							
							When we do a join, always try the server we used for the alias lookup first.
Fixes  #2418  
							
						 
						
							2018-09-18 18:27:37 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4d664278af 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_state_handler  
							
							 
							
							
							
						 
						
							2018-08-20 14:49:43 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e21c368b8b 
								
							
								 
							
						 
						
							
							
								
								Revert spurious change  
							
							 
							
							
							
						 
						
							2018-08-20 13:54:51 +01:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								b37c472419 
								
									
								
							
								 
							
						 
						
							
							
								
								Rename async to async_helpers because `async` is a keyword on Python 3.7 ( #3678 )  
							
							 
							
							
							
						 
						
							2018-08-10 23:50:21 +10:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ce6db0e547 
								
							
								 
							
						 
						
							
							
								
								Choose state algorithm based on room version  
							
							 
							
							
							
						 
						
							2018-08-09 14:58:47 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								87951d3891 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into t3chguy/default_inviter_display_name_3pid  
							
							 
							
							
							
						 
						
							2018-07-24 17:17:46 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e42510ba63 
								
							
								 
							
						 
						
							
							
								
								Use new getters  
							
							 
							
							
							
						 
						
							2018-07-23 13:17:22 +01:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
							
								
							
								49af402019 
								
							
								 
							
						 
						
							
							
								
								run isort  
							
							 
							
							
							
						 
						
							2018-07-09 16:09:20 +10:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								94700e55fa 
								
									
								
							
								 
							
						 
						
							
							
								
								if inviter_display_name == ""||None then default to inviter MXID  
							
							 
							
							... 
							
							
							
							to prevent email invite from "None" 
							
						 
						
							2018-06-13 10:31:01 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								757ed27258 
								
							
								 
							
						 
						
							
							
								
								Let users leave the server notice room after joining  
							
							 
							
							... 
							
							
							
							They still can't reject invites, but we let them leave it. 
							
						 
						
							2018-05-25 11:07:21 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								08bfc48abf 
								
							
								 
							
						 
						
							
							
								
								custom error code for not leaving server notices room  
							
							 
							
							
							
						 
						
							2018-05-22 17:27:27 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								26305788fe 
								
							
								 
							
						 
						
							
							
								
								Make sure we reject attempts to invite the notices user  
							
							 
							
							
							
						 
						
							2018-05-18 11:18:39 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								88d3405332 
								
							
								 
							
						 
						
							
							
								
								fix missing yield for server_notices_room  
							
							 
							
							
							
						 
						
							2018-05-17 18:33:45 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								fed62e21ad 
								
							
								 
							
						 
						
							
							
								
								Infrastructure for a server notices room  
							
							 
							
							... 
							
							
							
							Server Notices use a special room which the user can't dismiss. They are
created on demand when some other bit of the code calls send_notice.
(This doesn't actually do much yet becuse we don't call send_notice anywhere) 
							
						 
						
							2018-05-17 17:58:25 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								639480e14a 
								
							
								 
							
						 
						
							
							
								
								Avoid creating events with huge numbers of prev_events  
							
							 
							
							... 
							
							
							
							In most cases, we limit the number of prev_events for a given event to 10
events. This fixes a particular code path which created events with huge
numbers of prev_events. 
							
						 
						
							2018-04-16 18:41:37 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								f3ef60662f 
								
							
								 
							
						 
						
							
							
								
								Return a 404 rather than a 500 on rejoining empty rooms  
							
							 
							
							... 
							
							
							
							Filter ourselves out of the server list before checking for an empty remote
host list, to fix 500 error
Fixes  #2141  
							
						 
						
							2018-04-09 12:56:22 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								350331d466 
								
							
								 
							
						 
						
							
							
								
								_remote_join and co take a requester  
							
							 
							
							
							
						 
						
							2018-03-13 17:50:39 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6dbebef141 
								
							
								 
							
						 
						
							
							
								
								Add missing param to docstrings  
							
							 
							
							
							
						 
						
							2018-03-13 17:15:32 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								16adb11cc0 
								
							
								 
							
						 
						
							
							
								
								Correct import order  
							
							 
							
							
							
						 
						
							2018-03-13 16:57:07 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								bf8e97bd3c 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/factor_remote_leave  
							
							 
							
							
							
						 
						
							2018-03-13 13:17:08 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ea3442c15c 
								
							
								 
							
						 
						
							
							
								
								Add docstring  
							
							 
							
							
							
						 
						
							2018-03-13 13:16:21 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								8b3573a8b2 
								
							
								 
							
						 
						
							
							
								
								Refactor get_or_register_3pid_guest  
							
							 
							
							
							
						 
						
							2018-03-13 12:08:58 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								0f942f68c1 
								
							
								 
							
						 
						
							
							
								
								Factor out _remote_reject_invite in RoomMember  
							
							 
							
							
							
						 
						
							2018-03-13 11:22:45 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								31becf4ac3 
								
							
								 
							
						 
						
							
							
								
								Make functions private that can be  
							
							 
							
							
							
						 
						
							2018-03-13 11:15:16 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								265b993b8a 
								
							
								 
							
						 
						
							
							
								
								Split replication layer into two  
							
							 
							
							
							
						 
						
							2018-03-13 10:55:47 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d960d23830 
								
							
								 
							
						 
						
							
							
								
								Add missing yield during 3pid signature checks  
							
							 
							
							
							
						 
						
							2018-03-02 11:03:18 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								529c026ac1 
								
							
								 
							
						 
						
							
							
								
								Move back to hs.is_mine  
							
							 
							
							
							
						 
						
							2018-03-01 16:49:12 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								784f036306 
								
							
								 
							
						 
						
							
							
								
								Move RoomMemberHandler out of Handlers  
							
							 
							
							
							
						 
						
							2018-03-01 14:36:50 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3e1e69ccaf 
								
							
								 
							
						 
						
							
							
								
								Update copyright  
							
							 
							
							
							
						 
						
							2018-02-06 16:40:38 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3fa362502c 
								
							
								 
							
						 
						
							
							
								
								Update places where we create events  
							
							 
							
							
							
						 
						
							2018-02-05 16:01:48 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ef045dcd71 
								
							
								 
							
						 
						
							
							
								
								Copy dict in update_membership too  
							
							 
							
							
							
						 
						
							2017-12-07 14:17:15 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								535cc49f27 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2466  from matrix-org/erikj/groups_merged  
							
							 
							
							... 
							
							
							
							Initial Group Implementation 
							
						 
						
							2017-10-11 13:20:07 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								f878e6f8af 
								
							
								 
							
						 
						
							
							
								
								Spam checking: add the invitee to user_may_invite  
							
							 
							
							
							
						 
						
							2017-10-05 14:02:28 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								1e375468de 
								
							
								 
							
						 
						
							
							
								
								pass room id too  
							
							 
							
							
							
						 
						
							2017-10-03 17:13:14 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								c2c188b699 
								
							
								 
							
						 
						
							
							
								
								Federation was passing strings anyway  
							
							 
							
							... 
							
							
							
							so pass string everywhere 
							
						 
						
							2017-10-03 15:46:19 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								c46a0d7eb4 
								
							
								 
							
						 
						
							
							
								
								this shouldn't be debug  
							
							 
							
							
							
						 
						
							2017-10-03 15:20:14 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								bd769a81e1 
								
							
								 
							
						 
						
							
							
								
								better logging  
							
							 
							
							
							
						 
						
							2017-10-03 15:16:40 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								41fd9989a2 
								
							
								 
							
						 
						
							
							
								
								Skip spam check for admin users  
							
							 
							
							
							
						 
						
							2017-10-03 14:17:44 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								84716d267c 
								
							
								 
							
						 
						
							
							
								
								Allow spam checker to reject invites too  
							
							 
							
							
							
						 
						
							2017-10-03 13:56:43 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								27955056e0 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into erikj/groups_merged  
							
							 
							
							
							
						 
						
							2017-10-02 16:20:41 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								bf81f3cf2c 
								
							
								 
							
						 
						
							
							
								
								Split out profile handler to fix tests  
							
							 
							
							
							
						 
						
							2017-08-25 14:34:56 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e5ae386ea4 
								
							
								 
							
						 
						
							
							
								
								Handle all cases of sending membership events  
							
							 
							
							
							
						 
						
							2017-06-19 16:07:54 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d7fe6b356c 
								
							
								 
							
						 
						
							
							
								
								Add shutdown room API  
							
							 
							
							
							
						 
						
							2017-06-19 12:37:27 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								13f540ef1b 
								
							
								 
							
						 
						
							
							
								
								Speed up get_joined_hosts  
							
							 
							
							
							
						 
						
							2017-05-16 16:05:22 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3e5a62ecd8 
								
							
								 
							
						 
						
							
							
								
								Add more granular event send metrics  
							
							 
							
							
							
						 
						
							2017-05-02 14:23:26 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								474c9aadbe 
								
							
								 
							
						 
						
							
							
								
								Allow forgetting rooms you're banned from  
							
							 
							
							
							
						 
						
							2017-02-15 19:32:20 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								7b62d0bc70 
								
							
								 
							
						 
						
							
							
								
								Add missing None check  
							
							 
							
							
							
						 
						
							2017-01-11 10:57:03 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6823fe5241 
								
							
								 
							
						 
						
							
							
								
								Linearize updates to membership via PUT /state/  
							
							 
							
							
							
						 
						
							2017-01-09 18:25:13 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								f7085ac84f 
								
							
								 
							
						 
						
							
							
								
								Name linearizer's for better logs  
							
							 
							
							
							
						 
						
							2017-01-09 17:17:10 +00:00  
						
					 
				
					
						
							
							
								 
								Patrik Oldsberg
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								f2690c6423 
								
							
								 
							
						 
						
							
							
								
								Fix membership changes to be idempotent  
							
							 
							
							
							
						 
						
							2016-09-02 19:23:22 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c10cb581c6 
								
							
								 
							
						 
						
							
							
								
								Correctly handle the difference between prev and current state  
							
							 
							
							
							
						 
						
							2016-08-31 14:26:22 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a3dc1e9cbe 
								
							
								 
							
						 
						
							
							
								
								Replace context.current_state with context.current_state_ids  
							
							 
							
							
							
						 
						
							2016-08-25 17:32:22 +01:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								448ac6cf0d 
								
							
								 
							
						 
						
							
							
								
								Only process one local membership event per room at a time  
							
							 
							
							
							
						 
						
							2016-08-12 09:32:19 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								526bf8126f 
								
							
								 
							
						 
						
							
							
								
								Remove unused get_joined_rooms_for_user  
							
							 
							
							
							
						 
						
							2016-05-17 10:20:51 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								80cb9becd8 
								
							
								 
							
						 
						
							
							
								
								Remove get_joined_rooms_for_user from RoomMemberHandler  
							
							 
							
							
							
						 
						
							2016-05-16 20:06:55 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								821306120a 
								
							
								 
							
						 
						
							
							
								
								Replaces calls to fetch_room_distributions_into with get_joined_hosts_for_room  
							
							 
							
							
							
						 
						
							2016-05-16 19:48:07 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								458a435114 
								
							
								 
							
						 
						
							
							
								
								Fix typo  
							
							 
							
							
							
						 
						
							2016-05-11 10:35:33 +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
							
						 
						
							 
							
							
							
								
							
								aebd0c9717 
								
							
								 
							
						 
						
							
							
								
								fix typo  
							
							 
							
							
							
						 
						
							2016-04-28 15:09:25 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a294b04bf0 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #700  from matrix-org/erikj/deduplicate_joins  
							
							 
							
							... 
							
							
							
							Deduplicate membership changes 
							
						 
						
							2016-04-07 16:35:40 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								af03ecf352 
								
							
								 
							
						 
						
							
							
								
								Deduplicate joins  
							
							 
							
							
							
						 
						
							2016-04-07 14:19:02 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								1ef0365670 
								
							
								 
							
						 
						
							
							
								
								Set profile information when joining rooms remotely  
							
							 
							
							
							
						 
						
							2016-04-07 09:42:52 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b29f98377d 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #691  from matrix-org/erikj/member  
							
							 
							
							... 
							
							
							
							Fix stuck invites 
							
						 
						
							2016-04-05 12:44:39 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								7a77f8b6d5 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #690  from matrix-org/erikj/member  
							
							 
							
							... 
							
							
							
							Store invites in a separate table. 
							
						 
						
							2016-04-05 09:12:27 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								0c53d750e7 
								
							
								 
							
						 
						
							
							
								
								Docs and indents  
							
							 
							
							
							
						 
						
							2016-04-04 18:02:48 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3d76b7cb2b 
								
							
								 
							
						 
						
							
							
								
								Store invites in a separate table.  
							
							 
							
							
							
						 
						
							2016-04-04 16:30:15 +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
							
						 
						
							 
							
							
							
								
							
								c906f30661 
								
							
								 
							
						 
						
							
							
								
								Do checks for memberships before creating events  
							
							 
							
							
							
						 
						
							2016-04-01 16:17:32 +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  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d35780eda0 
								
							
								 
							
						 
						
							
							
								
								Split out RoomMemberHandler  
							
							 
							
							
							
						 
						
							2016-03-31 13:08:45 +01:00