Erik Johnston
							
						 
						
							 
							
							
							
								
							
								bed10f9880 
								
							
								 
							
						 
						
							
							
								
								Use state handler instead of get_users_in_room/get_joined_hosts  
							
							 
							
							
							
						 
						
							2016-08-26 14:54:30 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								4bbef62124 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into markjh/direct_to_device  
							
							 
							
							
							
						 
						
							2016-08-26 14:35:31 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								778fa85f47 
								
							
								 
							
						 
						
							
							
								
								Make sync not pull out full state  
							
							 
							
							
							
						 
						
							2016-08-25 18:59:44 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								e993925279 
								
							
								 
							
						 
						
							
							
								
								Add store-and-forward direct-to-device messaging  
							
							 
							
							
							
						 
						
							2016-08-25 17:35:37 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								afbf6b33fc 
								
							
								 
							
						 
						
							
							
								
								defer.returnValue must not be called within Measure  
							
							 
							
							
							
						 
						
							2016-08-19 18:23:44 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								248e6770ca 
								
							
								 
							
						 
						
							
							
								
								Cache federation state responses  
							
							 
							
							
							
						 
						
							2016-07-21 10:30:12 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6a0afa582a 
								
							
								 
							
						 
						
							
							
								
								Load push rules in storage layer, so that they get cached  
							
							 
							
							
							
						 
						
							2016-06-03 11:10:00 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								661a540dd1 
								
							
								 
							
						 
						
							
							
								
								Deduplicate presence entries in sync ( #818 )  
							
							 
							
							
							
						 
						
							2016-06-02 15:20:28 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								faad233ea6 
								
							
								 
							
						 
						
							
							
								
								Change short circuit path  
							
							 
							
							
							
						 
						
							2016-05-24 14:27:19 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6900303997 
								
							
								 
							
						 
						
							
							
								
								Don't send down all ephemeral events  
							
							 
							
							
							
						 
						
							2016-05-24 11:44:55 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								1c5ed2a19b 
								
							
								 
							
						 
						
							
							
								
								Only work out newly_joined_users for incremental sync  
							
							 
							
							
							
						 
						
							2016-05-24 11:21:34 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b08ad0389e 
								
							
								 
							
						 
						
							
							
								
								Only include non-offline presence in initial sync  
							
							 
							
							
							
						 
						
							2016-05-24 11:15:05 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								be2c677386 
								
							
								 
							
						 
						
							
							
								
								Spell builder correctly  
							
							 
							
							
							
						 
						
							2016-05-24 10:53:03 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								79bea8ab9a 
								
							
								 
							
						 
						
							
							
								
								Inline function. Make load_filtered_recents private  
							
							 
							
							
							
						 
						
							2016-05-24 10:22:24 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								84f94e4cbb 
								
							
								 
							
						 
						
							
							
								
								Add comments  
							
							 
							
							
							
						 
						
							2016-05-24 10:14:53 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								137e6a4557 
								
							
								 
							
						 
						
							
							
								
								Shuffle things room  
							
							 
							
							
							
						 
						
							2016-05-24 09:50:55 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c0c79ef444 
								
							
								 
							
						 
						
							
							
								
								Add back concurrently_execute  
							
							 
							
							
							
						 
						
							2016-05-23 18:21:27 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b5605dfecc 
								
							
								 
							
						 
						
							
							
								
								Refactor SyncHandler  
							
							 
							
							
							
						 
						
							2016-05-23 18:08:18 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								f68eea808a 
								
							
								 
							
						 
						
							
							
								
								Move SyncHandler out of the Handlers object  
							
							 
							
							
							
						 
						
							2016-05-16 20:19:26 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								53e171f345 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'markjh/liberate_presence_handler' into markjh/liberate_sync_handler  
							
							 
							
							
							
						 
						
							2016-05-16 20:08:32 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								80cb9becd8 
								
							
								 
							
						 
						
							
							
								
								Remove get_joined_rooms_for_user from RoomMemberHandler  
							
							 
							
							
							
						 
						
							2016-05-16 20:06:55 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								3b86ecfa79 
								
							
								 
							
						 
						
							
							
								
								Move the presence handler out of the Handlers object  
							
							 
							
							
							
						 
						
							2016-05-16 18:56:37 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								7e23476814 
								
							
								 
							
						 
						
							
							
								
								move filter_events_for_client out of base handler  
							
							 
							
							
							
						 
						
							2016-05-11 13:42:37 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								fe97b81c09 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #759  from matrix-org/dbkr/email_notifs  
							
							 
							
							... 
							
							
							
							Send email notifications for missed messages 
							
						 
						
							2016-05-10 16:30:05 +02:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								1f0f5ffa1e 
								
							
								 
							
						 
						
							
							
								
								Add bulk fetch storage API  
							
							 
							
							
							
						 
						
							2016-05-05 10:03:15 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a438a6d2bc 
								
							
								 
							
						 
						
							
							
								
								Implement basic ignore user  
							
							 
							
							
							
						 
						
							2016-05-04 10:16:46 +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  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								89e6839a48 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #686  from matrix-org/markjh/doc_strings  
							
							 
							
							... 
							
							
							
							Use google style doc strings. 
							
						 
						
							2016-04-01 16:20:09 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								8d73cd502b 
								
							
								 
							
						 
						
							
							
								
								Add concurrently_execute function  
							
							 
							
							
							
						 
						
							2016-04-01 14:06:00 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								35bb465b86 
								
							
								 
							
						 
						
							
							
								
								Filter rooms list before chunking  
							
							 
							
							
							
						 
						
							2016-04-01 13:14:53 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								191c7bef6b 
								
							
								 
							
						 
						
							
							
								
								Deduplicate identical /sync requests  
							
							 
							
							
							
						 
						
							2016-03-24 17:47:31 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								125f674eae 
								
							
								 
							
						 
						
							
							
								
								Always include kicks and bans in full /sync  
							
							 
							
							
							
						 
						
							2016-03-04 15:27:55 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								1b4f4a936f 
								
							
								 
							
						 
						
							
							
								
								Hook up the push rules stream to account_data in /sync  
							
							 
							
							
							
						 
						
							2016-03-04 14:44:01 +00:00  
						
					 
				
					
						
							
							
								 
								Patrik Oldsberg
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Patrik Oldsberg
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								05aee12652 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into rav/guest_access_after_room_join  
							
							 
							
							
							
						 
						
							2016-02-19 12:00:16 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e5ad2e5267 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #582  from matrix-org/erikj/presence  
							
							 
							
							... 
							
							
							
							Rewrite presence for performance. 
							
						 
						
							2016-02-19 09:37:50 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e5999bfb1a 
								
							
								 
							
						 
						
							
							
								
								Initial cut  
							
							 
							
							
							
						 
						
							2016-02-17 15:40:50 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								24f00a6c33 
								
							
								 
							
						 
						
							
							
								
								Use _simple_select_many for _get_state_group_for_events  
							
							 
							
							
							
						 
						
							2016-02-10 12:57:50 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								feb294d552 
								
							
								 
							
						 
						
							
							
								
								Remove dead code  
							
							 
							
							
							
						 
						
							2016-02-09 14:32:17 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								eff12e838c 
								
							
								 
							
						 
						
							
							
								
								Don't load all ephemeral state for a room on every sync  
							
							 
							
							
							
						 
						
							2016-02-09 13:55:59 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								82631c5f94 
								
							
								 
							
						 
						
							
							
								
								Fix unit tests  
							
							 
							
							
							
						 
						
							2016-02-09 13:50:37 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6c558ee8bc 
								
							
								 
							
						 
						
							
							
								
								Measure some /sync related things  
							
							 
							
							
							
						 
						
							2016-02-09 11:31:42 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2c1fbea531 
								
							
								 
							
						 
						
							
							
								
								Fix up logcontexts  
							
							 
							
							
							
						 
						
							2016-02-08 14:26:45 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c8e4d5de7f 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #555  from matrix-org/erikj/logcontext  
							
							 
							
							... 
							
							
							
							Allowing tagging log contexts 
							
						 
						
							2016-02-03 15:20:00 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d4f72a5bfb 
								
							
								 
							
						 
						
							
							
								
								Allowing tagging log contexts  
							
							 
							
							
							
						 
						
							2016-02-03 13:52:27 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								771528ab13 
								
							
								 
							
						 
						
							
							
								
								Change event_push_actions_rm_tokens schema  
							
							 
							
							
							
						 
						
							2016-02-03 10:50:49 +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
							
						 
						
							 
							
							
							
								
							
								854ca32f10 
								
							
								 
							
						 
						
							
							
								
								Comments  
							
							 
							
							
							
						 
						
							2016-02-01 16:52:27 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								fa48020a52 
								
							
								 
							
						 
						
							
							
								
								Move state calculations from rest to handler  
							
							 
							
							
							
						 
						
							2016-02-01 15:59:40 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ea320d3464 
								
							
								 
							
						 
						
							
							
								
								Don't work out unread_notifs_for_room_id unless needed  
							
							 
							
							
							
						 
						
							2016-01-29 13:34:48 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								571a566399 
								
							
								 
							
						 
						
							
							
								
								Change load limit params  
							
							 
							
							
							
						 
						
							2016-01-28 14:11:16 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3c6518ddbf 
								
							
								 
							
						 
						
							
							
								
								Amalgamate incremental and full sync for user  
							
							 
							
							
							
						 
						
							2016-01-28 14:03:48 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								aca3193efb 
								
							
								 
							
						 
						
							
							
								
								Use the same path for incremental with gap or without gap  
							
							 
							
							
							
						 
						
							2016-01-27 17:33:27 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b97f6626b6 
								
							
								 
							
						 
						
							
							
								
								Add cache to room stream  
							
							 
							
							
							
						 
						
							2016-01-27 17:33:26 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								dc2647cd3d 
								
							
								 
							
						 
						
							
							
								
								PEP8  
							
							 
							
							
							
						 
						
							2016-01-25 15:48:54 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d59c58bc95 
								
							
								 
							
						 
						
							
							
								
								Remove weird stuff  
							
							 
							
							
							
						 
						
							2016-01-25 13:38:53 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4021f95261 
								
							
								 
							
						 
						
							
							
								
								Move logic from rest/ to handlers/  
							
							 
							
							
							
						 
						
							2016-01-25 10:10:44 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								da417aa56d 
								
							
								 
							
						 
						
							
							
								
								Allow non-guests to peek on rooms using /events  
							
							 
							
							
							
						 
						
							2016-01-20 15:34:07 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ac2842ff1e 
								
							
								 
							
						 
						
							
							
								
								Only compute unread notifications for rooms we send down stream  
							
							 
							
							
							
						 
						
							2016-01-19 17:19:53 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b8518ffe65 
								
							
								 
							
						 
						
							
							
								
								Use all_ephemeral_by_room in incremental_sync_with_gap_for_room  
							
							 
							
							
							
						 
						
							2016-01-19 14:26:58 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3adcc4c86a 
								
							
								 
							
						 
						
							
							
								
								Return highlight_count in /sync  
							
							 
							
							
							
						 
						
							2016-01-19 11:35:50 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								63485b3029 
								
							
								 
							
						 
						
							
							
								
								Re-enable urnead notifications  
							
							 
							
							
							
						 
						
							2016-01-18 14:48:30 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								bce602eb4e 
								
							
								 
							
						 
						
							
							
								
								Use logger not logging  
							
							 
							
							
							
						 
						
							2016-01-14 09:56:26 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2655d61d70 
								
							
								 
							
						 
						
							
							
								
								Don't change signature. Return empty list  
							
							 
							
							
							
						 
						
							2016-01-13 17:43:39 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								fcb05b4c82 
								
							
								 
							
						 
						
							
							
								
								Temporarily disable notification branch  
							
							 
							
							
							
						 
						
							2016-01-13 17:39:58 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								70dfe4dc96 
								
							
								 
							
						 
						
							
							
								
								Don't include old left rooms  
							
							 
							
							
							
						 
						
							2016-01-12 15:01:56 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								c232780081 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #456  from matrix-org/store_event_actions  
							
							 
							
							... 
							
							
							
							Send unread notification counts 
							
						 
						
							2016-01-08 14:47:15 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								fcbe63eaad 
								
							
								 
							
						 
						
							
							
								
								Use logger not logging  
							
							 
							
							
							
						 
						
							2016-01-07 15:28:17 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								442fcc02f7 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into store_event_actions  
							
							 
							
							
							
						 
						
							2016-01-06 17:28:55 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								4cec90a260 
								
							
								 
							
						 
						
							
							
								
								Pass whether the user was a guest to some of the event streams  
							
							 
							
							
							
						 
						
							2016-01-06 16:54:57 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								392773ccb2 
								
							
								 
							
						 
						
							
							
								
								Guest users must be joined to a room to see it in /sync  
							
							 
							
							
							
						 
						
							2016-01-06 16:44:13 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								eb03625626 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into store_event_actions  
							
							 
							
							
							
						 
						
							2016-01-05 18:39:50 +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
							
						 
						
							 
							
							
							
								
							
								acb19068d0 
								
							
								 
							
						 
						
							
							
								
								Return /sync when something under the 'leave' key has changed  
							
							 
							
							
							
						 
						
							2016-01-05 14:49:06 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								d74c6ace24 
								
							
								 
							
						 
						
							
							
								
								comma  
							
							 
							
							
							
						 
						
							2016-01-04 15:32:00 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								f1b67730fa 
								
							
								 
							
						 
						
							
							
								
								Add unread_notif_count in incremental_sync_with_gap  
							
							 
							
							
							
						 
						
							2016-01-04 14:50:36 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								c914d67cda 
								
							
								 
							
						 
						
							
							
								
								Rename event-actions to event_push_actions as per PR request  
							
							 
							
							
							
						 
						
							2016-01-04 14:05:37 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								d2a92c6bde 
								
							
								 
							
						 
						
							
							
								
								Fix merge fail with anon access stuff  
							
							 
							
							
							
						 
						
							2015-12-22 18:25:04 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								140a50f641 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into store_event_actions  
							
							 
							
							
							
						 
						
							2015-12-22 17:23:35 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								5645d9747b 
								
							
								 
							
						 
						
							
							
								
								Add some comments to areas that could be optimised.  
							
							 
							
							
							
						 
						
							2015-12-22 17:19:22 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								0ee0138325 
								
							
								 
							
						 
						
							
							
								
								Include the list of bad room ids in the error  
							
							 
							
							
							
						 
						
							2015-12-22 15:49:32 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								251aafccca 
								
							
								 
							
						 
						
							
							
								
								Use a list comprehension  
							
							 
							
							
							
						 
						
							2015-12-22 14:03:24 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								cdd04f7055 
								
							
								 
							
						 
						
							
							
								
								Hook up read receipts and typing notifications for guest access  
							
							 
							
							
							
						 
						
							2015-12-22 11:59:55 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								c3fff251a9 
								
							
								 
							
						 
						
							
							
								
								Allow guest access to /sync  
							
							 
							
							
							
						 
						
							2015-12-22 11:21:03 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								45a9e0ae0c 
								
							
								 
							
						 
						
							
							
								
								Allow guest access if the user provides a list of rooms in the filter  
							
							 
							
							
							
						 
						
							2015-12-22 10:25:46 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								c061b47c57 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into store_event_actions  
							
							 
							
							
							
						 
						
							2015-12-21 15:30:26 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								091c545c4f 
								
							
								 
							
						 
						
							
							
								
								pep8  
							
							 
							
							
							
						 
						
							2015-12-21 10:14:57 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								413d0d6a24 
								
							
								 
							
						 
						
							
							
								
								Make unread notification count sending work: put the correct count in incremental syncs too, where necessary, and fix silly bugs like only select the event actions for that user...  
							
							 
							
							
							
						 
						
							2015-12-18 17:47:00 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								42ad49f5b7 
								
							
								 
							
						 
						
							
							
								
								still very WIP, but now sends unread_notifications_count in the room object on sync (only actually corrrect in a full sync: hardcoded to 0 in incremental syncs).  
							
							 
							
							
							
						 
						
							2015-12-16 18:42:09 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								1ee7280c4c 
								
							
								 
							
						 
						
							
							
								
								Do the /sync in parallel accross the rooms like /initialSync does  
							
							 
							
							
							
						 
						
							2015-12-11 16:48:20 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								660dee94af 
								
							
								 
							
						 
						
							
							
								
								Only include the archived rooms if a include_leave flag in set in the filter  
							
							 
							
							
							
						 
						
							2015-12-04 17:32:09 +00:00