fa72803490 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of github.com:matrix-org/synapse into develop  
							
							
							
						 
						
							2018-03-19 11:41:01 +00:00  
				
					
						
							
							
								 
						
							
							
								926ba76e23 
								
							
								 
							
						 
						
							
							
								
								Replace ujson with simplejson  
							
							
							
						 
						
							2018-03-15 23:43:31 +00:00  
				
					
						
							
							
								 
						
							
							
								d0fcc48f9d 
								
							
								 
							
						 
						
							
							
								
								extra_users is actually a list of UserIDs  
							
							
							
						 
						
							2018-03-13 11:20:06 +00:00  
				
					
						
							
							
								 
						
							
							
								e48c7aac4d 
								
							
								 
							
						 
						
							
							
								
								Add transactional API to history purge  
							
							... 
							
							
							
							Make the purge request return quickly, and allow scripts to poll for updates. 
							
						 
						
							2018-03-12 16:22:55 +00:00  
				
					
						
							
							
								 
						
							
							
								1708412f56 
								
							
								 
							
						 
						
							
							
								
								Return an error when doing two purges on a room  
							
							... 
							
							
							
							Queuing up purges doesn't sound like a good thing. 
							
						 
						
							2018-03-12 16:22:54 +00:00  
				
					
						
							
							
								 
						
							
							
								f8bfcd7e0d 
								
							
								 
							
						 
						
							
							
								
								Provide a means to pass a timestamp to purge_history  
							
							
							
						 
						
							2018-03-05 14:37:23 +00:00  
				
					
						
							
							
								 
						
							
							
								f381d63813 
								
							
								 
							
						 
						
							
							
								
								Check event auth on the worker  
							
							
							
						 
						
							2018-03-01 10:18:37 +00:00  
				
					
						
							
							
								 
						
							
							
								6b8604239f 
								
							
								 
							
						 
						
							
							
								
								Correctly send ratelimit and extra_users params  
							
							
							
						 
						
							2018-03-01 10:08:39 +00:00  
				
					
						
							
							
								 
						
							
							
								f756f961ea 
								
							
								 
							
						 
						
							
							
								
								Fixup comments  
							
							
							
						 
						
							2018-03-01 10:05:27 +00:00  
				
					
						
							
							
								 
						
							
							
								28e973ac11 
								
							
								 
							
						 
						
							
							
								
								Calculate push actions on worker  
							
							
							
						 
						
							2018-02-28 18:02:30 +00:00  
				
					
						
							
							
								 
						
							
							
								b96278d6fe 
								
							
								 
							
						 
						
							
							
								
								Ensure that we delete staging push actions on errors  
							
							
							
						 
						
							2018-02-15 15:47:06 +00:00  
				
					
						
							
							
								 
						
							
							
								c0c9327fe0 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2854  from matrix-org/erikj/event_create_worker  
							
							... 
							
							
							
							Create a worker for event creation 
							
						 
						
							2018-02-13 18:07:10 +00:00  
				
					
						
							
							
								 
						
							
							
								10b34dbb9a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2858  from matrix-org/rav/purge_updates  
							
							... 
							
							
							
							delete_local_events for purge_room_history 
							
						 
						
							2018-02-09 14:11:00 +00:00  
				
					
						
							
							
								 
						
							
							
								74fcbf741b 
								
							
								 
							
						 
						
							
							
								
								delete_local_events for purge_history  
							
							... 
							
							
							
							Add a flag which makes the purger delete local events 
							
						 
						
							2018-02-09 13:07:41 +00:00  
				
					
						
							
							
								 
						
							
							
								671540dccf 
								
							
								 
							
						 
						
							
							
								
								rename delete_old_state -> purge_history  
							
							... 
							
							
							
							(beacause it deletes more than state) 
							
						 
						
							2018-02-09 13:07:41 +00:00  
				
					
						
							
							
								 
						
							
							
								50fe92cd26 
								
							
								 
							
						 
						
							
							
								
								Move presence handling into handle_new_client_event  
							
							... 
							
							
							
							As we want to have it run on the main synapse instance 
							
						 
						
							2018-02-07 10:34:09 +00:00  
				
					
						
							
							
								 
						
							
							
								24dd73028a 
								
							
								 
							
						 
						
							
							
								
								Add replication http endpoint for event sending  
							
							
							
						 
						
							2018-02-07 10:32:32 +00:00  
				
					
						
							
							
								 
						
							
							
								e3624fad5f 
								
							
								 
							
						 
						
							
							
								
								Remove pointless ratelimit check  
							
							... 
							
							
							
							The intention was for the check to be called as early as possible in the
request, but actually was called just before the main ratelimit check,
so was fairly pointless. 
							
						 
						
							2018-02-07 10:30:25 +00:00  
				
					
						
							
							
								 
						
							
							
								3e1e69ccaf 
								
							
								 
							
						 
						
							
							
								
								Update copyright  
							
							
							
						 
						
							2018-02-06 16:40:38 +00:00  
				
					
						
							
							
								 
						
							
							
								770b2252ca 
								
							
								 
							
						 
						
							
							
								
								s/_create_new_client_event/create_new_client_event/  
							
							
							
						 
						
							2018-02-06 16:40:30 +00:00  
				
					
						
							
							
								 
						
							
							
								5ff3d23564 
								
							
								 
							
						 
						
							
							
								
								Split event creation into a separate handler  
							
							
							
						 
						
							2018-02-05 16:01:48 +00:00  
				
					
						
							
							
								 
						
							
							
								eaaabc6c4f 
								
							
								 
							
						 
						
							
							
								
								replace 'except:' with 'except Exception:'  
							
							... 
							
							
							
							what could possibly go wrong 
							
						 
						
							2017-10-23 15:52:32 +01:00  
				
					
						
							
							
								 
						
							
							
								b78bae2d51 
								
							
								 
							
						 
						
							
							
								
								fix isinstance  
							
							
							
						 
						
							2017-10-11 14:49:09 +01:00  
				
					
						
							
							
								 
						
							
							
								c3b7a45e84 
								
							
								 
							
						 
						
							
							
								
								Allow error strings from spam checker  
							
							
							
						 
						
							2017-10-11 14:39:22 +01:00  
				
					
						
							
							
								 
						
							
							
								535cc49f27 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2466  from matrix-org/erikj/groups_merged  
							
							... 
							
							
							
							Initial Group Implementation 
							
						 
						
							2017-10-11 13:20:07 +01:00  
				
					
						
							
							
								 
						
							
							
								bc7f3eb32f 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2483  from jeremycline/unfreeze-ujson-dump  
							
							... 
							
							
							
							Unfreeze event before serializing with ujson 
							
						 
						
							2017-10-11 13:18:52 +01:00  
				
					
						
							
							
								 
						
							
							
								27955056e0 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into erikj/groups_merged  
							
							
							
						 
						
							2017-10-02 16:20:41 +01:00  
				
					
						
							
							
								 
						
							
							
								cafb8de132 
								
									
								
							
								 
							
						 
						
							
							
								
								Unfreeze event before serializing with ujson  
							
							... 
							
							
							
							In newer versions of https://github.com/esnme/ultrajson , ujson does not
serialize frozendicts (introduced in esnme/ultrajson@53f85b1 ). Although
the PyPI version is still 1.35, Fedora ships with a build from commit
esnme/ultrajson@2f1d487 . This causes the serialization to fail if the
distribution-provided package is used.
This runs the event through the unfreeze utility before serializing it.
Thanks to @ignatenkobrain for tracking down the root cause.
fixes  #2351 
Signed-off-by: Jeremy Cline <jeremy@jcline.org> 
							
						 
						
							2017-09-30 11:22:37 -04:00  
				
					
						
							
							
								 
						
							
							
								8090fd4664 
								
							
								 
							
						 
						
							
							
								
								Fix /joined_members to work with AS users  
							
							
							
						 
						
							2017-09-28 10:09:32 +01:00  
				
					
						
							
							
								 
						
							
							
								adec03395d 
								
							
								 
							
						 
						
							
							
								
								Fix bug where /joined_members didn't check user was in room  
							
							
							
						 
						
							2017-09-27 15:14:39 +01:00  
				
					
						
							
							
								 
						
							
							
								6cd5fcd536 
								
							
								 
							
						 
						
							
							
								
								Make the spam checker a module  
							
							
							
						 
						
							2017-09-26 19:20:23 +01:00  
				
					
						
							
							
								 
						
							
							
								5ed109d59f 
								
							
								 
							
						 
						
							
							
								
								PoC for filtering spammy events ( #2456 )  
							
							... 
							
							
							
							Demonstration of how you might add some hooks to filter out spammy events. 
							
						 
						
							2017-09-19 12:20:11 +01:00  
				
					
						
							
							
								 
						
							
							
								bf81f3cf2c 
								
							
								 
							
						 
						
							
							
								
								Split out profile handler to fix tests  
							
							
							
						 
						
							2017-08-25 14:34:56 +01:00  
				
					
						
							
							
								 
						
							
							
								5a7f561a9b 
								
							
								 
							
						 
						
							
							
								
								Fix bug where pusherpool didn't start and broke some rooms  
							
							... 
							
							
							
							Since we didn't instansiate the PusherPool at start time it could fail
at run time, which it did for some users.
This may or may not fix things for those users, but it should happen at
start time and stop the server from starting. 
							
						 
						
							2017-07-06 17:55:51 +01:00  
				
					
						
							
							
								 
						
							
							
								1bce3e6b35 
								
							
								 
							
						 
						
							
							
								
								Remove unused variables  
							
							
							
						 
						
							2017-06-26 14:03:27 +01:00  
				
					
						
							
							
								 
						
							
							
								fcf01dd88e 
								
							
								 
							
						 
						
							
							
								
								Reject local events that don't round trip the DB  
							
							
							
						 
						
							2017-06-19 11:33:40 +01:00  
				
					
						
							
							
								 
						
							
							
								cafe659f72 
								
							
								 
							
						 
						
							
							
								
								Store ActionGenerator in HomeServer  
							
							
							
						 
						
							2017-05-19 10:09:56 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								b990b2fce5 
								
							
								 
							
						 
						
							
							
								
								Add per user ratelimiting overrides  
							
							
							
						 
						
							2017-05-10 11:05:43 +01:00  
				
					
						
							
							
								 
						
							
							
								3e5a62ecd8 
								
							
								 
							
						 
						
							
							
								
								Add more granular event send metrics  
							
							
							
						 
						
							2017-05-02 14:23:26 +01:00  
				
					
						
							
							
								 
						
							
							
								34e682d385 
								
							
								 
							
						 
						
							
							
								
								Fix invite state to always include all events  
							
							
							
						 
						
							2017-04-26 16:18:08 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								10e48d8310 
								
							
								 
							
						 
						
							
							
								
								Don't clobber a displayname or avatar_url if provided by an m.room.member event  
							
							
							
						 
						
							2017-01-24 18:06:07 +00:00  
				
					
						
							
							
								 
						
							
							
								3b4de17d2b 
								
							
								 
							
						 
						
							
							
								
								Comment  
							
							
							
						 
						
							2017-01-10 14:05:53 +00:00  
				
					
						
							
							
								 
						
							
							
								586f474a44 
								
							
								 
							
						 
						
							
							
								
								Don't block messages sending on bumping presence  
							
							
							
						 
						
							2017-01-10 12:46:00 +00:00  
				
					
						
							
							
								 
						
							
							
								d53a80af25 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1620  from matrix-org/erikj/concurrent_room_access  
							
							... 
							
							
							
							Limit the number of events that can be created on a given room concurrently 
							
						 
						
							2016-12-12 10:30:23 +00:00  
				
					
						
							
							
								 
						
							
							
								f8ee66250a 
								
							
								 
							
						 
						
							
							
								
								Handle sending events and device messages over federation  
							
							
							
						 
						
							2016-11-17 15:48:04 +00:00  
				
					
						
							
							
								 
						
							
							
								64038b806c 
								
							
								 
							
						 
						
							
							
								
								Comments  
							
							
							
						 
						
							2016-11-11 10:42:08 +00:00  
				
					
						
							
							
								 
						
							
							
								2bd4513a4d 
								
							
								 
							
						 
						
							
							
								
								Limit the number of events that can be created on a given room concurretnly  
							
							
							
						 
						
							2016-11-10 16:44:35 +00:00  
				
					
						
							
							
								 
						
							
							
								a4632783fb 
								
							
								 
							
						 
						
							
							
								
								Sample correctly  
							
							
							
						 
						
							2016-11-08 11:20:26 +00:00