Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3fa362502c 
								
							
								 
							
						 
						
							
							
								
								Update places where we create events  
							
							 
							
							
							
						 
						
							2018-02-05 16:01:48 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
								
								
							
							
								
							
								d32385336f 
								
									
								
							
								 
							
						 
						
							
							
								
								add ?ts massaging for ASes ( #2754 )  
							
							 
							
							... 
							
							
							
							blindly implement ?ts for AS. untested 
							
						 
						
							2018-01-23 09:59:06 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								51c9d9ed65 
								
							
								 
							
						 
						
							
							
								
								Add /room/{id}/event/{id} to synapse  
							
							 
							
							... 
							
							
							
							Turns out that there is a valid usecase for retrieving event by id (notably
having received a push), but event ids should be scoped to room, so /event/{id}
is wrong. 
							
						 
						
							2018-01-09 14:39:12 +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  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								8090fd4664 
								
							
								 
							
						 
						
							
							
								
								Fix /joined_members to work with AS users  
							
							 
							
							
							
						 
						
							2017-09-28 10:09:32 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								adec03395d 
								
							
								 
							
						 
						
							
							
								
								Fix bug where /joined_members didn't check user was in room  
							
							 
							
							
							
						 
						
							2017-09-27 15:14:39 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3e5a62ecd8 
								
							
								 
							
						 
						
							
							
								
								Add more granular event send metrics  
							
							 
							
							
							
						 
						
							2017-05-02 14:23:26 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d9aa645f86 
								
							
								 
							
						 
						
							
							
								
								Reduce size of joined_user cache  
							
							 
							
							... 
							
							
							
							The _get_joined_users_from_context cache stores a mapping from user_id
to avatar_url and display_name. Instead of storing those in a dict,
store them in a namedtuple as that uses much less memory.
We also try converting the string to ascii to further reduce the size. 
							
						 
						
							2017-04-25 14:38:51 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6957bfdca6 
								
							
								 
							
						 
						
							
							
								
								Don't recreate so many sets  
							
							 
							
							
							
						 
						
							2017-03-16 11:54:26 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								17673404fb 
								
							
								 
							
						 
						
							
							
								
								Remove unused param  
							
							 
							
							
							
						 
						
							2017-02-20 15:02:01 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								355d62c499 
								
							
								 
							
						 
						
							
							
								
								Make kick & ban reasons work  
							
							 
							
							... 
							
							
							
							We somehow specced APIs with reason strings, preserve the content
in the events  and even have the clients display them, but failed
to actually pass the parameter through to the event content. 
							
						 
						
							2017-02-14 15:10:55 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6823fe5241 
								
							
								 
							
						 
						
							
							
								
								Linearize updates to membership via PUT /state/  
							
							 
							
							
							
						 
						
							2017-01-09 18:25:13 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								1574b839e0 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1676  from matrix-org/erikj/room_list  
							
							 
							
							... 
							
							
							
							Add new API appservice specific public room list 
							
						 
						
							2016-12-12 17:00:10 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								52d12ca782 
								
							
								 
							
						 
						
							
							
								
								Add /room/<room_id>/joined_members API  
							
							 
							
							... 
							
							
							
							This returns the currently joined members in the room with their display
names and avatar urls. This is more efficient than /members for large
rooms where you don't need the full events. 
							
						 
						
							2016-12-08 13:32:07 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								de796f27e6 
								
							
								 
							
						 
						
							
							
								
								Add joined_rooms servlet  
							
							 
							
							
							
						 
						
							2016-12-08 11:39:03 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								f32fb65552 
								
							
								 
							
						 
						
							
							
								
								Add new API appservice specific public room list  
							
							 
							
							
							
						 
						
							2016-12-06 16:12:27 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								af4a1bac50 
								
							
								 
							
						 
						
							
							
								
								Move .observe() up to the cache to make things neater  
							
							 
							
							
							
						 
						
							2016-11-14 09:52:41 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								8ecaff51a1 
								
							
								 
							
						 
						
							
							
								
								Review comments  
							
							 
							
							
							
						 
						
							2016-11-11 17:47:03 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								f6c48802f5 
								
							
								 
							
						 
						
							
							
								
								More flake8  
							
							 
							
							
							
						 
						
							2016-11-11 15:08:24 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								a88bc67f88 
								
							
								 
							
						 
						
							
							
								
								Flake8 and fix whoopsie  
							
							 
							
							
							
						 
						
							2016-11-11 15:02:29 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								42c43cfafd 
								
							
								 
							
						 
						
							
							
								
								Use ObservableDeferreds instead of Deferreds as they behave as intended  
							
							 
							
							
							
						 
						
							2016-11-11 14:54:10 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								8a8ad46f48 
								
							
								 
							
						 
						
							
							
								
								Flake8  
							
							 
							
							
							
						 
						
							2016-11-10 15:22:11 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								2771447c29 
								
							
								 
							
						 
						
							
							
								
								Store Promise<Response> instead of Response for HTTP API transactions  
							
							 
							
							... 
							
							
							
							This fixes a race whereby:
 - User hits an endpoint.
 - No cached transaction so executes main code.
 - User hits same endpoint.
 - No cache transaction so executes main code.
 - Main code finishes executing and caches response and returns.
 - Main code finishes executing and caches response and returns.
 This race is common in the wild when Synapse is struggling under load.
 This commit fixes the race by:
  - User hits an endpoint.
  - Caches the promise to execute the main code and executes main code.
  - User hits same endpoint.
  - Yields on the same promise as the first request.
  - Main code finishes executing and returns, unblocking both requests. 
							
						 
						
							2016-11-10 14:49:26 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								22578545a0 
								
							
								 
							
						 
						
							
							
								
								Time out typing over federation  
							
							 
							
							
							
						 
						
							2016-09-23 14:00:52 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								87528f0756 
								
							
								 
							
						 
						
							
							
								
								Support /initialSync in synchrotron worker  
							
							 
							
							
							
						 
						
							2016-09-21 11:46:28 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ddc89df89d 
								
							
								 
							
						 
						
							
							
								
								Enable guest access to POST /publicRooms  
							
							 
							
							
							
						 
						
							2016-09-17 15:55:24 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2e67cabd7f 
								
							
								 
							
						 
						
							
							
								
								Make POST /publicRooms require auth  
							
							 
							
							
							
						 
						
							2016-09-16 11:32:51 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c33b25fd8d 
								
							
								 
							
						 
						
							
							
								
								Change the way we calculate new_limit in /publicRooms and add POST API  
							
							 
							
							
							
						 
						
							2016-09-15 17:35:20 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								68c1ed4d1a 
								
							
								 
							
						 
						
							
							
								
								Remove default public rooms limit  
							
							 
							
							
							
						 
						
							2016-09-15 13:56:20 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								1d98cf26be 
								
							
								 
							
						 
						
							
							
								
								By default limit /publicRooms to 100 entries  
							
							 
							
							
							
						 
						
							2016-09-15 13:18:35 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								5810cffd33 
								
							
								 
							
						 
						
							
							
								
								Pass since/from parameters over federation  
							
							 
							
							
							
						 
						
							2016-09-15 10:36:19 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								f3eead0660 
								
							
								 
							
						 
						
							
							
								
								Allow paginating both forwards and backwards  
							
							 
							
							
							
						 
						
							2016-09-15 10:15:37 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4131381123 
								
							
								 
							
						 
						
							
							
								
								Remove support for aggregate room lists  
							
							 
							
							
							
						 
						
							2016-09-15 09:28:15 +01:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								d271383e63 
								
							
								 
							
						 
						
							
							
								
								Filter returned events for client-facing format  
							
							 
							
							
							
						 
						
							2016-09-09 14:40:15 +01:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								0fc0a3bdff 
								
							
								 
							
						 
						
							
							
								
								Allow clients to specify the format a room state event is returned in  
							
							 
							
							
							
						 
						
							2016-09-09 14:34:29 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3f9889bfd6 
								
							
								 
							
						 
						
							
							
								
								Use parse_string  
							
							 
							
							
							
						 
						
							2016-09-08 15:51:10 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								791658b576 
								
							
								 
							
						 
						
							
							
								
								Add server param to /publicRooms  
							
							 
							
							
							
						 
						
							2016-09-08 11:53:05 +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
							
						 
						
							 
							
							
							
								
							
								866a5320de 
								
							
								 
							
						 
						
							
							
								
								Dont invoke get_handlers fromClientV1RestServlet  
							
							 
							
							... 
							
							
							
							hs.get_handlers() can not be invoked from split out processes. Moving
the invocations down a level means that we can slowly split out
individual servlets. 
							
						 
						
							2016-08-12 10:03:19 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a98d215204 
								
							
								 
							
						 
						
							
							
								
								Add filter param to /messages API  
							
							 
							
							
							
						 
						
							2016-07-14 16:30:56 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								690029d1a3 
								
							
								 
							
						 
						
							
							
								
								Don't make rooms visibile by default  
							
							 
							
							
							
						 
						
							2016-06-08 14:47:42 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								efeabd3180 
								
							
								 
							
						 
						
							
							
								
								Log user that is making /publicRooms calls  
							
							 
							
							
							
						 
						
							2016-06-08 14:23:15 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								d240796ded 
								
							
								 
							
						 
						
							
							
								
								Basic, un-cached support for secondary_directory_servers  
							
							 
							
							
							
						 
						
							2016-05-31 17:20:07 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								887c6e6f05 
								
							
								 
							
						 
						
							
							
								
								Split out the room list handler  
							
							 
							
							... 
							
							
							
							So I can use it from federation bits without pulling in all the handlers. 
							
						 
						
							2016-05-31 11:05:16 +01:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								332d7e9b97 
								
							
								 
							
						 
						
							
							
								
								Allow clients to specify a server_name to avoid 'No known servers'  
							
							 
							
							... 
							
							
							
							Multiple server_names are supported via ?server_name=foo&server_name=bar 
							
						 
						
							2016-05-19 13:50:52 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								0cb441fedd 
								
							
								 
							
						 
						
							
							
								
								Move typing handler out of the Handlers object  
							
							 
							
							
							
						 
						
							2016-05-17 15:58:46 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								3b86ecfa79 
								
							
								 
							
						 
						
							
							
								
								Move the presence handler out of the Handlers object  
							
							 
							
							
							
						 
						
							2016-05-16 18:56:37 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								08a8514b7a 
								
							
								 
							
						 
						
							
							
								
								Remove spurious comment  
							
							 
							
							
							
						 
						
							2016-03-30 15:05:33 +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
							
						 
						
							 
							
							
							
								
							
								e9c1cabac2 
								
							
								 
							
						 
						
							
							
								
								Use parse_json_object_from_request to parse JSON out of request bodies  
							
							 
							
							
							
						 
						
							2016-03-11 16:41:03 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								b7dbe5147a 
								
							
								 
							
						 
						
							
							
								
								Add a parse_json_object function  
							
							 
							
							... 
							
							
							
							to deduplicate all the copy+pasted _parse_json functions. Also document
the parse_.* functions. 
							
						 
						
							2016-03-09 11:26:26 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								7076082ae6 
								
							
								 
							
						 
						
							
							
								
								Fix relative imports so they work in both py3 and py27  
							
							 
							
							
							
						 
						
							2016-03-08 11:45:50 +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  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								869580206d 
								
							
								 
							
						 
						
							
							
								
								Ignore invalid POST bodies when joining rooms  
							
							 
							
							
							
						 
						
							2016-02-24 08:50:28 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								577951b032 
								
							
								 
							
						 
						
							
							
								
								Allow third_party_signed to be specified on /join  
							
							 
							
							
							
						 
						
							2016-02-23 15:11:25 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e5ad2e5267 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #582  from matrix-org/erikj/presence  
							
							 
							
							... 
							
							
							
							Rewrite presence for performance. 
							
						 
						
							2016-02-19 09:37:50 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								7e90fb6a57 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into daniel/roomcleanupincremental  
							
							 
							
							... 
							
							
							
							Conflicts:
	synapse/rest/client/v1/room.py 
							
						 
						
							2016-02-17 15:53:59 +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  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e5999bfb1a 
								
							
								 
							
						 
						
							
							
								
								Initial cut  
							
							 
							
							
							
						 
						
							2016-02-17 15:40:50 +00:00  
						
					 
				
					
						
							
							
								 
								Patrik Oldsberg
							
						 
						
							 
							
							
							
								
							
								71d5d2c669 
								
							
								 
							
						 
						
							
							
								
								client/v1/room: include event_id in response to state event PUT, in accordance with the spec  
							
							 
							
							... 
							
							
							
							Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com> 
							
						 
						
							2016-02-17 11:53:43 +01: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
							
						 
						
							 
							
							
							
								
							
								150fcde0dc 
								
							
								 
							
						 
						
							
							
								
								Reuse update_membership from /join  
							
							 
							
							
							
						 
						
							2016-02-15 16:16:03 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								e71095801f 
								
							
								 
							
						 
						
							
							
								
								Merge implementation of /join by alias or ID  
							
							 
							
							... 
							
							
							
							This code is kind of rough (passing the remote servers down a long
chain), but is a step towards improvement. 
							
						 
						
							2016-02-15 15:39:16 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								dbeed36dec 
								
							
								 
							
						 
						
							
							
								
								Merge some room joining codepaths  
							
							 
							
							... 
							
							
							
							Force joining by alias to go through the send_membership_event checks,
rather than bypassing them straight into _do_join. This is the first of
many stages of cleanup. 
							
						 
						
							2016-02-15 14:38:27 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								4de08a4672 
								
							
								 
							
						 
						
							
							
								
								Revert "Merge two of the room join codepaths"  
							
							 
							
							... 
							
							
							
							This reverts commit cf81375b94 .
It subtly violates a guest joining auth check 
							
						 
						
							2016-02-12 16:17:24 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								cf81375b94 
								
							
								 
							
						 
						
							
							
								
								Merge two of the room join codepaths  
							
							 
							
							... 
							
							
							
							There's at least one more to merge in.
Side-effects:
 * Stop reporting None as displayname and avatar_url in some cases
 * Joining a room by alias populates guest-ness in join event
 * Remove unspec'd PUT version of /join/<room_id_or_alias> which has not
   been called on matrix.org according to logs
 * Stop recording access_token_id on /join/room_id - currently we don't
   record it on /join/room_alias; I can try to thread it through at some
   point. 
							
						 
						
							2016-02-12 15:11:49 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								709e09e1c3 
								
							
								 
							
						 
						
							
							
								
								Remove old log line  
							
							 
							
							
							
						 
						
							2016-02-03 16:32:20 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								da417aa56d 
								
							
								 
							
						 
						
							
							
								
								Allow non-guests to peek on rooms using /events  
							
							 
							
							
							
						 
						
							2016-01-20 15:34:07 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								ac5a4477ad 
								
							
								 
							
						 
						
							
							
								
								Require unbanning before other membership changes  
							
							 
							
							
							
						 
						
							2016-01-15 16:27:26 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								2978053d16 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'release-v0.12.1' into develop  
							
							 
							
							
							
						 
						
							2016-01-14 15:04:08 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								49f33f6438 
								
							
								 
							
						 
						
							
							
								
								Add 'event' result to 'context' endpoint  
							
							 
							
							... 
							
							
							
							... because the context isn't much use without the event. 
							
						 
						
							2016-01-13 16:42:14 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								2110e35fd6 
								
							
								 
							
						 
						
							
							
								
								Introduce a Requester object  
							
							 
							
							... 
							
							
							
							This tracks data about the entity which made the request. This is
instead of passing around a tuple, which requires call-site
modifications every time a new piece of optional context is passed
around.
I tried to introduce a User object. I gave up. 
							
						 
						
							2016-01-11 17:48:45 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								6c28ac260c 
								
							
								 
							
						 
						
							
							
								
								copyrights  
							
							 
							
							
							
						 
						
							2016-01-07 04:26:29 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								515548a47a 
								
							
								 
							
						 
						
							
							
								
								Missing yield  
							
							 
							
							
							
						 
						
							2015-12-10 17:54:23 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								872c134807 
								
							
								 
							
						 
						
							
							
								
								Update endpoints to reflect current spec  
							
							 
							
							
							
						 
						
							2015-12-02 15:45:04 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								14d7acfad4 
								
							
								 
							
						 
						
							
							
								
								Host /unstable and /r0 versions of r0 APIs  
							
							 
							
							
							
						 
						
							2015-12-01 17:34:32 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								ba26eb3d5d 
								
							
								 
							
						 
						
							
							
								
								Allow users to forget rooms  
							
							 
							
							
							
						 
						
							2015-11-17 17:17:30 -05:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								9c3f4f8dfd 
								
							
								 
							
						 
						
							
							
								
								Allow guests to /room/:room_id/{join,leave}  
							
							 
							
							
							
						 
						
							2015-11-13 11:56:58 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								0d08670f61 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #360  from matrix-org/daniel/guestroominitialsync  
							
							 
							
							... 
							
							
							
							Merge pull request #360  from matrix-org/daniel/guestroominitialsync
Allow guest access to room initialSync 
							
						 
						
							2015-11-12 15:19:55 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								e93d550b79 
								
							
								 
							
						 
						
							
							
								
								Allow guests to access room context API  
							
							 
							
							
							
						 
						
							2015-11-11 17:49:44 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								f15ba926cc 
								
							
								 
							
						 
						
							
							
								
								Allow guest access to room initialSync  
							
							 
							
							
							
						 
						
							2015-11-11 17:13:24 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								38d82edf0e 
								
							
								 
							
						 
						
							
							
								
								Allow guest users to join and message rooms  
							
							 
							
							
							
						 
						
							2015-11-10 16:57:13 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								82e8a2d763 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #356  from matrix-org/daniel/3pidyetagain  
							
							 
							
							... 
							
							
							
							Get display name from identity server, not client 
							
						 
						
							2015-11-10 12:44:17 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								0d63dc3ec9 
								
							
								 
							
						 
						
							
							
								
								Get display name from identity server, not client  
							
							 
							
							
							
						 
						
							2015-11-09 17:26:43 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								9107ed23b7 
								
							
								 
							
						 
						
							
							
								
								Add a couple of unit tests for room/<x>/messages  
							
							 
							
							... 
							
							
							
							... merely because I was trying to figure out how it worked, and couldn't. 
							
						 
						
							2015-11-09 16:16:43 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6be1b4b113 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #350  from matrix-org/erikj/search  
							
							 
							
							... 
							
							
							
							Implement pagination, order by and groups in search 
							
						 
						
							2015-11-05 17:52:32 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								2cebe53545 
								
							
								 
							
						 
						
							
							
								
								Exchange 3pid invites for m.room.member invites  
							
							 
							
							
							
						 
						
							2015-11-05 16:43:19 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								729ea933ea 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search  
							
							 
							
							
							
						 
						
							2015-11-05 15:43:52 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								7301e05122 
								
							
								 
							
						 
						
							
							
								
								Implement basic pagination for search results  
							
							 
							
							
							
						 
						
							2015-11-05 15:04:08 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								ca2f90742d 
								
							
								 
							
						 
						
							
							
								
								Open up /events to anonymous users for room events only  
							
							 
							
							... 
							
							
							
							Squash-merge of PR #345  from daniel/anonymousevents 
							
						 
						
							2015-11-05 14:32:26 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								f522f50a08 
								
							
								 
							
						 
						
							
							
								
								Allow guests to register and call /events?room_id=  
							
							 
							
							... 
							
							
							
							This follows the same flows-based flow as regular registration, but as
the only implemented flow has no requirements, it auto-succeeds. In the
future, other flows (e.g. captcha) may be required, so clients should
treat this like the regular registration flow choices. 
							
						 
						
							2015-11-04 17:29:07 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								5cb298c934 
								
							
								 
							
						 
						
							
							
								
								Add room context api  
							
							 
							
							
							
						 
						
							2015-10-28 13:45:56 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								33646eb000 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search  
							
							 
							
							
							
						 
						
							2015-10-16 15:35:35 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								0c38e8637f 
								
							
								 
							
						 
						
							
							
								
								Remove unnecessary class-wrapping  
							
							 
							
							
							
						 
						
							2015-10-13 18:00:38 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								14edea1aff 
								
							
								 
							
						 
						
							
							
								
								Move logic into handler  
							
							 
							
							
							
						 
						
							2015-10-13 17:47:58 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								b68db61222 
								
							
								 
							
						 
						
							
							
								
								Add logging  
							
							 
							
							
							
						 
						
							2015-10-13 17:22:50 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								17dffef5ec 
								
							
								 
							
						 
						
							
							
								
								Move event contents into third_party_layout field  
							
							 
							
							
							
						 
						
							2015-10-13 15:48:12 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								61561b9df7 
								
							
								 
							
						 
						
							
							
								
								Keep FTS indexes up to date. Only search through rooms currently joined  
							
							 
							
							
							
						 
						
							2015-10-12 10:49:53 +01:00