Erik Johnston
							
						 
						
							 
							
							
							
								
							
								9c7db2491b 
								
							
								 
							
						 
						
							
							
								
								Fix removing users  
							
							 
							
							
							
						 
						
							2017-06-01 11:36:50 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								0fe6f3c521 
								
							
								 
							
						 
						
							
							
								
								Bug fixes and logging  
							
							 
							
							... 
							
							
							
							- Check if room is public when a user joins before adding to user dir
- Fix typo of field name "content.join_rules" -> "content.join_rule" 
							
						 
						
							2017-06-01 11:09:49 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								cc7609aa9f 
								
							
								 
							
						 
						
							
							
								
								Comment briefly on how we keep user_directory up to date  
							
							 
							
							
							
						 
						
							2017-05-31 17:11:18 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b2d8d07109 
								
							
								 
							
						 
						
							
							
								
								Lifts things into separate function  
							
							 
							
							
							
						 
						
							2017-05-31 17:00:24 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								f9791498ae 
								
							
								 
							
						 
						
							
							
								
								Typos  
							
							 
							
							
							
						 
						
							2017-05-31 16:50:57 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								f091061711 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							 
							
							
							
						 
						
							2017-05-31 16:34:40 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								dc51af3d03 
								
							
								 
							
						 
						
							
							
								
								Pull max id from correct table  
							
							 
							
							
							
						 
						
							2017-05-31 15:13:49 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								350622a107 
								
							
								 
							
						 
						
							
							
								
								Handle the server leaving a public room  
							
							 
							
							
							
						 
						
							2017-05-31 15:11:36 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								63fda37e20 
								
							
								 
							
						 
						
							
							
								
								Add comments  
							
							 
							
							
							
						 
						
							2017-05-31 15:00:29 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3b5f22ca40 
								
							
								 
							
						 
						
							
							
								
								Add search  
							
							 
							
							
							
						 
						
							2017-05-31 14:00:01 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b5db4ed5f6 
								
							
								 
							
						 
						
							
							
								
								Update room column when room becomes unpublic  
							
							 
							
							
							
						 
						
							2017-05-31 13:40:28 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								168524543f 
								
							
								 
							
						 
						
							
							
								
								Add call later  
							
							 
							
							
							
						 
						
							2017-05-31 11:59:36 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3e123b8497 
								
							
								 
							
						 
						
							
							
								
								Start later  
							
							 
							
							
							
						 
						
							2017-05-31 11:56:27 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								42137efde7 
								
							
								 
							
						 
						
							
							
								
								Don't go round in circles  
							
							 
							
							
							
						 
						
							2017-05-31 11:55:13 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								eeb2f9e546 
								
							
								 
							
						 
						
							
							
								
								Add user_directory to database  
							
							 
							
							
							
						 
						
							2017-05-31 11:51:01 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								23da638360 
								
							
								 
							
						 
						
							
							
								
								Fix typing tests  
							
							 
							
							
							
						 
						
							2017-05-26 10:02:04 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								11f139a647 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2247  from matrix-org/erikj/auth_event  
							
							 
							
							... 
							
							
							
							Only store event_auth for state events 
							
						 
						
							2017-05-24 16:46:34 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c049472b8a 
								
							
								 
							
						 
						
							
							
								
								Only store event_auth for state events  
							
							 
							
							
							
						 
						
							2017-05-24 15:23:31 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b4f59c7e27 
								
							
								 
							
						 
						
							
							
								
								Add count of one time keys to sync stream  
							
							 
							
							
							
						 
						
							2017-05-19 15:47:55 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								cafe659f72 
								
							
								 
							
						 
						
							
							
								
								Store ActionGenerator in HomeServer  
							
							 
							
							
							
						 
						
							2017-05-19 10:09:56 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								66d8ffabbd 
								
							
								 
							
						 
						
							
							
								
								Faster push rule calculation via push specific cache  
							
							 
							
							... 
							
							
							
							We add a push rule specific cache that ensures that we can reuse
calculated push rules appropriately when a user join/leaves. 
							
						 
						
							2017-05-17 16:55:40 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6fa8148ccb 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2228  from matrix-org/erikj/speed_up_get_hosts  
							
							 
							
							... 
							
							
							
							Speed up get_joined_hosts 
							
						 
						
							2017-05-16 17:40:55 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								13f540ef1b 
								
							
								 
							
						 
						
							
							
								
								Speed up get_joined_hosts  
							
							 
							
							
							
						 
						
							2017-05-16 16:05:22 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ec5c4499f4 
								
							
								 
							
						 
						
							
							
								
								Make presence use cached users/hosts in room  
							
							 
							
							
							
						 
						
							2017-05-16 16:01:43 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								ccad2ed824 
								
							
								 
							
						 
						
							
							
								
								Modify condition on empty localpart  
							
							 
							
							
							
						 
						
							2017-05-10 17:34:30 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								369195caa5 
								
							
								 
							
						 
						
							
							
								
								Modify register/available to be GET with query param  
							
							 
							
							... 
							
							
							
							- GET is now the method for register/available
- a query parameter "username" is now used
Also, empty usernames are now handled with an error message on registration or via register/available: `User ID cannot be empty` 
							
						 
						
							2017-05-10 17:23:55 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a3648f84b2 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2208  from matrix-org/erikj/ratelimit_overrid  
							
							 
							
							... 
							
							
							
							Add per user ratelimiting overrides 
							
						 
						
							2017-05-10 15:54:48 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b990b2fce5 
								
							
								 
							
						 
						
							
							
								
								Add per user ratelimiting overrides  
							
							 
							
							
							
						 
						
							2017-05-10 11:05:43 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								aedaba018f 
								
							
								 
							
						 
						
							
							
								
								Replace some instances of preserve_context_over_deferred  
							
							 
							
							
							
						 
						
							2017-05-09 19:04:56 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								de042b3b88 
								
							
								 
							
						 
						
							
							
								
								Do some logging when one-time-keys get claimed  
							
							 
							
							... 
							
							
							
							might help us figure out if https://github.com/vector-im/riot-web/issues/3868 
has happened. 
							
						 
						
							2017-05-09 19:04:56 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								a7e9d8762d 
								
							
								 
							
						 
						
							
							
								
								Allow clients to upload one-time-keys with new sigs  
							
							 
							
							... 
							
							
							
							When a client retries a key upload, don't give an error if the signature has
changed (but the key is the same).
Fixes https://github.com/vector-im/riot-android/issues/1208 , hopefully. 
							
						 
						
							2017-05-09 19:04:56 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								27c28eaa27 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2190  from matrix-org/erikj/mark_remote_as_back_more  
							
							 
							
							... 
							
							
							
							Always mark remotes as up if we receive a signed request from them 
							
						 
						
							2017-05-05 14:08:12 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								653d90c1a5 
								
							
								 
							
						 
						
							
							
								
								Comment  
							
							 
							
							
							
						 
						
							2017-05-05 14:01:17 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								7b222fc56e 
								
							
								 
							
						 
						
							
							
								
								Remove redundant reset of destination timers  
							
							 
							
							
							
						 
						
							2017-05-05 11:14:09 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b843631d71 
								
							
								 
							
						 
						
							
							
								
								Add comment and TODO  
							
							 
							
							
							
						 
						
							2017-05-05 10:59:32 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								f346048a6e 
								
							
								 
							
						 
						
							
							
								
								Handle exceptions thrown in handling remote device list updates  
							
							 
							
							
							
						 
						
							2017-05-05 10:34:10 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								60833c8978 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2147  from matrix-org/dbkr/http_request_propagate_error  
							
							 
							
							... 
							
							
							
							Propagate errors sensibly from proxied IS requests 
							
						 
						
							2017-05-03 11:23:25 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								0c27383dd7 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2170  from matrix-org/erikj/fed_hole_state  
							
							 
							
							... 
							
							
							
							Don't fetch state for missing events that we fetched 
							
						 
						
							2017-05-03 10:49:37 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ef862186dd 
								
							
								 
							
						 
						
							
							
								
								Merge together redundant calculations/logging  
							
							 
							
							
							
						 
						
							2017-05-03 10:06:43 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3e5a62ecd8 
								
							
								 
							
						 
						
							
							
								
								Add more granular event send metrics  
							
							 
							
							
							
						 
						
							2017-05-02 14:23:26 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2347efc065 
								
							
								 
							
						 
						
							
							
								
								Fixup  
							
							 
							
							
							
						 
						
							2017-04-28 12:46:53 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								9b147cd730 
								
							
								 
							
						 
						
							
							
								
								Remove unncessary call in _get_missing_events_for_pdu  
							
							 
							
							
							
						 
						
							2017-04-28 11:55:25 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3a9f5bf6dd 
								
							
								 
							
						 
						
							
							
								
								Don't fetch state for missing events that we fetched  
							
							 
							
							
							
						 
						
							2017-04-28 11:26:46 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								25a96e0c63 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2163  from matrix-org/erikj/fix_invite_state  
							
							 
							
							... 
							
							
							
							Fix invite state to always include all events 
							
						 
						
							2017-04-27 17:36:30 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								87ae59f5e9 
								
							
								 
							
						 
						
							
							
								
								Typo  
							
							 
							
							
							
						 
						
							2017-04-27 15:16:21 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e42b4ebf0f 
								
							
								 
							
						 
						
							
							
								
								Add some extra logging for edge cases of federation  
							
							 
							
							
							
						 
						
							2017-04-27 14:38:21 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								34e682d385 
								
							
								 
							
						 
						
							
							
								
								Fix invite state to always include all events  
							
							 
							
							
							
						 
						
							2017-04-26 16:18:08 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								82ae0238f9 
								
							
								 
							
						 
						
							
							
								
								Revert accidental commit  
							
							 
							
							
							
						 
						
							2017-04-26 11:43:16 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								81804909d3 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into dbkr/http_request_propagate_error  
							
							 
							
							
							
						 
						
							2017-04-26 11:31:55 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								1a9255c12e 
								
							
								 
							
						 
						
							
							
								
								Use CodeMessageException subclass instead  
							
							 
							
							... 
							
							
							
							Parse json errors from get_json client methods and throw special
errors. 
							
						 
						
							2017-04-25 19:30:55 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								2e165295b7 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into dbkr/http_request_propagate_error  
							
							 
							
							
							
						 
						
							2017-04-21 11:35:52 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								a90a0f5c8a 
								
							
								 
							
						 
						
							
							
								
								Propagate errors sensibly from proxied IS requests  
							
							 
							
							... 
							
							
							
							When we're proxying Matrix endpoints, parse out Matrix error
responses and turn them into SynapseErrors so they can be
propagated sensibly upstream. 
							
						 
						
							2017-04-21 11:32:48 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								0cdb32fc43 
								
							
								 
							
						 
						
							
							
								
								Remove redundant try/except clauses  
							
							 
							
							... 
							
							
							
							The `except SynapseError` clauses were pointless because the wrapped functions
would never throw a `SynapseError` (they either throw a `CodeMessageException`
or a `RuntimeError`).
The `except CodeMessageException` is now also pointless because the caller
treats all exceptions equally, so we may as well just throw the
`CodeMessageException`. 
							
						 
						
							2017-04-21 01:32:01 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								838810b76a 
								
							
								 
							
						 
						
							
							
								
								Broaden the conditions for locally_rejecting invites  
							
							 
							
							... 
							
							
							
							The logic for marking invites as locally rejected was all well and good, but
didn't happen when the remote server returned a 500, or wasn't reachable, or
had no DNS, or whatever.
Just expand the except clause to catch everything.
Fixes https://github.com/matrix-org/synapse/issues/761 . 
							
						 
						
							2017-04-21 01:31:37 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								736b9a4784 
								
							
								 
							
						 
						
							
							
								
								Remove redundant function  
							
							 
							
							... 
							
							
							
							inline `reject_remote_invite`, which only existed to make tracing the callflow
more difficult. 
							
						 
						
							2017-04-21 01:31:09 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								3fb8784c92 
								
							
								 
							
						 
						
							
							
								
								m.read_marker -> m.fully_read ( #2128 )  
							
							 
							
							... 
							
							
							
							Also:
 - change the REST endpoint to have a "S" on the end (so it's now /read_markers)
 - change the content of the m.read_up_to event to have the key "event_id" instead of "marker". 
							
						 
						
							2017-04-18 17:46:15 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								78f0ddbfad 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2120  from matrix-org/luke/read-markers  
							
							 
							
							... 
							
							
							
							Implement Read Marker API 
							
						 
						
							2017-04-13 14:21:31 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								b9557064bf 
								
							
								 
							
						 
						
							
							
								
								Simplify is_event_after logic  
							
							 
							
							
							
						 
						
							2017-04-12 14:36:20 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								247c736b9b 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2115  from matrix-org/erikj/dedupe_federation_repl  
							
							 
							
							... 
							
							
							
							Reduce federation replication traffic 
							
						 
						
							2017-04-12 11:07:13 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								69a18514e9 
								
							
								 
							
						 
						
							
							
								
								Only notify user, not entire room  
							
							 
							
							
							
						 
						
							2017-04-12 10:50:37 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								122cd52ce4 
								
							
								 
							
						 
						
							
							
								
								Remove comment, simplify null-guard  
							
							 
							
							
							
						 
						
							2017-04-12 10:48:32 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c7ddb5ef7a 
								
							
								 
							
						 
						
							
							
								
								Reuse get_interested_parties  
							
							 
							
							
							
						 
						
							2017-04-12 10:16:26 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								77fb2b72ae 
								
							
								 
							
						 
						
							
							
								
								Handle no previous RM  
							
							 
							
							
							
						 
						
							2017-04-12 09:47:29 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								867822fa1e 
								
							
								 
							
						 
						
							
							
								
								flake8  
							
							 
							
							
							
						 
						
							2017-04-11 17:36:04 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								73880268ef 
								
							
								 
							
						 
						
							
							
								
								Refactor event ordering check to events store  
							
							 
							
							
							
						 
						
							2017-04-11 17:34:09 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								131485ef66 
								
							
								 
							
						 
						
							
							
								
								Copyright  
							
							 
							
							
							
						 
						
							2017-04-11 17:33:51 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								0127423027 
								
							
								 
							
						 
						
							
							
								
								flake8  
							
							 
							
							
							
						 
						
							2017-04-11 17:07:07 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								414522aed5 
								
							
								 
							
						 
						
							
							
								
								Move get_interested_parties  
							
							 
							
							
							
						 
						
							2017-04-11 15:33:26 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2be8a281d2 
								
							
								 
							
						 
						
							
							
								
								Comments  
							
							 
							
							
							
						 
						
							2017-04-11 15:28:24 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6308ac45b0 
								
							
								 
							
						 
						
							
							
								
								Move get_interested_remotes back to presence handler  
							
							 
							
							
							
						 
						
							2017-04-11 15:19:26 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								d892079844 
								
							
								 
							
						 
						
							
							
								
								Finish implementing RM endpoint  
							
							 
							
							... 
							
							
							
							- This change causes a 405 to be sent if "m.read_marker" is set via /account_data
 - This also fixes-up the RM endpoint so that it actually Works. 
							
						 
						
							2017-04-11 15:01:39 +01:00  
						
					 
				
					
						
							
							
								 
								lukebarnard
							
						 
						
							 
							
							
							
								
							
								e263c26690 
								
							
								 
							
						 
						
							
							
								
								Initial commit of RM server-side impl  
							
							 
							
							... 
							
							
							
							(See https://docs.google.com/document/d/1UWqdS-e1sdwkLDUY0wA4gZyIkRp-ekjsLZ8k6g_Zvso/edit#heading=h.lndohpg8at5u ) 
							
						 
						
							2017-04-11 11:55:30 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								f3cf3ff8b6 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of github.com:matrix-org/synapse into develop  
							
							 
							
							
							
						 
						
							2017-04-11 11:13:32 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								29574fd5b3 
								
							
								 
							
						 
						
							
							
								
								Reduce federation presence replication traffic  
							
							 
							
							... 
							
							
							
							This is mainly done by moving the calculation of where to send presence
updates from the presence handler to the transaction queue, so we only
need to send the presence event (and not the destinations) across the
replication connection. Before we were duplicating by sending the full
state across once per destination. 
							
						 
						
							2017-04-10 16:48:30 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								64765e5199 
								
							
								 
							
						 
						
							
							
								
								When we do an invite rejection, save the signed leave event to the db  
							
							 
							
							... 
							
							
							
							During a rejection of an invite received over federation, we ask a remote
server to make us a `leave` event, then sign it, then send that with
`send_leave`.
We were saving the *unsigned* version of the event (which has a different event
id to the signed version) to our db (and sending it to the clients), whereas
other servers in the room will have seen the *signed* version. We're not aware
of any actual problems that caused, except that it makes the database confusing
to look at and generally leaves the room in a weird state. 
							
						 
						
							2017-04-07 14:39:32 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								98ce212093 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2103  from matrix-org/erikj/no-double-encode  
							
							 
							
							... 
							
							
							
							Don't double encode replication data 
							
						 
						
							2017-04-07 09:39:52 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								877c029c16 
								
							
								 
							
						 
						
							
							
								
								Use iteritems  
							
							 
							
							
							
						 
						
							2017-04-06 15:51:22 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								96b9b6c127 
								
							
								 
							
						 
						
							
							
								
								Don't double json encode typing replication data  
							
							 
							
							
							
						 
						
							2017-04-05 11:34:20 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								62b89daac6 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/repl_tcp_server  
							
							 
							
							
							
						 
						
							2017-04-04 09:46:16 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								773e64cc1a 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2095  from matrix-org/rav/cull_log_preserves  
							
							 
							
							... 
							
							
							
							Cull spurious PreserveLoggingContexts 
							
						 
						
							2017-04-03 17:02:25 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								30bcbf775a 
								
							
								 
							
						 
						
							
							
								
								Accept join events from all servers  
							
							 
							
							... 
							
							
							
							Make sure that we accept join events from any server, rather than just the
origin server, to make the federation join dance work correctly.
(Fixes  #1893 ). 
							
						 
						
							2017-04-03 15:58:07 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								7eb9f34cc3 
								
							
								 
							
						 
						
							
							
								
								Remove spurious yield  
							
							 
							
							... 
							
							
							
							In `MessageHandler`, remove `yield` on call to `Notifier.on_new_room_event`:
it doesn't return anything anyway. 
							
						 
						
							2017-04-03 15:44:19 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								0b08c48fc5 
								
							
								 
							
						 
						
							
							
								
								Remove more spurious `PreserveLoggingContext`s  
							
							 
							
							... 
							
							
							
							Remove `PreserveLoggingContext` around calls to `Notifier.on_new_room_event`;
there is no problem if the logcontext is set when calling it. 
							
						 
						
							2017-04-03 15:43:37 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								36d2b66f90 
								
							
								 
							
						 
						
							
							
								
								Add a timestamp to USER_SYNC command  
							
							 
							
							... 
							
							
							
							This timestamp is used to indicate when the user last sync'd 
							
						 
						
							2017-03-31 15:42:22 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								9d0170ac6c 
								
							
								 
							
						 
						
							
							
								
								Fix up presence  
							
							 
							
							
							
						 
						
							2017-03-31 11:36:32 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								63fcc42990 
								
							
								 
							
						 
						
							
							
								
								Remove user from process_presence when stops syncing  
							
							 
							
							
							
						 
						
							2017-03-30 14:26:08 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e9dd8370b0 
								
							
								 
							
						 
						
							
							
								
								Add functions to presence to support remote syncs  
							
							 
							
							... 
							
							
							
							The TCP replication protocol streams deltas of who has started or
stopped syncing. This is different from the HTTP API which periodically
sends the full list of users who are syncing. This commit adds support
for the new TCP style of sending deltas. 
							
						 
						
							2017-03-30 13:25:14 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								24d35ab47b 
								
							
								 
							
						 
						
							
							
								
								Add new storage functions for new replication  
							
							 
							
							... 
							
							
							
							The new replication protocol will keep all the streams separate, rather
than muxing multiple streams into one. 
							
						 
						
							2017-03-30 11:48:35 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								7fc1f1e2b6 
								
							
								 
							
						 
						
							
							
								
								Cache hosts in room  
							
							 
							
							
							
						 
						
							2017-03-24 11:46:24 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								9397edb28b 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2050  from matrix-org/rav/federation_backoff  
							
							 
							
							... 
							
							
							
							push federation retry limiter down to matrixfederationclient 
							
						 
						
							2017-03-23 22:27:01 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								5a16cb4bf0 
								
							
								 
							
						 
						
							
							
								
								Ignore backoff history for invites, aliases, and roomdirs  
							
							 
							
							... 
							
							
							
							Add a param to the federation client which lets us ignore historical backoff
data for federation queries, and set it for a handful of operations. 
							
						 
						
							2017-03-23 12:23:22 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								4bd597d9fc 
								
							
								 
							
						 
						
							
							
								
								push federation retry limiter down to matrixfederationclient  
							
							 
							
							... 
							
							
							
							rather than having to instrument everywhere we make a federation call,
make the MatrixFederationHttpClient manage the retry limiter. 
							
						 
						
							2017-03-23 09:28:46 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								e08f81d96a 
								
							
								 
							
						 
						
							
							
								
								Add a missing yield in device key upload  
							
							 
							
							... 
							
							
							
							(this would only very very rarely actually be a useful thing, so the main
problem was the logcontext leak...) 
							
						 
						
							2017-03-23 00:16:43 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								eddce9d74a 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2027  from matrix-org/rav/logcontext_leaks  
							
							 
							
							... 
							
							
							
							A few fixes to logcontext things 
							
						 
						
							2017-03-20 11:53:36 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								f40c2db05a 
								
							
								 
							
						 
						
							
							
								
								Stop preserve_fn leaking context into the reactor  
							
							 
							
							... 
							
							
							
							Fix a bug in ``logcontext.preserve_fn`` which made it leak context into the
reactor, and add a test for it.
Also, get rid of ``logcontext.reset_context_after_deferred``, which tried to do
the same thing but had its own, different, set of bugs. 
							
						 
						
							2017-03-18 00:07:43 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								5068fb16a5 
								
							
								 
							
						 
						
							
							
								
								Refactoring and cleanups  
							
							 
							
							... 
							
							
							
							A few non-functional changes:
* A bunch of docstrings to document types
* Split `EventsStore._persist_events_txn` up a bit. Hopefully it's a bit more
  readable.
* Rephrase `EventFederationStore._update_min_depth_for_room_txn` to avoid
  mind-bending conditional.
* Rephrase rejected/outlier conditional in `_update_outliers_txn` to avoid
  mind-bending conditional. 
							
						 
						
							2017-03-17 15:06:07 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								2abe85d50e 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2016  from matrix-org/rav/queue_pdus_during_join  
							
							 
							
							... 
							
							
							
							Queue up federation PDUs while a room join is in progress 
							
						 
						
							2017-03-17 11:32:44 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								da146657c9 
								
							
								 
							
						 
						
							
							
								
								Comments  
							
							 
							
							
							
						 
						
							2017-03-16 13:04:07 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a158c36a8a 
								
							
								 
							
						 
						
							
							
								
								Comment  
							
							 
							
							
							
						 
						
							2017-03-16 11:57:45 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6957bfdca6 
								
							
								 
							
						 
						
							
							
								
								Don't recreate so many sets  
							
							 
							
							
							
						 
						
							2017-03-16 11:54:26 +00:00