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