89e6839a48 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #686  from matrix-org/markjh/doc_strings  
							
							... 
							
							
							
							Use google style doc strings. 
							
						 
						
							2016-04-01 16:20:09 +01:00  
				
					
						
							
							
								 
						
							
							
								2a37467fa1 
								
							
								 
							
						 
						
							
							
								
								Use google style doc strings.  
							
							... 
							
							
							
							pycharm supports them so there is no need to use the other format.
Might as well convert the existing strings to reduce the risk of
people accidentally cargo culting the wrong doc string format. 
							
						 
						
							2016-04-01 16:12:07 +01:00  
				
					
						
							
							
								 
						
							
							
								8d73cd502b 
								
							
								 
							
						 
						
							
							
								
								Add concurrently_execute function  
							
							
							
						 
						
							2016-04-01 14:06:00 +01:00  
				
					
						
							
							
								 
						
							
							
								35bb465b86 
								
							
								 
							
						 
						
							
							
								
								Filter rooms list before chunking  
							
							
							
						 
						
							2016-04-01 13:14:53 +01:00  
				
					
						
							
							
								 
						
							
							
								191c7bef6b 
								
							
								 
							
						 
						
							
							
								
								Deduplicate identical /sync requests  
							
							
							
						 
						
							2016-03-24 17:47:31 +00:00  
				
					
						
							
							
								 
						
							
							
								b7a3be693b 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #618  from matrix-org/markjh/pushrule_stream  
							
							... 
							
							
							
							Add a stream for push rule updates 
							
						 
						
							2016-03-04 16:35:08 +00:00  
				
					
						
							
							
								 
						
							
							
								125f674eae 
								
							
								 
							
						 
						
							
							
								
								Always include kicks and bans in full /sync  
							
							
							
						 
						
							2016-03-04 15:27:55 +00:00  
				
					
						
							
							
								 
						
							
							
								1b4f4a936f 
								
							
								 
							
						 
						
							
							
								
								Hook up the push rules stream to account_data in /sync  
							
							
							
						 
						
							2016-03-04 14:44:01 +00:00  
				
					
						
							
							
								 
						
							
							
								baf056bae8 
								
							
								 
							
						 
						
							
							
								
								handlers/sync: style fix, line too long  
							
							... 
							
							
							
							Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com> 
							
						 
						
							2016-02-23 15:49:36 +01:00  
				
					
						
							
							
								 
						
							
							
								1dcfb201c4 
								
							
								 
							
						 
						
							
							
								
								handlers/sync: fix SyncResult not counting account_data change when converting to bool  
							
							... 
							
							
							
							This fixes account_data events not triggering an immediate /sync response
Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com> 
							
						 
						
							2016-02-23 00:21:59 +01:00  
				
					
						
							
							
								 
						
							
							
								f7e3de02ef 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #587  from matrix-org/rav/guest_access_after_room_join  
							
							... 
							
							
							
							Allow guest users access to messages in rooms they have joined 
							
						 
						
							2016-02-22 16:36:06 +00:00  
				
					
						
							
							
								 
						
							
							
								9e696bd6a3 
								
							
								 
							
						 
						
							
							
								
								Remove superfluous call to get_state_at when we already have an event for that stream position  
							
							
							
						 
						
							2016-02-22 13:54:46 +00:00  
				
					
						
							
							
								 
						
							
							
								05aee12652 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into rav/guest_access_after_room_join  
							
							
							
						 
						
							2016-02-19 12:00:16 +00:00  
				
					
						
							
							
								 
						
							
							
								b71ca2b014 
								
							
								 
							
						 
						
							
							
								
								Allow guest users access to messages in rooms they have joined  
							
							... 
							
							
							
							There should be no difference between guest users and non-guest users in terms
of access to messages. Define the semantics of the is_peeking argument to
filter_events_for_clients (slightly) better; interpret it appropriately, and
set it correctly from /sync. 
							
						 
						
							2016-02-19 11:41:02 +00:00  
				
					
						
							
							
								 
						
							
							
								e5ad2e5267 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #582  from matrix-org/erikj/presence  
							
							... 
							
							
							
							Rewrite presence for performance. 
							
						 
						
							2016-02-19 09:37:50 +00:00  
				
					
						
							
							
								 
						
							
							
								e5999bfb1a 
								
							
								 
							
						 
						
							
							
								
								Initial cut  
							
							
							
						 
						
							2016-02-17 15:40:50 +00:00  
				
					
						
							
							
								 
						
							
							
								4d54d87c3e 
								
							
								 
							
						 
						
							
							
								
								Mitigate against incorrect old state in /sync.  
							
							... 
							
							
							
							There have been reports from the field that servers occasionally have
incorrect notions of what the old state of a room is. This proves
problematic as /sync relies on a correct old state.
This patch makes /sync specifically include in the 'state' key any
current state events that haven't been correctly included. 
							
						 
						
							2016-02-12 11:13:06 +00:00  
				
					
						
							
							
								 
						
							
							
								24f00a6c33 
								
							
								 
							
						 
						
							
							
								
								Use _simple_select_many for _get_state_group_for_events  
							
							
							
						 
						
							2016-02-10 12:57:50 +00:00  
				
					
						
							
							
								 
						
							
							
								8e49892b21 
								
							
								 
							
						 
						
							
							
								
								Only calculate initial sync for 10 rooms at a time  
							
							... 
							
							
							
							This helps to ensure we don't completely starve other requests. 
							
						 
						
							2016-02-10 11:42:07 +00:00  
				
					
						
							
							
								 
						
							
							
								feb294d552 
								
							
								 
							
						 
						
							
							
								
								Remove dead code  
							
							
							
						 
						
							2016-02-09 14:32:17 +00:00  
				
					
						
							
							
								 
						
							
							
								eff12e838c 
								
							
								 
							
						 
						
							
							
								
								Don't load all ephemeral state for a room on every sync  
							
							
							
						 
						
							2016-02-09 13:55:59 +00:00  
				
					
						
							
							
								 
						
							
							
								82631c5f94 
								
							
								 
							
						 
						
							
							
								
								Fix unit tests  
							
							
							
						 
						
							2016-02-09 13:50:37 +00:00  
				
					
						
							
							
								 
						
							
							
								6c558ee8bc 
								
							
								 
							
						 
						
							
							
								
								Measure some /sync related things  
							
							
							
						 
						
							2016-02-09 11:31:42 +00:00  
				
					
						
							
							
								 
						
							
							
								2c1fbea531 
								
							
								 
							
						 
						
							
							
								
								Fix up logcontexts  
							
							
							
						 
						
							2016-02-08 14:26:45 +00:00  
				
					
						
							
							
								 
						
							
							
								c8e4d5de7f 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #555  from matrix-org/erikj/logcontext  
							
							... 
							
							
							
							Allowing tagging log contexts 
							
						 
						
							2016-02-03 15:20:00 +00:00  
				
					
						
							
							
								 
						
							
							
								d4f72a5bfb 
								
							
								 
							
						 
						
							
							
								
								Allowing tagging log contexts  
							
							
							
						 
						
							2016-02-03 13:52:27 +00:00  
				
					
						
							
							
								 
						
							
							
								771528ab13 
								
							
								 
							
						 
						
							
							
								
								Change event_push_actions_rm_tokens schema  
							
							
							
						 
						
							2016-02-03 10:50:49 +00:00  
				
					
						
							
							
								 
						
							
							
								8a391e33ae 
								
							
								 
							
						 
						
							
							
								
								s/get_room_changes_for_user/get_membership_changes_for_user/  
							
							
							
						 
						
							2016-02-02 16:12:10 +00:00  
				
					
						
							
							
								 
						
							
							
								854ca32f10 
								
							
								 
							
						 
						
							
							
								
								Comments  
							
							
							
						 
						
							2016-02-01 16:52:27 +00:00  
				
					
						
							
							
								 
						
							
							
								fa48020a52 
								
							
								 
							
						 
						
							
							
								
								Move state calculations from rest to handler  
							
							
							
						 
						
							2016-02-01 15:59:40 +00:00  
				
					
						
							
							
								 
						
							
							
								ea320d3464 
								
							
								 
							
						 
						
							
							
								
								Don't work out unread_notifs_for_room_id unless needed  
							
							
							
						 
						
							2016-01-29 13:34:48 +00:00  
				
					
						
							
							
								 
						
							
							
								571a566399 
								
							
								 
							
						 
						
							
							
								
								Change load limit params  
							
							
							
						 
						
							2016-01-28 14:11:16 +00:00  
				
					
						
							
							
								 
						
							
							
								3c6518ddbf 
								
							
								 
							
						 
						
							
							
								
								Amalgamate incremental and full sync for user  
							
							
							
						 
						
							2016-01-28 14:03:48 +00:00  
				
					
						
							
							
								 
						
							
							
								aca3193efb 
								
							
								 
							
						 
						
							
							
								
								Use the same path for incremental with gap or without gap  
							
							
							
						 
						
							2016-01-27 17:33:27 +00:00  
				
					
						
							
							
								 
						
							
							
								b97f6626b6 
								
							
								 
							
						 
						
							
							
								
								Add cache to room stream  
							
							
							
						 
						
							2016-01-27 17:33:26 +00:00  
				
					
						
							
							
								 
						
							
							
								dc2647cd3d 
								
							
								 
							
						 
						
							
							
								
								PEP8  
							
							
							
						 
						
							2016-01-25 15:48:54 +00:00  
				
					
						
							
							
								 
						
							
							
								d59c58bc95 
								
							
								 
							
						 
						
							
							
								
								Remove weird stuff  
							
							
							
						 
						
							2016-01-25 13:38:53 +00:00  
				
					
						
							
							
								 
						
							
							
								4021f95261 
								
							
								 
							
						 
						
							
							
								
								Move logic from rest/ to handlers/  
							
							
							
						 
						
							2016-01-25 10:10:44 +00:00  
				
					
						
							
							
								 
						
							
							
								da417aa56d 
								
							
								 
							
						 
						
							
							
								
								Allow non-guests to peek on rooms using /events  
							
							
							
						 
						
							2016-01-20 15:34:07 +00:00  
				
					
						
							
							
								 
						
							
							
								ac2842ff1e 
								
							
								 
							
						 
						
							
							
								
								Only compute unread notifications for rooms we send down stream  
							
							
							
						 
						
							2016-01-19 17:19:53 +00:00  
				
					
						
							
							
								 
						
							
							
								b8518ffe65 
								
							
								 
							
						 
						
							
							
								
								Use all_ephemeral_by_room in incremental_sync_with_gap_for_room  
							
							
							
						 
						
							2016-01-19 14:26:58 +00:00  
				
					
						
							
							
								 
						
							
							
								3adcc4c86a 
								
							
								 
							
						 
						
							
							
								
								Return highlight_count in /sync  
							
							
							
						 
						
							2016-01-19 11:35:50 +00:00  
				
					
						
							
							
								 
						
							
							
								63485b3029 
								
							
								 
							
						 
						
							
							
								
								Re-enable urnead notifications  
							
							
							
						 
						
							2016-01-18 14:48:30 +00:00  
				
					
						
							
							
								 
						
							
							
								bce602eb4e 
								
							
								 
							
						 
						
							
							
								
								Use logger not logging  
							
							
							
						 
						
							2016-01-14 09:56:26 +00:00  
				
					
						
							
							
								 
						
							
							
								2655d61d70 
								
							
								 
							
						 
						
							
							
								
								Don't change signature. Return empty list  
							
							
							
						 
						
							2016-01-13 17:43:39 +00:00  
				
					
						
							
							
								 
						
							
							
								fcb05b4c82 
								
							
								 
							
						 
						
							
							
								
								Temporarily disable notification branch  
							
							
							
						 
						
							2016-01-13 17:39:58 +00:00  
				
					
						
							
							
								 
						
							
							
								70dfe4dc96 
								
							
								 
							
						 
						
							
							
								
								Don't include old left rooms  
							
							
							
						 
						
							2016-01-12 15:01:56 +00:00  
				
					
						
							
							
								 
						
							
							
								c232780081 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #456  from matrix-org/store_event_actions  
							
							... 
							
							
							
							Send unread notification counts 
							
						 
						
							2016-01-08 14:47:15 +00:00  
				
					
						
							
							
								 
						
							
							
								fcbe63eaad 
								
							
								 
							
						 
						
							
							
								
								Use logger not logging  
							
							
							
						 
						
							2016-01-07 15:28:17 +00:00  
				
					
						
							
							
								 
						
							
							
								442fcc02f7 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into store_event_actions  
							
							
							
						 
						
							2016-01-06 17:28:55 +00:00