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  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								73e616df2a 
								
							
								 
							
						 
						
							
							
								
								Inline _do_local_membership_update  
							
							 
							
							
							
						 
						
							2016-02-15 16:02:22 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								f318d4f2a4 
								
							
								 
							
						 
						
							
							
								
								Inline _do_join as it now only has one caller  
							
							 
							
							... 
							
							
							
							Also, consistently apply rate limiting.
Again, ugly, but a step in the right direction. 
							
						 
						
							2016-02-15 15:57:10 +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
							
						 
						
							 
							
							
							
								
							
								0eff740523 
								
							
								 
							
						 
						
							
							
								
								Return events in correct order for /events  
							
							 
							
							
							
						 
						
							2016-02-11 10:07:27 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2c1fbea531 
								
							
								 
							
						 
						
							
							
								
								Fix up logcontexts  
							
							 
							
							
							
						 
						
							2016-02-08 14:26:45 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								9cd80a7b5c 
								
							
								 
							
						 
						
							
							
								
								PEP8  
							
							 
							
							
							
						 
						
							2016-02-03 11:52:57 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								772b45c745 
								
							
								 
							
						 
						
							
							
								
								Remove unused method  
							
							 
							
							
							
						 
						
							2016-02-03 11:43:26 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6f52e90065 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/public_room_fix  
							
							 
							
							
							
						 
						
							2016-02-03 11:06:29 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								d83d004ccd 
								
							
								 
							
						 
						
							
							
								
								Fix flake8 warnings for new flake8  
							
							 
							
							
							
						 
						
							2016-02-02 17:18:50 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								8a391e33ae 
								
							
								 
							
						 
						
							
							
								
								s/get_room_changes_for_user/get_membership_changes_for_user/  
							
							 
							
							
							
						 
						
							2016-02-02 16:12:10 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								65e92eca49 
								
							
								 
							
						 
						
							
							
								
								Change the way we do public room list fetching  
							
							 
							
							
							
						 
						
							2016-02-02 15:21:10 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b023995538 
								
							
								 
							
						 
						
							
							
								
								WARN if we get a topo token instead of stream.  
							
							 
							
							
							
						 
						
							2016-02-02 14:11:14 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								89b40b225c 
								
							
								 
							
						 
						
							
							
								
								Order things correctly  
							
							 
							
							
							
						 
						
							2016-02-01 16:32:46 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4bf448be25 
								
							
								 
							
						 
						
							
							
								
								Switch over /events to use per room caches  
							
							 
							
							
							
						 
						
							2016-02-01 16:26:51 +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  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								b5ce4f0427 
								
							
								 
							
						 
						
							
							
								
								Remove unused parameters  
							
							 
							
							
							
						 
						
							2016-01-15 13:54:03 +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
							
						 
						
							 
							
							
							
								
							
								93afb40cd4 
								
							
								 
							
						 
						
							
							
								
								Skip, rather than erroring, invalid guest requests  
							
							 
							
							... 
							
							
							
							Erroring causes problems when people make illegal requests, because they
don't know what limit parameter they should pass.
This is definitely buggy. It leaks message counts for rooms people don't
have permission to see, via tokens. But apparently we already
consciously decided to allow that as a team, so this preserves that
behaviour. 
							
						 
						
							2016-01-13 16:41:42 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								2ef6de928d 
								
							
								 
							
						 
						
							
							
								
								Skip, rather than erroring, invalid guest requests  
							
							 
							
							... 
							
							
							
							Erroring causes problems when people make illegal requests, because they
don't know what limit parameter they should pass.
This is definitely buggy. It leaks message counts for rooms people don't
have permission to see, via tokens. But apparently we already
consciously decided to allow that as a team, so this preserves that
behaviour. 
							
						 
						
							2016-01-05 18:12:37 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								cfd07aafff 
								
							
								 
							
						 
						
							
							
								
								Allow guests to upgrade their accounts  
							
							 
							
							
							
						 
						
							2016-01-05 18:01:18 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c3ea36304b 
								
							
								 
							
						 
						
							
							
								
								Use named args  
							
							 
							
							
							
						 
						
							2016-01-05 12:57:45 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								1b5642604b 
								
							
								 
							
						 
						
							
							
								
								Support inviting 3pids in /createRoom  
							
							 
							
							
							
						 
						
							2016-01-05 11:56:21 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								7f3148865c 
								
							
								 
							
						 
						
							
							
								
								Return room avatar URLs in /publicRooms  
							
							 
							
							... 
							
							
							
							Spec: https://github.com/matrix-org/matrix-doc/pull/244 
Tests: https://github.com/matrix-org/sytest/pull/121  
							
						 
						
							2015-12-21 19:38:04 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								0311612ce9 
								
							
								 
							
						 
						
							
							
								
								Give the IS a bunch more 3pid invite context  
							
							 
							
							... 
							
							
							
							This allows it to form richer emails 
							
						 
						
							2015-12-16 13:05:32 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								7d6b313312 
								
							
								 
							
						 
						
							
							
								
								Add caches for whether a room has been forgotten by a user  
							
							 
							
							
							
						 
						
							2015-12-10 17:49:34 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								c30cdb0d68 
								
							
								 
							
						 
						
							
							
								
								Add comments  
							
							 
							
							
							
						 
						
							2015-12-02 10:49:35 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								2a0ec3b89d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into markjh/edu_frequency  
							
							 
							
							... 
							
							
							
							Conflicts:
	synapse/handlers/federation.py
	synapse/handlers/room.py 
							
						 
						
							2015-12-02 10:40:22 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								a9526831a4 
								
							
								 
							
						 
						
							
							
								
								Wrap calls to distributor.fire in appropriately named functions so that static analysis can work out want is calling what  
							
							 
							
							
							
						 
						
							2015-12-01 20:53:04 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								3d3da2b460 
								
							
								 
							
						 
						
							
							
								
								Only fire user_joined_room on the distributor if the user has actually joined the room  
							
							 
							
							
							
						 
						
							2015-12-01 16:03:08 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								ba26eb3d5d 
								
							
								 
							
						 
						
							
							
								
								Allow users to forget rooms  
							
							 
							
							
							
						 
						
							2015-11-17 17:17:30 -05:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c0b3554401 
								
							
								 
							
						 
						
							
							
								
								Fix missing profile data in federation joins  
							
							 
							
							... 
							
							
							
							There was a regression where we stopped including profile data in
initial joins for rooms joined over federation. 
							
						 
						
							2015-11-12 16: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
							
						 
						
							 
							
							
							
								
							
								38d82edf0e 
								
							
								 
							
						 
						
							
							
								
								Allow guest users to join and message rooms  
							
							 
							
							
							
						 
						
							2015-11-10 16:57:13 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								0d63dc3ec9 
								
							
								 
							
						 
						
							
							
								
								Get display name from identity server, not client  
							
							 
							
							
							
						 
						
							2015-11-09 17:26:43 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								2cebe53545 
								
							
								 
							
						 
						
							
							
								
								Exchange 3pid invites for m.room.member invites  
							
							 
							
							
							
						 
						
							2015-11-05 16:43:19 +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
							
						 
						
							 
							
							
							
								
							
								771ca56c88 
								
							
								 
							
						 
						
							
							
								
								Remove more unused parameters  
							
							 
							
							
							
						 
						
							2015-11-02 15:31:57 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								56dbcd1524 
								
							
								 
							
						 
						
							
							
								
								Docs  
							
							 
							
							
							
						 
						
							2015-10-28 14:05:50 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								5cb298c934 
								
							
								 
							
						 
						
							
							
								
								Add room context api  
							
							 
							
							
							
						 
						
							2015-10-28 13:45:56 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								137fafce4e 
								
							
								 
							
						 
						
							
							
								
								Allow rejecting invites  
							
							 
							
							... 
							
							
							
							This is done by using the same /leave flow as you would use if you had
already accepted the invite and wanted to leave. 
							
						 
						
							2015-10-20 11:58:58 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								b8dd5b1a2d 
								
							
								 
							
						 
						
							
							
								
								Verify third party ID server certificates  
							
							 
							
							
							
						 
						
							2015-10-16 14:54:54 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								6ffbcf45c6 
								
							
								 
							
						 
						
							
							
								
								Use non-placeholder name for endpoint  
							
							 
							
							
							
						 
						
							2015-10-15 13:12:52 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								643b5fcdc8 
								
							
								 
							
						 
						
							
							
								
								Look for keys on the right objects  
							
							 
							
							
							
						 
						
							2015-10-15 13:10:30 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								14edea1aff 
								
							
								 
							
						 
						
							
							
								
								Move logic into handler  
							
							 
							
							
							
						 
						
							2015-10-13 17:47:58 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								17dffef5ec 
								
							
								 
							
						 
						
							
							
								
								Move event contents into third_party_layout field  
							
							 
							
							
							
						 
						
							2015-10-13 15:48:12 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								58e6a58eb7 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into daniel/3pidinvites  
							
							 
							
							
							
						 
						
							2015-10-05 10:33:41 -05:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								40017a9a11 
								
							
								 
							
						 
						
							
							
								
								Add 'trusted_private_chat' to room creation presets  
							
							 
							
							
							
						 
						
							2015-10-02 11:22:56 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d5e081c7ae 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatable  
							
							 
							
							
							
						 
						
							2015-10-02 10:33:49 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								5b3e9713dd 
								
							
								 
							
						 
						
							
							
								
								Implement third party identifier invites  
							
							 
							
							
							
						 
						
							2015-10-01 17:49:52 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								0ec78b360c 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #287  from matrix-org/erikj/canonical_alias  
							
							 
							
							... 
							
							
							
							Set m.room.canonical_alias on room creation. 
							
						 
						
							2015-09-30 17:14:55 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ecd0c0dfc5 
								
							
								 
							
						 
						
							
							
								
								Remove double indentation  
							
							 
							
							
							
						 
						
							2015-09-30 16:46:24 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								301141515a 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #288  from matrix-org/markjh/unused_definitions  
							
							 
							
							... 
							
							
							
							Remove some of the unused definitions from synapse 
							
						 
						
							2015-09-28 14:22:44 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								57338a9768 
								
							
								 
							
						 
						
							
							
								
								synapse/handlers/room.py:_should_invite_join was unused  
							
							 
							
							
							
						 
						
							2015-09-23 10:26:45 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								257fa1c53e 
								
							
								 
							
						 
						
							
							
								
								Set m.room.canonical_alias on room creation.  
							
							 
							
							
							
						 
						
							2015-09-23 10:07:31 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								dc6094b908 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #271  from matrix-org/erikj/default_history  
							
							 
							
							... 
							
							
							
							Change default history visibility for private rooms 
							
						 
						
							2015-09-23 09:21:00 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								3c166a24c5 
								
							
								 
							
						 
						
							
							
								
								Remove undocumented and unimplemented 'feedback' parameter from the Client-Server API  
							
							 
							
							
							
						 
						
							2015-09-09 16:05:09 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								bc8b25eb56 
								
							
								 
							
						 
						
							
							
								
								Allow users that have left the room to view the member list from the point they left  
							
							 
							
							
							
						 
						
							2015-09-09 15:42:16 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e530208e68 
								
							
								 
							
						 
						
							
							
								
								Change default history visibility for private rooms  
							
							 
							
							
							
						 
						
							2015-09-09 09:57:49 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a88e16152f 
								
							
								 
							
						 
						
							
							
								
								Add flag which disables federation of the room  
							
							 
							
							
							
						 
						
							2015-09-01 15:47:30 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								9b63def388 
								
							
								 
							
						 
						
							
							
								
								Add m.room.avatar to default power levels. Change default required power levels of such events to 50  
							
							 
							
							
							
						 
						
							2015-08-20 14:35:40 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								cbd053bb8f 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #233  from matrix-org/erikj/canonical_alias  
							
							 
							
							... 
							
							
							
							Add server side support for canonical aliases 
							
						 
						
							2015-08-20 11:26:09 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								daa01842f8 
								
							
								 
							
						 
						
							
							
								
								Don't get apservice interested rooms in RoomHandler.get_joined_rooms_for_users  
							
							 
							
							
							
						 
						
							2015-08-19 13:46:03 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d7272f8d9d 
								
							
								 
							
						 
						
							
							
								
								Add canonical alias to the default power levels  
							
							 
							
							
							
						 
						
							2015-08-19 12:03:09 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c456d17daf 
								
							
								 
							
						 
						
							
							
								
								Implement specifying custom initial state for /createRoom  
							
							 
							
							
							
						 
						
							2015-07-16 15:25:29 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								002a44ac1a 
								
							
								 
							
						 
						
							
							
								
								s/everyone_ops/original_invitees_have_ops/  
							
							 
							
							
							
						 
						
							2015-07-14 10:37:42 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b49a30a972 
								
							
								 
							
						 
						
							
							
								
								Capitalize contants  
							
							 
							
							
							
						 
						
							2015-07-14 10:20:31 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d5cc794598 
								
							
								 
							
						 
						
							
							
								
								Implement presets at room creation  
							
							 
							
							
							
						 
						
							2015-07-13 16:56:08 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								1a3255b507 
								
							
								 
							
						 
						
							
							
								
								Add m.room.history_visibility to newly created rooms' m.room.power_levels  
							
							 
							
							
							
						 
						
							2015-07-06 13:25:35 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4429e720ae 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of github.com:matrix-org/synapse into develop  
							
							 
							
							
							
						 
						
							2015-05-22 10:33:00 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								53447e9cd3 
								
							
								 
							
						 
						
							
							
								
								Add caches for things requested by the pushers  
							
							 
							
							
							
						 
						
							2015-05-21 16:41:39 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								0c894e1ebd 
								
							
								 
							
						 
						
							
							
								
								Throw error when creating room if alias contains whitespace #SYN-335  
							
							 
							
							
							
						 
						
							2015-05-14 13:11:28 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								a6fb2aa2a5 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #144  from matrix-org/erikj/logging_context  
							
							 
							
							... 
							
							
							
							Preserving logging contexts 
							
						 
						
							2015-05-12 15:23:50 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								95dedb866f 
								
							
								 
							
						 
						
							
							
								
								Unwrap defer.gatherResults failures  
							
							 
							
							
							
						 
						
							2015-05-12 13:14:29 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4df11b5039 
								
							
								 
							
						 
						
							
							
								
								Make get_current_token accept a direction parameter, which tells whether the source whether we want a token for going 'forwards' or 'backwards'  
							
							 
							
							
							
						 
						
							2015-05-12 10:28:10 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								da4ed08739 
								
							
								 
							
						 
						
							
							
								
								One too many lens  
							
							 
							
							
							
						 
						
							2015-05-01 13:29:38 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								9060dc6b59 
								
							
								 
							
						 
						
							
							
								
								Change public room list to use defer.gatherResults  
							
							 
							
							
							
						 
						
							2015-05-01 13:28:36 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								327ca883ec 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into postgres  
							
							 
							
							
							
						 
						
							2015-04-28 13:39:42 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6f8e2d517e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into postgres  
							
							 
							
							
							
						 
						
							2015-04-27 14:41:40 +01:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								48b6ee2b67 
								
							
								 
							
						 
						
							
							
								
								Create an 'invite' powerlevel when making new rooms  
							
							 
							
							
							
						 
						
							2015-04-21 21:07:35 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								24d21887ed 
								
							
								 
							
						 
						
							
							
								
								SYN-350: Don't ratelimit the individual events generated during room creation  
							
							 
							
							
							
						 
						
							2015-04-21 14:14:19 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								9a7f496298 
								
							
								 
							
						 
						
							
							
								
								Sanitize RoomMemberStore  
							
							 
							
							
							
						 
						
							2015-03-23 15:29:04 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								8e28db5cc9 
								
							
								 
							
						 
						
							
							
								
								Change room handlers get_rooms_for_user to get_joined_rooms_for_user. This uses the a storage api that is cached.  
							
							 
							
							
							
						 
						
							2015-03-09 16:43:09 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								dcec7175dc 
								
							
								 
							
						 
						
							
							
								
								Finish impl to get new events for AS. ASes should now be able to poll /events  
							
							 
							
							
							
						 
						
							2015-02-26 16:23:01 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								2d20466f9a 
								
							
								 
							
						 
						
							
							
								
								Add stub functions and work out execution flow to implement AS event stream polling.  
							
							 
							
							
							
						 
						
							2015-02-25 15:00:59 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ed877d6585 
								
							
								 
							
						 
						
							
							
								
								Remove debug logging  
							
							 
							
							
							
						 
						
							2015-02-11 16:50:46 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ddb816cf60 
								
							
								 
							
						 
						
							
							
								
								Don't unfreeze when using FreezeEvent.get_dict, as we are using a JSONEncoder that understands FrozenDict  
							
							 
							
							
							
						 
						
							2015-02-11 15:44:28 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e1515c3e91 
								
							
								 
							
						 
						
							
							
								
								Pass through list of room hosts from room alias query to federation so that it can retry against different room hosts  
							
							 
							
							
							
						 
						
							2015-02-05 13:44:42 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								7f6f3f9d62 
								
							
								 
							
						 
						
							
							
								
								Pass the current time to serialize event, rather than passing an  
							
							 
							
							... 
							
							
							
							HS and getting a clock from it and calling time_msec on the clock.
Remove the serialize_event method from the HS since it is no longer
needed. 
							
						 
						
							2015-01-26 16:11:28 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								1c06c48ce2 
								
							
								 
							
						 
						
							
							
								
								Replace hs.parse_roomid with RoomID.from_string  
							
							 
							
							
							
						 
						
							2015-01-23 11:55:12 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								5759bec43c 
								
							
								 
							
						 
						
							
							
								
								Replace hs.parse_userid with UserID.from_string  
							
							 
							
							
							
						 
						
							2015-01-23 11:47:15 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								333836ff92 
								
							
								 
							
						 
						
							
							
								
								PEP8 and pyflakes warnings  
							
							 
							
							
							
						 
						
							2015-01-07 16:18:12 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								4c68460392 
								
							
								 
							
						 
						
							
							
								
								SYN-154: Tweak how the m.room.create check is done.  
							
							 
							
							... 
							
							
							
							Don't perform the check in auth.is_host_in_room but instead do it in _do_join
and also assert that there are no m.room.members in the room before doing so. 
							
						 
						
							2015-01-07 16:09:00 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								9cb4f75d53 
								
							
								 
							
						 
						
							
							
								
								SYN-154: Better error messages when joining an unknown room by ID.  
							
							 
							
							... 
							
							
							
							The simple fix doesn't work here because room creation also involves
unknown room IDs. The check relies on the presence of m.room.create for
rooms being created, whereas bogus room IDs have no state events at all. 
							
						 
						
							2015-01-07 15:21:48 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								5e23a19204 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #28  from matrix-org/erikj-perf  
							
							 
							
							... 
							
							
							
							Database performance improvements. 
							
						 
						
							2015-01-06 13:33:40 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								adb04b1e57 
								
							
								 
							
						 
						
							
							
								
								Update copyright notices  
							
							 
							
							
							
						 
						
							2015-01-06 13:21:39 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								f0128f9600 
								
							
								 
							
						 
						
							
							
								
								Add RoomMemberStore.get_users_in_room, so that we can get the list of joined users without having to retrieve the full events  
							
							 
							
							
							
						 
						
							2015-01-06 10:55:43 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								efd27ff01b 
								
							
								 
							
						 
						
							
							
								
								Set a state_key for the topic and room name, otherwise they won't be treated as room state  
							
							 
							
							
							
						 
						
							2014-12-19 15:31:27 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								1e7f83b91d 
								
							
								 
							
						 
						
							
							
								
								Set display name when joining via alias  
							
							 
							
							
							
						 
						
							2014-12-19 12:31:46 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								5739e6c606 
								
							
								 
							
						 
						
							
							
								
								s/user_id/sender/  
							
							 
							
							
							
						 
						
							2014-12-19 11:43:46 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3c77d13aa5 
								
							
								 
							
						 
						
							
							
								
								Kill off synapse.api.events.*  
							
							 
							
							
							
						 
						
							2014-12-16 11:29:05 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								cf6e5f1dbf 
								
							
								 
							
						 
						
							
							
								
								Rename MessageHandler.handle_event. Add a few comments.  
							
							 
							
							
							
						 
						
							2014-12-15 17:01:12 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								65cdf4e724 
								
							
								 
							
						 
						
							
							
								
								Get current member state from current_state snapshot. Fix leave test.  
							
							 
							
							
							
						 
						
							2014-12-15 15:03:27 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								57e0e619f3 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor  
							
							 
							
							... 
							
							
							
							Conflicts:
	tests/handlers/test_room.py 
							
						 
						
							2014-12-15 14:45:59 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								f25764943c 
								
							
								 
							
						 
						
							
							
								
								Add a 'user_left_room' distributor signal analogous to 'user_joined_room'  
							
							 
							
							
							
						 
						
							2014-12-11 18:27:01 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4c682143c8 
								
							
								 
							
						 
						
							
							
								
								.from_string() no longer takes a HS  
							
							 
							
							
							
						 
						
							2014-12-10 18:00:49 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								95aa903ffa 
								
							
								 
							
						 
						
							
							
								
								Try and figure out how and why signatures are being changed.  
							
							 
							
							
							
						 
						
							2014-12-10 11:37:47 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								008303b245 
								
							
								 
							
						 
						
							
							
								
								PEP8  
							
							 
							
							
							
						 
						
							2014-12-09 14:49:11 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								5eca288d28 
								
							
								 
							
						 
						
							
							
								
								Fix joining from an invite  
							
							 
							
							
							
						 
						
							2014-12-09 14:47:27 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								609c31e8df 
								
							
								 
							
						 
						
							
							
								
								More bug fixes  
							
							 
							
							
							
						 
						
							2014-12-08 17:50:56 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ee3df06183 
								
							
								 
							
						 
						
							
							
								
								More bug fixes  
							
							 
							
							
							
						 
						
							2014-12-08 14:50:48 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e8323b9e34 
								
							
								 
							
						 
						
							
							
								
								More bug fixes  
							
							 
							
							
							
						 
						
							2014-12-08 10:16:18 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c31dba86ec 
								
							
								 
							
						 
						
							
							
								
								Convert rest and handlers to use new event structure  
							
							 
							
							
							
						 
						
							2014-12-04 15:50:01 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								5d7c9ab789 
								
							
								 
							
						 
						
							
							
								
								Begin converting things to use the new Event structure  
							
							 
							
							
							
						 
						
							2014-12-04 11:27:59 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6941a19715 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor  
							
							 
							
							
							
						 
						
							2014-12-03 11:56:49 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								307f94dcbe 
								
							
								 
							
						 
						
							
							
								
								Squash room_ids list to a set() to remove duplicates - with TODO marker as I have no idea /why/ the dups are happening in the first place  
							
							 
							
							
							
						 
						
							2014-12-02 20:51:12 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								9d53228158 
								
							
								 
							
						 
						
							
							
								
								Change DomainSpecificString so that it doesn't use a HomeServer object  
							
							 
							
							
							
						 
						
							2014-12-02 10:42:28 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								db9ce032a4 
								
							
								 
							
						 
						
							
							
								
								Fix pep8 codestyle warnings  
							
							 
							
							
							
						 
						
							2014-11-20 17:26:36 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								32090aee16 
								
							
								 
							
						 
						
							
							
								
								Add a few missing yields, Move deferred lists inside PreserveLoggingContext because they don't interact well with the logging contexts  
							
							 
							
							
							
						 
						
							2014-11-20 16:24:00 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								415ddf59bb 
								
							
								 
							
						 
						
							
							
								
								Don't add a 'prev' key to m.room.member messages  
							
							 
							
							
							
						 
						
							2014-11-19 17:59:51 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								b01dd76be1 
								
							
								 
							
						 
						
							
							
								
								SYN-149: Enable auth for events added during room creation since they should pass auth checks  
							
							 
							
							
							
						 
						
							2014-11-18 15:42:53 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								ae9c2ab165 
								
							
								 
							
						 
						
							
							
								
								SYN-149: Send join event immediately after the room create event  
							
							 
							
							
							
						 
						
							2014-11-18 15:29:48 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								a5b88c489e 
								
							
								 
							
						 
						
							
							
								
								Split out sending the room alias events from creating the alias so that we can do them in the right point when creating a room  
							
							 
							
							
							
						 
						
							2014-11-18 15:03:13 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								cf45e57d9c 
								
							
								 
							
						 
						
							
							
								
								SYN-148: Add the alias after creating the room  
							
							 
							
							
							
						 
						
							2014-11-17 16:37:33 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6fea478d2e 
								
							
								 
							
						 
						
							
							
								
								Fix bugs with invites/joins across federatiom.  
							
							 
							
							... 
							
							
							
							Both in terms of auth and not trying to fetch missing PDUs for invites,
joins etc. 
							
						 
						
							2014-11-12 11:24:11 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d2fb2b8095 
								
							
								 
							
						 
						
							
							
								
								Implement invite part of invite join dance  
							
							 
							
							
							
						 
						
							2014-11-07 13:41:00 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								351c64e99e 
								
							
								 
							
						 
						
							
							
								
								Amalgamate all power levels.  
							
							 
							
							... 
							
							
							
							Remove concept of reqired power levels, something similiar can be done
using the new power level event. 
							
						 
						
							2014-11-06 16:59:13 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4317c8e583 
								
							
								 
							
						 
						
							
							
								
								Implement new replace_state and changed prev_state  
							
							 
							
							... 
							
							
							
							`prev_state` is now a list of previous state ids, similiar to
prev_events. `replace_state` now points to what we think was replaced. 
							
						 
						
							2014-11-06 15:10:55 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								dfb3d21a6d 
								
							
								 
							
						 
						
							
							
								
								Fix room handler tests  
							
							 
							
							
							
						 
						
							2014-11-04 17:12:39 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ef9c4476a0 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization  
							
							 
							
							
							
						 
						
							2014-10-30 11:18:28 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								d6bcffa929 
								
							
								 
							
						 
						
							
							
								
								Construct a source-specific 'SourcePaginationConfig' to pass into get_pagination_rows; meaning each source doesn't have to care about its own name any more  
							
							 
							
							
							
						 
						
							2014-10-29 16:16:01 +00:00