Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								b36095ae5c 
								
							
								 
							
						 
						
							
							
								
								Set the PL for aliases events to 0.  
							
							 
							
							
							
						 
						
							2020-01-29 11:52:52 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								ee42a5513e 
								
							
								 
							
						 
						
							
							
								
								Factor out a `copy_power_levels_contents` method  
							
							 
							
							... 
							
							
							
							I'm going to need another copy (hah!) of this. 
							
						 
						
							2020-01-29 11:52:52 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								8df862e45d 
								
									
								
							
								 
							
						 
						
							
							
								
								Add `rooms.room_version` column ( #6729 )  
							
							 
							
							... 
							
							
							
							This is so that we don't have to rely on pulling it out from `current_state_events` table. 
							
						 
						
							2020-01-27 14:30:57 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								d386f2f339 
								
									
								
							
								 
							
						 
						
							
							
								
								Add StateMap type alias ( #6715 )  
							
							 
							
							
							
						 
						
							2020-01-16 13:31:22 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								ba897a7590 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix some test failures when frozen_dicts are enabled ( #6642 )  
							
							 
							
							... 
							
							
							
							Fixes  #4026  
							
						 
						
							2020-01-06 15:22:46 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								01c3c6c929 
								
							
								 
							
						 
						
							
							
								
								Fix power levels being incorrectly set in old and new rooms after a room upgrade ( #6633 )  
							
							 
							
							... 
							
							
							
							Modify a copy of an upgraded room's PL before sending to the new room 
							
						 
						
							2020-01-06 09:53:07 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								fa780e9721 
								
									
								
							
								 
							
						 
						
							
							
								
								Change EventContext to use the Storage class ( #6564 )  
							
							 
							
							
							
						 
						
							2019-12-20 10:32:02 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								6e8f8e14f2 
								
							
								 
							
						 
						
							
							
								
								Merge release-v1.7.1 into develop  
							
							 
							
							
							
						 
						
							2019-12-18 09:51:51 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								02553901ce 
								
									
								
							
								 
							
						 
						
							
							
								
								Remove unused `get_pagination_rows` methods. ( #6557 )  
							
							 
							
							... 
							
							
							
							Remove unused get_pagination_rows methods 
							
						 
						
							2019-12-17 11:44:32 +00:00  
						
					 
				
					
						
							
							
								 
								Brendan Abolivier
							
						 
						
							 
							
							
								
								
							
							
								
							
								a820069549 
								
									
								
							
								 
							
						 
						
							
							
								
								Incorporate review  
							
							 
							
							
							
						 
						
							2019-12-16 16:00:18 +00:00  
						
					 
				
					
						
							
							
								 
								Brendan Abolivier
							
						 
						
							 
							
							
								
								
							
							
								
							
								487f1bb49d 
								
									
								
							
								 
							
						 
						
							
							
								
								Use the filtered version of an event when responding to /context requests for that event  
							
							 
							
							... 
							
							
							
							Sometimes the filtering function can return a pruned version of an event (on top of either the event itself or an empty list), if it thinks the user should be able to see that there's an event there but not the content of that event. Therefore, the previous logic of 'if filtered is empty then we can use the event we retrieved from the database' is flawed, and we should use the event returned by the filtering function. 
							
						 
						
							2019-12-16 12:14:12 +00:00  
						
					 
				
					
						
							
							
								 
								Brendan Abolivier
							
						 
						
							 
							
							
								
								
							
							
								
							
								9dc84b7989 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into babolivier/context_filters  
							
							 
							
							
							
						 
						
							2019-12-04 14:23:44 +00:00  
						
					 
				
					
						
							
							
								 
								Brendan Abolivier
							
						 
						
							 
							
							
								
								
							
							
								
							
								08a436ecb2 
								
									
								
							
								 
							
						 
						
							
							
								
								Incorporate review  
							
							 
							
							
							
						 
						
							2019-12-04 14:18:46 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
								
								
							
							
								
							
								72078e4be5 
								
									
								
							
								 
							
						 
						
							
							
								
								Transfer power level state events on room upgrade ( #6237 )  
							
							 
							
							
							
						 
						
							2019-12-02 15:11:32 +00:00  
						
					 
				
					
						
							
							
								 
								Brendan Abolivier
							
						 
						
							 
							
							
								
								
							
							
								
							
								eda14737cf 
								
									
								
							
								 
							
						 
						
							
							
								
								Also filter state events  
							
							 
							
							
							
						 
						
							2019-11-06 18:14:03 +00:00  
						
					 
				
					
						
							
							
								 
								Brendan Abolivier
							
						 
						
							 
							
							
								
								
							
							
								
							
								cb2cbe4d26 
								
									
								
							
								 
							
						 
						
							
							
								
								Only filter if a filter was provided  
							
							 
							
							
							
						 
						
							2019-11-05 15:28:36 +00:00  
						
					 
				
					
						
							
							
								 
								Brendan Abolivier
							
						 
						
							 
							
							
								
								
							
							
								
							
								f141af4c79 
								
									
								
							
								 
							
						 
						
							
							
								
								Update copyright  
							
							 
							
							
							
						 
						
							2019-11-05 14:52:38 +00:00  
						
					 
				
					
						
							
							
								 
								Brendan Abolivier
							
						 
						
							 
							
							
								
								
							
							
								
							
								1dffa78701 
								
									
								
							
								 
							
						 
						
							
							
								
								Filter events_before and events_after in /context requests  
							
							 
							
							... 
							
							
							
							While the current version of the spec doesn't say much about how this endpoint uses filters (see https://github.com/matrix-org/matrix-doc/issues/2338 ), the current implementation is that some fields of an EventFilter apply (the ones that are used when running the SQL query) and others don't (the ones that are used by the filter itself) because we don't call event_filter.filter(...). This seems counter-intuitive and probably not what we want so this commit fixes it. 
							
						 
						
							2019-11-05 12:21:59 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
								
								
							
							
								
							
								ace947e8da 
								
									
								
							
								 
							
						 
						
							
							
								
								Depublish a room from the public rooms list when it is upgraded ( #6232 )  
							
							 
							
							
							
						 
						
							2019-11-01 10:28:09 +00:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								020add5099 
								
									
								
							
								 
							
						 
						
							
							
								
								Update black to 19.10b0 ( #6304 )  
							
							 
							
							... 
							
							
							
							* update version of black and also fix the mypy config being overridden 
							
						 
						
							2019-11-01 02:43:24 +11:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								dfe0cd71b6 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6294  from matrix-org/erikj/add_state_storage  
							
							 
							
							... 
							
							
							
							Add StateGroupStorage interface 
							
						 
						
							2019-10-31 16:17:53 +01:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
								
								
							
							
								
							
								54fef094b3 
								
									
								
							
								 
							
						 
						
							
							
								
								Remove usage of deprecated logger.warn method from codebase ( #6271 )  
							
							 
							
							... 
							
							
							
							Replace every instance of `logger.warn` with `logger.warning` as the former is deprecated. 
							
						 
						
							2019-10-31 10:23:24 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								69f0054ce6 
								
							
								 
							
						 
						
							
							
								
								Port to use state storage  
							
							 
							
							
							
						 
						
							2019-10-30 14:46:54 +00:00  
						
					 
				
					
						
							
							
								 
								werner291
							
						 
						
							 
							
							
							
								
							
								b5b03b7079 
								
							
								 
							
						 
						
							
							
								
								Add domain validation when creating room with list of invitees ( #6121 )  
							
							 
							
							
							
						 
						
							2019-10-10 13:05:48 +01:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
								
								
							
							
								
							
								9fc71dc5ee 
								
									
								
							
								 
							
						 
						
							
							
								
								Use the v2 Identity Service API for lookups (MSC2134 + MSC2140) ( #5976 )  
							
							 
							
							... 
							
							
							
							This is a redo of https://github.com/matrix-org/synapse/pull/5897  but with `id_access_token` accepted.
Implements [MSC2134](https://github.com/matrix-org/matrix-doc/pull/2134 ) plus Identity Service v2 authentication ala [MSC2140](https://github.com/matrix-org/matrix-doc/pull/2140 ).
Identity lookup-related functions were also moved from `RoomMemberHandler` to `IdentityHandler`. 
							
						 
						
							2019-09-11 16:02:42 +01:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
								
								
							
							
								
							
								2a44782666 
								
									
								
							
								 
							
						 
						
							
							
								
								Remove double return statements ( #5962 )  
							
							 
							
							... 
							
							
							
							Remove all the "double return" statements which were a result of us removing all the instances of
```
defer.returnValue(...)
return
```
statements when we switched to python3 fully. 
							
						 
						
							2019-09-03 11:42:45 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								baee288fb4 
								
							
								 
							
						 
						
							
							
								
								Don't create broken room when power_level_content_override.users does not contain creator_id. ( #5633 )  
							
							 
							
							
							
						 
						
							2019-08-15 09:45:57 +01:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								4806651744 
								
									
								
							
								 
							
						 
						
							
							
								
								Replace returnValue with return ( #5736 )  
							
							 
							
							
							
						 
						
							2019-07-23 23:00:55 +10:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
								
								
							
							
								
							
								ef8c62758c 
								
									
								
							
								 
							
						 
						
							
							
								
								Prevent multiple upgrades on the same room at once ( #5051 )  
							
							 
							
							... 
							
							
							
							Closes  #4583 
Does slightly less than #5045 , which prevented a room from being upgraded multiple times, one after another. This PR still allows that, but just prevents two from happening at the same time.
Mostly just to mitigate the fact that servers are slow and it can take a moment for the room upgrade to actually complete. We don't want people sending another request to upgrade the room when really they just thought the first didn't go through. 
							
						 
						
							2019-06-25 14:19:21 +01:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								32e7c9e7f2 
								
									
								
							
								 
							
						 
						
							
							
								
								Run Black. ( #5482 )  
							
							 
							
							
							
						 
						
							2019-06-20 19:32:02 +10:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								187d2837a9 
								
							
								 
							
						 
						
							
							
								
								Add third party rules hook into create room  
							
							 
							
							
							
						 
						
							2019-06-17 16:41:19 +01:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
								
								
							
							
								
							
								6368150a74 
								
									
								
							
								 
							
						 
						
							
							
								
								Add config option for setting homeserver's default room version ( #5223 )  
							
							 
							
							... 
							
							
							
							Replaces DEFAULT_ROOM_VERSION constant with a method that first checks the config, then returns a hardcoded value if the option is not present.
That hardcoded value is now located in the server.py config file. 
							
						 
						
							2019-05-23 15:00:20 +01:00  
						
					 
				
					
						
							
							
								 
								Brendan Abolivier
							
						 
						
							 
							
							
							
								
							
								84196cb231 
								
							
								 
							
						 
						
							
							
								
								Add some limitations to alias creation  
							
							 
							
							
							
						 
						
							2019-05-02 11:05:11 +01:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
								
								
							
							
								
							
								66e78700a2 
								
									
								
							
								 
							
						 
						
							
							
								
								Transfer related groups on room upgrade ( #4990 )  
							
							 
							
							... 
							
							
							
							Transfers the m.room.related_groups state event on room upgrade. 
							
						 
						
							2019-04-02 17:15:24 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								54a87a7b08 
								
									
								
							
								 
							
						 
						
							
							
								
								Collect room-version variations into one place ( #4969 )  
							
							 
							
							... 
							
							
							
							Collect all the things that make room-versions different to one another into
one place, so that it's easier to define new room versions. 
							
						 
						
							2019-04-01 10:24:38 +01:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								34ac75ce2c 
								
							
								 
							
						 
						
							
							
								
								lint  
							
							 
							
							
							
						 
						
							2019-02-18 18:23:37 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								f8b9ca53ce 
								
							
								 
							
						 
						
							
							
								
								Move member event processing and changelog fix  
							
							 
							
							
							
						 
						
							2019-02-18 17:28:52 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								915421065b 
								
							
								 
							
						 
						
							
							
								
								Membership events are done later  
							
							 
							
							
							
						 
						
							2019-02-18 14:02:09 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								9caab0c364 
								
							
								 
							
						 
						
							
							
								
								Transfer bans on room upgrade  
							
							 
							
							
							
						 
						
							2019-02-18 13:52:51 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								a126f86eec 
								
							
								 
							
						 
						
							
							
								
								Transfer Server ACLs on room upgrade  
							
							 
							
							
							
						 
						
							2019-02-11 11:30:37 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								3ed3cb4339 
								
							
								 
							
						 
						
							
							
								
								New function for getting room's create event  
							
							 
							
							
							
						 
						
							2019-01-31 18:21:39 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								fb50934b8f 
								
							
								 
							
						 
						
							
							
								
								lint  
							
							 
							
							
							
						 
						
							2019-01-31 11:34:45 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								d621c5562e 
								
							
								 
							
						 
						
							
							
								
								Copy over non-federatable trait on room upgrade  
							
							 
							
							
							
						 
						
							2019-01-30 16:33:51 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								f1a04462eb 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4482  from matrix-org/erikj/event_auth_room_version  
							
							 
							
							... 
							
							
							
							Pass through room version to event auth 
							
						 
						
							2019-01-28 20:09:38 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ae2a957dba 
								
							
								 
							
						 
						
							
							
								
								Pass through room version to event auth  
							
							 
							
							
							
						 
						
							2019-01-25 18:31:41 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								48951f437f 
								
							
								 
							
						 
						
							
							
								
								Join logic covers both room creator and arbitrary users  
							
							 
							
							
							
						 
						
							2019-01-22 11:00:04 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								8c85f0833d 
								
							
								 
							
						 
						
							
							
								
								tags, m.direct copying over correctly  
							
							 
							
							
							
						 
						
							2019-01-22 11:00:04 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								ea8903fcc9 
								
							
								 
							
						 
						
							
							
								
								Migrating dm and room tags work for migrator  
							
							 
							
							
							
						 
						
							2019-01-22 11:00:04 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								887ca93a1b 
								
							
								 
							
						 
						
							
							
								
								Prevent crash on user who doesn't have any direct rooms  
							
							 
							
							
							
						 
						
							2019-01-22 11:00:04 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								4ff6d22245 
								
							
								 
							
						 
						
							
							
								
								Preserve DM status of a room on upgrade  
							
							 
							
							... 
							
							
							
							Signed-off-by: Andrew Morgan <andrew@amorgan.xyz> 
							
						 
						
							2019-01-22 11:00:04 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								75942af1db 
								
							
								 
							
						 
						
							
							
								
								Fix typo  
							
							 
							
							
							
						 
						
							2019-01-22 11:00:04 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								702c4b750c 
								
							
								 
							
						 
						
							
							
								
								Migrate encryption state on room upgrade ( #4411 )  
							
							 
							
							... 
							
							
							
							* Migrate encryption state on room upgrade
Signed-off-by: Andrew Morgan <andrew@amorgan.xyz>
* Add changelog file 
							
						 
						
							2019-01-21 20:42:58 +11:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
								
								
							
							
								
							
								d2f7c4e6b1 
								
									
								
							
								 
							
						 
						
							
							
								
								create support user ( #4141 )  
							
							 
							
							... 
							
							
							
							Allow for the creation of a support user.
A support user can access the server, join rooms, interact with other users, but does not appear in the user directory nor does it contribute to monthly active user limits. 
							
						 
						
							2018-12-14 18:20:59 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								1729ba1650 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4101  from matrix-org/rav/aliases_for_upgrades  
							
							 
							
							... 
							
							
							
							Attempt to move room aliases on room upgrades 
							
						 
						
							2018-10-31 17:52:18 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								0f8591a5a8 
								
							
								 
							
						 
						
							
							
								
								Avoid else clause on exception for clarity  
							
							 
							
							
							
						 
						
							2018-10-31 15:43:57 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								94c7fadc98 
								
							
								 
							
						 
						
							
							
								
								Attempt to move room aliases on room upgrades  
							
							 
							
							
							
						 
						
							2018-10-31 15:43:57 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								9b827c40ca 
								
									
								
							
								 
							
						 
						
							
							
								
								Log some bits about event creation ( #4121 )  
							
							 
							
							... 
							
							
							
							I found these helpful in debugging my room upgrade tests. 
							
						 
						
							2018-10-31 15:42:23 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								7fbfea062e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4100  from matrix-org/rav/room_upgrade_avatar  
							
							 
							
							... 
							
							
							
							Remember to copy the avatar on room upgrades 
							
						 
						
							2018-10-29 12:49:21 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								db24d7f15e 
								
							
								 
							
						 
						
							
							
								
								Better handling of odd PLs during room upgrades  
							
							 
							
							... 
							
							
							
							Fixes handling of rooms where we have permission to send the tombstone, but not
other state. We need to (a) fail more gracefully when we can't send the PLs in
the old room, and (b) not set the PLs in the new room until we are done with
the other stuff. 
							
						 
						
							2018-10-27 00:54:26 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								5caf79b312 
								
							
								 
							
						 
						
							
							
								
								Remember to copy the avatar on room upgrades  
							
							 
							
							
							
						 
						
							2018-10-26 23:56:40 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								54bbe71867 
								
							
								 
							
						 
						
							
							
								
								optimise state copying  
							
							 
							
							
							
						 
						
							2018-10-26 22:51:34 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								193cadc988 
								
							
								 
							
						 
						
							
							
								
								Address review comments  
							
							 
							
							... 
							
							
							
							Improve comments, get old room state from the context we already have 
							
						 
						
							2018-10-26 17:10:30 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								e6babc27d5 
								
							
								 
							
						 
						
							
							
								
								restrict PLs in old room  
							
							 
							
							
							
						 
						
							2018-10-25 19:18:25 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								3a263bf3ae 
								
							
								 
							
						 
						
							
							
								
								copy state  
							
							 
							
							
							
						 
						
							2018-10-25 19:18:25 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								1b9f253e20 
								
							
								 
							
						 
						
							
							
								
								preserve PLs  
							
							 
							
							
							
						 
						
							2018-10-25 19:10:24 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								4cda300058 
								
							
								 
							
						 
						
							
							
								
								preserve room visibility  
							
							 
							
							
							
						 
						
							2018-10-25 19:10:24 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								0f7d1c9906 
								
							
								 
							
						 
						
							
							
								
								Basic initial support for room upgrades  
							
							 
							
							... 
							
							
							
							Currently just creates a new, empty, room, and sends a tombstone in the old
room. 
							
						 
						
							2018-10-25 19:10:24 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								e1948175ee 
								
							
								 
							
						 
						
							
							
								
								Allow power_level_content_override=None for _send_events_for_new_room  
							
							 
							
							
							
						 
						
							2018-10-25 19:10:24 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								7f7b2cd3de 
								
							
								 
							
						 
						
							
							
								
								Make room_member_handler a member of RoomCreationHandler  
							
							 
							
							... 
							
							
							
							... to save passing it into `_send_events_for_new_room` 
							
						 
						
							2018-10-25 19:10:18 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								871c4abfec 
								
							
								 
							
						 
						
							
							
								
								Factor _generate_room_id out of create_room  
							
							 
							
							... 
							
							
							
							we're going to need this for room upgrades. 
							
						 
						
							2018-10-25 18:23:09 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								cb53ce9d64 
								
									
								
							
								 
							
						 
						
							
							
								
								Refactor state group lookup to reduce DB hits ( #4011 )  
							
							 
							
							... 
							
							
							
							Currently when fetching state groups from the data store we make two
hits two the database: once for members and once for non-members (unless
request is filtered to one or the other). This adds needless load to the
datbase, so this PR refactors the lookup to make only a single database
hit. 
							
						 
						
							2018-10-25 17:49:55 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								74e7617083 
								
							
								 
							
						 
						
							
							
								
								Clean up room alias creation  
							
							 
							
							
							
						 
						
							2018-10-19 10:11:56 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								372bf073c1 
								
							
								 
							
						 
						
							
							
								
								block event creation and room creation on hitting resource limits  
							
							 
							
							
							
						 
						
							2018-08-16 21:25:16 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								3523f5432a 
								
							
								 
							
						 
						
							
							
								
								Don't expose default_room_version as config opt  
							
							 
							
							
							
						 
						
							2018-08-07 12:51:57 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								0ca459ea33 
								
							
								 
							
						 
						
							
							
								
								Basic support for room versioning  
							
							 
							
							... 
							
							
							
							This is the first tranche of support for room versioning. It includes:
 * setting the default room version in the config file
 * new room_version param on the createRoom API
 * storing the version of newly-created rooms in the m.room.create event
 * fishing the version of existing rooms out of the m.room.create event 
							
						 
						
							2018-08-03 16:08:32 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
								
								
							
							
								
							
								e9b2d047f6 
								
									
								
							
								 
							
						 
						
							
							
								
								make /context lazyload & filter aware ( #3567 )  
							
							 
							
							... 
							
							
							
							make /context lazyload & filter aware. 
							
						 
						
							2018-07-27 15:12:50 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								8b8c4f34a3 
								
							
								 
							
						 
						
							
							
								
								Replace usage of get_current_toke with StreamToken.START  
							
							 
							
							... 
							
							
							
							This allows us to handle /context/ requests on the client_reader worker
without having to pull in all the various stream handlers (e.g.
precence, typing, pushers etc). The only thing the token gets used for
is pagination, and that ignores everything but the room portion of the
token. 
							
						 
						
							2018-07-24 16:49:17 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								bacdf0cbf9 
								
							
								 
							
						 
						
							
							
								
								Move RoomContextHandler out of Handlers  
							
							 
							
							... 
							
							
							
							This is in preparation for moving GET /context/ to a worker 
							
						 
						
							2018-07-18 15:33:03 +01:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
							
								
							
								49af402019 
								
							
								 
							
						 
						
							
							
								
								run isort  
							
							 
							
							
							
						 
						
							2018-07-09 16:09:20 +10:00  
						
					 
				
					
						
							
							
								 
								Michael Wagner
							
						 
						
							 
							
							
							
								
							
								19cd3120ec 
								
							
								 
							
						 
						
							
							
								
								Add error code to room creation error  
							
							 
							
							... 
							
							
							
							This error code is mentioned in the documentation at https://matrix.org/docs/api/client-server/#!/Room32creation/createRoom  
							
						 
						
							2018-06-14 14:08:40 +02:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								c936a52a9e 
								
									
								
							
								 
							
						 
						
							
							
								
								Consistently use six's iteritems and wrap lazy keys/values in list() if they're not meant to be lazy ( #3307 )  
							
							 
							
							
							
						 
						
							2018-05-31 19:03:47 +10:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								a5e2941aad 
								
							
								 
							
						 
						
							
							
								
								Reject attempts to send event before privacy consent is given  
							
							 
							
							... 
							
							
							
							Returns an M_CONSENT_NOT_GIVEN error (cf
https://github.com/matrix-org/matrix-doc/issues/1252 ) if consent is not yet
given. 
							
						 
						
							2018-05-22 12:00:47 +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
							
						 
						
							 
							
							
							
								
							
								c46367d0d7 
								
							
								 
							
						 
						
							
							
								
								Move RoomCreationHandler out of synapse.handlers.Handlers  
							
							 
							
							... 
							
							
							
							Handlers is deprecated nowadays, so let's move this out before I add a new
dependency on it.
Also fix the docstrings on create_room. 
							
						 
						
							2018-05-17 09:08:42 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d4ffe61d4f 
								
							
								 
							
						 
						
							
							
								
								Remove ability for AS users to call /events and /sync  
							
							 
							
							... 
							
							
							
							This functionality has been deprecated for a while as well as being
broken for a while. Instead of fixing it lets just remove it entirely.
See: https://github.com/matrix-org/matrix-doc/issues/1144  
							
						 
						
							2018-03-05 15:44:46 +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
							
						 
						
							 
							
							
								
								
							
							
								
							
								dfbc45302e 
								
									
								
							
								 
							
						 
						
							
							
								
								PEP8  
							
							 
							
							
							
						 
						
							2017-11-28 15:23:26 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								c4c1d170af 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix wrong avatars when inviting multiple users when creating room  
							
							 
							
							... 
							
							
							
							We reused the `content` dictionary between invite requests, which meant they could end up reusing the profile info for a previous user 
							
						 
						
							2017-11-28 15:19:15 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								eaaabc6c4f 
								
							
								 
							
						 
						
							
							
								
								replace 'except:' with 'except Exception:'  
							
							 
							
							... 
							
							
							
							what could possibly go wrong 
							
						 
						
							2017-10-23 15:52:32 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								631d7b87b5 
								
							
								 
							
						 
						
							
							
								
								Remove pointless create() method  
							
							 
							
							... 
							
							
							
							It just calls the constructor, so we may as well kill it rather than having
random codepaths. 
							
						 
						
							2017-10-20 22:14:55 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								78d4ced829 
								
							
								 
							
						 
						
							
							
								
								un-double indent  
							
							 
							
							
							
						 
						
							2017-10-04 12:44:27 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								197c14dbcf 
								
							
								 
							
						 
						
							
							
								
								Add room creation checks to spam checker  
							
							 
							
							... 
							
							
							
							Lets the spam checker deny attempts to create rooms and add aliases
to them. 
							
						 
						
							2017-10-04 10:47:54 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b490299a3b 
								
							
								 
							
						 
						
							
							
								
								Change to create new room and join other users  
							
							 
							
							
							
						 
						
							2017-06-19 14:10:13 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b990b2fce5 
								
							
								 
							
						 
						
							
							
								
								Add per user ratelimiting overrides  
							
							 
							
							
							
						 
						
							2017-05-10 11:05:43 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								17673404fb 
								
							
								 
							
						 
						
							
							
								
								Remove unused param  
							
							 
							
							
							
						 
						
							2017-02-20 15:02:01 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								7f026792e1 
								
							
								 
							
						 
						
							
							
								
								Fix /context/ visibiltiy rules  
							
							 
							
							
							
						 
						
							2017-02-20 14:54:50 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								54a79c1d37 
								
							
								 
							
						 
						
							
							
								
								Make presence.get_new_events a bit faster  
							
							 
							
							... 
							
							
							
							We do this by caching the set of users a user shares rooms with. 
							
						 
						
							2017-02-02 13:07:18 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								9609c91e7d 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #653  from matrix-org/erikj/preset_guest_join  
							
							 
							
							... 
							
							
							
							Enable guest access for private rooms by default 
							
						 
						
							2016-12-05 17:47:14 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d04e2ff3a4 
								
							
								 
							
						 
						
							
							
								
								Fix incredubly slow back pagination query  
							
							 
							
							... 
							
							
							
							If a client didn't specify a from token when paginating backwards
synapse would attempt to query the (global) maximum topological token.
This a) doesn't make much sense since they're room specific and b) there
are no indices that lets postgres do this efficiently. 
							
						 
						
							2016-10-24 13:35:51 +01:00  
						
					 
				
					
						
							
							
								 
								Patrik Oldsberg
							
						 
						
							 
							
							
							
								
							
								9bfc617791 
								
							
								 
							
						 
						
							
							
								
								storage/appservice: make appservice methods only relying on the cache synchronous  
							
							 
							
							
							
						 
						
							2016-10-06 15:24:59 +02:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a70a43bc51 
								
							
								 
							
						 
						
							
							
								
								Move RoomListHandler into a separate file  
							
							 
							
							
							
						 
						
							2016-09-14 14:07:37 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								48a5a7552d 
								
							
								 
							
						 
						
							
							
								
								Add is_direct param to /createRoom  
							
							 
							
							
							
						 
						
							2016-09-12 16:34:20 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								791658b576 
								
							
								 
							
						 
						
							
							
								
								Add server param to /publicRooms  
							
							 
							
							
							
						 
						
							2016-09-08 11:53:05 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								248e6770ca 
								
							
								 
							
						 
						
							
							
								
								Cache federation state responses  
							
							 
							
							
							
						 
						
							2016-07-21 10:30:12 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								81c07a32fd 
								
							
								 
							
						 
						
							
							
								
								Pull full state for each room all at once  
							
							 
							
							
							
						 
						
							2016-06-08 15:51:49 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								e0deeff23e 
								
							
								 
							
						 
						
							
							
								
								Fix room list spidering  
							
							 
							
							
							
						 
						
							2016-06-01 17:58:58 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								2a449fec4d 
								
							
								 
							
						 
						
							
							
								
								Add cache to remote room lists  
							
							 
							
							... 
							
							
							
							Poll for updates from remote servers, waiting for the poll if there's no cache entry. 
							
						 
						
							2016-05-31 18:27:23 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								d240796ded 
								
							
								 
							
						 
						
							
							
								
								Basic, un-cached support for secondary_directory_servers  
							
							 
							
							
							
						 
						
							2016-05-31 17:20:07 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								7e23476814 
								
							
								 
							
						 
						
							
							
								
								move filter_events_for_client out of base handler  
							
							 
							
							
							
						 
						
							2016-05-11 13:42:37 +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
							
						 
						
							 
							
							
							
								
							
								72f454b752 
								
							
								 
							
						 
						
							
							
								
								Don't return empty public rooms  
							
							 
							
							
							
						 
						
							2016-04-12 16:06:18 +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
							
						 
						
							 
							
							
							
								
							
								8d73cd502b 
								
							
								 
							
						 
						
							
							
								
								Add concurrently_execute function  
							
							 
							
							
							
						 
						
							2016-04-01 14:06:00 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d35780eda0 
								
							
								 
							
						 
						
							
							
								
								Split out RoomMemberHandler  
							
							 
							
							
							
						 
						
							2016-03-31 13:08:45 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								5260db7663 
								
							
								 
							
						 
						
							
							
								
								Line length  
							
							 
							
							
							
						 
						
							2016-03-31 10:49:27 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								73b6bf4629 
								
							
								 
							
						 
						
							
							
								
								Only forget room if you were in the room  
							
							 
							
							
							
						 
						
							2016-03-30 15:09:18 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								fddb6fddc1 
								
							
								 
							
						 
						
							
							
								
								Require user to have left room to forget room  
							
							 
							
							... 
							
							
							
							This dramatically simplifies the forget API code - in particular it no
longer generates a leave event. 
							
						 
						
							2016-03-30 11:03:00 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								54a546091a 
								
							
								 
							
						 
						
							
							
								
								Add a response cache for getting the public room list  
							
							 
							
							
							
						 
						
							2016-03-24 18:02:10 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								84afeb41f3 
								
							
								 
							
						 
						
							
							
								
								Ensure all old public rooms have aliases  
							
							 
							
							
							
						 
						
							2016-03-23 13:59:34 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b2802a1351 
								
							
								 
							
						 
						
							
							
								
								Ensure published rooms have public join rules  
							
							 
							
							
							
						 
						
							2016-03-23 13:59:31 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								0677fc1c4e 
								
							
								 
							
						 
						
							
							
								
								Comment  
							
							 
							
							
							
						 
						
							2016-03-23 13:25:22 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								34473a9c7f 
								
							
								 
							
						 
						
							
							
								
								Don't require alias in public room list.  
							
							 
							
							... 
							
							
							
							Rooms now no longer require an alias to be published.
Also, changes the way we pull out state of each room to not require
fetching all state events. 
							
						 
						
							2016-03-23 10:42:19 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3bb3f02517 
								
							
								 
							
						 
						
							
							
								
								Enable guest access for private rooms by default  
							
							 
							
							
							
						 
						
							2016-03-17 16:23:53 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								590fbbef03 
								
							
								 
							
						 
						
							
							
								
								Add config to create guest account on 3pid invite  
							
							 
							
							... 
							
							
							
							Currently, when a 3pid invite request is sent to an identity server, it
includes a provisioned guest access token. This allows the link in the,
say, invite email to include the guest access token ensuring that the
same account is used each time the link is clicked.
This flow has a number of flaws, including when using different servers
or servers that have guest access disabled.
For now, we keep this implementation but hide it behind a config option
until a better flow is implemented. 
							
						 
						
							2016-03-14 15:50:40 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								874fd43257 
								
							
								 
							
						 
						
							
							
								
								Send the user ID matching the guest access token, since there is no Matrix API to discover what user ID an access token is for.  
							
							 
							
							
							
						 
						
							2016-03-07 17:13:56 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								09b1d98070 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #623  from matrix-org/rav/fix_createroom_race  
							
							 
							
							... 
							
							
							
							Make sure we add all invited members before returning from createRoom 
							
						 
						
							2016-03-04 09:29:15 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								a92b4ea76f 
								
							
								 
							
						 
						
							
							
								
								Make sure we add all invited members before returning from createRoom  
							
							 
							
							... 
							
							
							
							add a missing yield. 
							
						 
						
							2016-03-04 00:06:03 +00: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
							
						 
						
							 
							
							
							
								
							
								74cd80e530 
								
							
								 
							
						 
						
							
							
								
								Fix typo  
							
							 
							
							
							
						 
						
							2016-03-03 10:28:58 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								fc1f932cc0 
								
							
								 
							
						 
						
							
							
								
								Move arg default to the start of the function  
							
							 
							
							... 
							
							
							
							Also don't overwrite the list that gets passed in. 
							
						 
						
							2016-03-02 16:44:14 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								9ff940a0ef 
								
							
								 
							
						 
						
							
							
								
								Address review comments  
							
							 
							
							
							
						 
						
							2016-03-02 15:40:30 +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  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								33300673b7 
								
							
								 
							
						 
						
							
							
								
								Generate guest access token on 3pid invites  
							
							 
							
							... 
							
							
							
							This means that following the same link across multiple sessions or
devices can re-use the same guest account.
Note that this is somewhat of an abuse vector; we can't throw up
captchas on this flow, so this is a way of registering ephemeral
accounts for spam, whose sign-up we don't rate limit. 
							
						 
						
							2016-02-24 14:41:25 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								577951b032 
								
							
								 
							
						 
						
							
							
								
								Allow third_party_signed to be specified on /join  
							
							 
							
							
							
						 
						
							2016-02-23 15:11:25 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								f8d21e1431 
								
							
								 
							
						 
						
							
							
								
								Review comments  
							
							 
							
							
							
						 
						
							2016-02-18 11:02:14 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								591af2d074 
								
							
								 
							
						 
						
							
							
								
								Some cleanup  
							
							 
							
							... 
							
							
							
							I'm not particularly happy with the "action" switching, but there's no
convenient way to defer the work that needs to happen after it, so... :( 
							
						 
						
							2016-02-17 15:50:13 +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
							
						 
						
							 
							
							
							
								
							
								6605adf669 
								
							
								 
							
						 
						
							
							
								
								Some cleanup, some TODOs, more to do  
							
							 
							
							
							
						 
						
							2016-02-16 19:05:02 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								d1fb790818 
								
							
								 
							
						 
						
							
							
								
								Some cleanup  
							
							 
							
							
							
						 
						
							2016-02-16 14:25:23 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								1f403325ac 
								
							
								 
							
						 
						
							
							
								
								Tidy? up room creation event sending  
							
							 
							
							
							
						 
						
							2016-02-16 12:00:50 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								feedaa37fa 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into daniel/roomcleanupincremental  
							
							 
							
							... 
							
							
							
							Conflicts:
	synapse/handlers/room.py 
							
						 
						
							2016-02-16 11:34:48 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								4bfb32f685 
								
							
								 
							
						 
						
							
							
								
								Branch off member and non member sends  
							
							 
							
							... 
							
							
							
							Unclean, needs tidy-up, but works 
							
						 
						
							2016-02-15 18:21:30 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								1a2197d7bf 
								
							
								 
							
						 
						
							
							
								
								Simplify room creation code  
							
							 
							
							
							
						 
						
							2016-02-15 18:19:01 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								e560045cfd 
								
							
								 
							
						 
						
							
							
								
								Simplify room creation code  
							
							 
							
							
							
						 
						
							2016-02-15 18:18:39 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								8168341e9b 
								
							
								 
							
						 
						
							
							
								
								Use update_membership for profile updates  
							
							 
							
							
							
						 
						
							2016-02-15 17:14:34 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								1bbb67c452 
								
							
								 
							
						 
						
							
							
								
								Use update_membership to kick guests  
							
							 
							
							
							
						 
						
							2016-02-15 16:40:22 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								150fcde0dc 
								
							
								 
							
						 
						
							
							
								
								Reuse update_membership from /join  
							
							 
							
							
							
						 
						
							2016-02-15 16:16:03 +00:00