754826a830 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into 3218-official-prom  
							
							
							
						 
						
							2018-05-28 18:57:23 +10:00  
				
					
						
							
							
								 
						
							
							
								e987079037 
								
							
								 
							
						 
						
							
							
								
								fixes  
							
							
							
						 
						
							2018-05-23 13:03:51 -05:00  
				
					
						
							
							
								 
						
							
							
								53cc2cde1f 
								
							
								 
							
						 
						
							
							
								
								cleanup  
							
							
							
						 
						
							2018-05-22 17:32:57 -05:00  
				
					
						
							
							
								 
						
							
							
								fcc525b0b7 
								
							
								 
							
						 
						
							
							
								
								rest of the changes  
							
							
							
						 
						
							2018-05-21 19:48:57 -05:00  
				
					
						
							
							
								 
						
							
							
								933bf2dd35 
								
							
								 
							
						 
						
							
							
								
								replace some iteritems with six  
							
							... 
							
							
							
							Signed-off-by: Adrian Tschira <nota@notafile.com> 
							
						 
						
							2018-05-19 17:59:26 +02:00  
				
					
						
							
							
								 
						
							
							
								573712da6b 
								
							
								 
							
						 
						
							
							
								
								Update comments  
							
							
							
						 
						
							2018-02-21 11:29:49 +00:00  
				
					
						
							
							
								 
						
							
							
								6ff8c87484 
								
							
								 
							
						 
						
							
							
								
								Batch inserts into event_push_actions_staging  
							
							
							
						 
						
							2018-02-20 11:33:07 +00:00  
				
					
						
							
							
								 
						
							
							
								012e8e142a 
								
							
								 
							
						 
						
							
							
								
								Comments  
							
							
							
						 
						
							2018-02-16 11:35:01 +00:00  
				
					
						
							
							
								 
						
							
							
								4810f7effd 
								
							
								 
							
						 
						
							
							
								
								Remove context.push_actions  
							
							
							
						 
						
							2018-02-15 15:47:06 +00:00  
				
					
						
							
							
								 
						
							
							
								acac21248c 
								
							
								 
							
						 
						
							
							
								
								Store push actions in staging area  
							
							
							
						 
						
							2018-02-15 15:47:04 +00:00  
				
					
						
							
							
								 
						
							
							
								81a5e0073c 
								
							
								 
							
						 
						
							
							
								
								pep8  
							
							
							
						 
						
							2017-10-10 15:53:34 +01:00  
				
					
						
							
							
								 
						
							
							
								ab1bc9bf5f 
								
							
								 
							
						 
						
							
							
								
								Don't KeyError if no power_levels event  
							
							
							
						 
						
							2017-10-10 15:34:05 +01:00  
				
					
						
							
							
								 
						
							
							
								0f1eb3e914 
								
							
								 
							
						 
						
							
							
								
								Use notification levels in power_levels  
							
							... 
							
							
							
							Rather than making the condition directly require a specific power
level. This way the level require to notify a room can be configured
per room. 
							
						 
						
							2017-10-10 15:23:00 +01:00  
				
					
						
							
							
								 
						
							
							
								c9f034b4ac 
								
							
								 
							
						 
						
							
							
								
								There was already a constant for this  
							
							... 
							
							
							
							also update copyright 
							
						 
						
							2017-10-10 11:47:10 +01:00  
				
					
						
							
							
								 
						
							
							
								a9f9d68631 
								
							
								 
							
						 
						
							
							
								
								More optimisation  
							
							
							
						 
						
							2017-10-10 11:38:31 +01:00  
				
					
						
							
							
								 
						
							
							
								269af961e9 
								
							
								 
							
						 
						
							
							
								
								Make be faster  
							
							
							
						 
						
							2017-10-05 13:27:12 +01:00  
				
					
						
							
							
								 
						
							
							
								ed80c6b6cc 
								
							
								 
							
						 
						
							
							
								
								Add fastpath optimisation  
							
							
							
						 
						
							2017-10-05 13:20:22 +01:00  
				
					
						
							
							
								 
						
							
							
								fa969cfdde 
								
							
								 
							
						 
						
							
							
								
								Support for channel notifications  
							
							... 
							
							
							
							Add condition type to check the sender's power level and add a base
rule using it for @channel notifications. 
							
						 
						
							2017-10-05 12:39:18 +01:00  
				
					
						
							
							
								 
						
							
							
								bfde076022 
								
							
								 
							
						 
						
							
							
								
								Increase cache hit ratio for push  
							
							... 
							
							
							
							We don't update the cache in all code paths, which causes subsequent
calls to miss the cache 
							
						 
						
							2017-07-14 16:11:26 +01:00  
				
					
						
							
							
								 
						
							
							
								8d26385d76 
								
							
								 
							
						 
						
							
							
								
								Add more metrics to push rule evaluation  
							
							
							
						 
						
							2017-07-13 14:37:30 +01:00  
				
					
						
							
							
								 
						
							
							
								f60218ec41 
								
							
								 
							
						 
						
							
							
								
								Push: Don't acquire lock unless necessary  
							
							
							
						 
						
							2017-07-13 11:23:53 +01:00  
				
					
						
							
							
								 
						
							
							
								f502b0dea1 
								
							
								 
							
						 
						
							
							
								
								Perf: Don't filter events for push  
							
							... 
							
							
							
							We know the users are joined and we can explicitly check for if they are
ignoring the user, so lets do that. 
							
						 
						
							2017-07-07 14:04:40 +01:00  
				
					
						
							
							
								 
						
							
							
								6489455bed 
								
							
								 
							
						 
						
							
							
								
								Comment  
							
							
							
						 
						
							2017-05-22 16:22:04 +01:00  
				
					
						
							
							
								 
						
							
							
								d668caa79c 
								
							
								 
							
						 
						
							
							
								
								Remove spurious log level guards  
							
							
							
						 
						
							2017-05-22 16:21:06 +01:00  
				
					
						
							
							
								 
						
							
							
								7fb80b5eae 
								
							
								 
							
						 
						
							
							
								
								Check if current event is a membership event  
							
							
							
						 
						
							2017-05-22 15:02:12 +01:00  
				
					
						
							
							
								 
						
							
							
								2d17b09a6d 
								
							
								 
							
						 
						
							
							
								
								Add debug logging  
							
							
							
						 
						
							2017-05-22 15:01:36 +01:00  
				
					
						
							
							
								 
						
							
							
								24c8f38784 
								
							
								 
							
						 
						
							
							
								
								Comment  
							
							
							
						 
						
							2017-05-22 14:59:27 +01:00  
				
					
						
							
							
								 
						
							
							
								25f03cf8e9 
								
							
								 
							
						 
						
							
							
								
								Use tuple unpacking  
							
							
							
						 
						
							2017-05-22 14:58:22 +01:00  
				
					
						
							
							
								 
						
							
							
								270e1c904a 
								
							
								 
							
						 
						
							
							
								
								Speed up calculating push rules  
							
							
							
						 
						
							2017-05-19 16:51:05 +01:00  
				
					
						
							
							
								 
						
							
							
								1c1c0257f4 
								
							
								 
							
						 
						
							
							
								
								Move invalidation cb to its own structure  
							
							
							
						 
						
							2017-05-19 11:44:11 +01:00  
				
					
						
							
							
								 
						
							
							
								cafe659f72 
								
							
								 
							
						 
						
							
							
								
								Store ActionGenerator in HomeServer  
							
							
							
						 
						
							2017-05-19 10:09:56 +01:00  
				
					
						
							
							
								 
						
							
							
								72ed8196b3 
								
							
								 
							
						 
						
							
							
								
								Don't push users who have left  
							
							
							
						 
						
							2017-05-18 17:48:36 +01:00  
				
					
						
							
							
								 
						
							
							
								760625acba 
								
							
								 
							
						 
						
							
							
								
								Make get_if_app_services_interested_in_user faster  
							
							
							
						 
						
							2017-05-18 16:34:44 +01:00  
				
					
						
							
							
								 
						
							
							
								c57789d138 
								
							
								 
							
						 
						
							
							
								
								Remove size of push get_rules cache  
							
							
							
						 
						
							2017-05-18 16:17:23 +01:00  
				
					
						
							
							
								 
						
							
							
								056ba9b795 
								
							
								 
							
						 
						
							
							
								
								Add comment  
							
							
							
						 
						
							2017-05-18 11:45: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  
				
					
						
							
							
								 
						
							
							
								78f306a6f7 
								
							
								 
							
						 
						
							
							
								
								Revert "Speed up filtering of a single event in push"  
							
							... 
							
							
							
							This reverts commit 421fdf7460 
							
						 
						
							2017-05-08 13:07:41 +01:00  
				
					
						
							
							
								 
						
							
							
								421fdf7460 
								
							
								 
							
						 
						
							
							
								
								Speed up filtering of a single event in push  
							
							
							
						 
						
							2017-04-28 09:52:36 +01:00  
				
					
						
							
							
								 
						
							
							
								acb58bfb6a 
								
							
								 
							
						 
						
							
							
								
								fix up  
							
							
							
						 
						
							2017-04-25 15:39:19 +01:00  
				
					
						
							
							
								 
						
							
							
								f7181615f2 
								
							
								 
							
						 
						
							
							
								
								Don't specify default as dict  
							
							
							
						 
						
							2017-04-25 15:22:59 +01:00  
				
					
						
							
							
								 
						
							
							
								d9aa645f86 
								
							
								 
							
						 
						
							
							
								
								Reduce size of joined_user cache  
							
							... 
							
							
							
							The _get_joined_users_from_context cache stores a mapping from user_id
to avatar_url and display_name. Instead of storing those in a dict,
store them in a namedtuple as that uses much less memory.
We also try converting the string to ascii to further reduce the size. 
							
						 
						
							2017-04-25 14:38:51 +01:00  
				
					
						
							
							
								 
						
							
							
								52d12ca782 
								
							
								 
							
						 
						
							
							
								
								Add /room/<room_id>/joined_members API  
							
							... 
							
							
							
							This returns the currently joined members in the room with their display
names and avatar urls. This is more efficient than /members for large
rooms where you don't need the full events. 
							
						 
						
							2016-12-08 13:32:07 +00:00  
				
					
						
							
							
								 
						
							
							
								6a5ded5988 
								
							
								 
							
						 
						
							
							
								
								Ensure we don't mutate the cache of push rules  
							
							
							
						 
						
							2016-09-15 09:16:13 +01:00  
				
					
						
							
							
								 
						
							
							
								3847fa38c4 
								
							
								 
							
						 
						
							
							
								
								Make bulk_get_push_rules_for_room use get_joined_users_from_context cache  
							
							
							
						 
						
							2016-09-05 10:02:38 +01:00  
				
					
						
							
							
								 
						
							
							
								c10cb581c6 
								
							
								 
							
						 
						
							
							
								
								Correctly handle the difference between prev and current state  
							
							
							
						 
						
							2016-08-31 14:26:22 +01:00  
				
					
						
							
							
								 
						
							
							
								bed10f9880 
								
							
								 
							
						 
						
							
							
								
								Use state handler instead of get_users_in_room/get_joined_hosts  
							
							
							
						 
						
							2016-08-26 14:54:30 +01:00  
				
					
						
							
							
								 
						
							
							
								a3dc1e9cbe 
								
							
								 
							
						 
						
							
							
								
								Replace context.current_state with context.current_state_ids  
							
							
							
						 
						
							2016-08-25 17:32:22 +01:00  
				
					
						
							
							
								 
						
							
							
								f164fd9220 
								
							
								 
							
						 
						
							
							
								
								Move _bulk_get_push_rules_for_room to storage layer  
							
							
							
						 
						
							2016-08-19 14:29:20 +01:00  
				
					
						
							
							
								 
						
							
							
								0b2158719c 
								
							
								 
							
						 
						
							
							
								
								Remove dead code.  
							
							... 
							
							
							
							Loading push rules now happens in the datastore, so we can remove
the methods that loaded them outside the datastore.
The ``waiting_for_join_list`` in federation handler is populated by
anything, so can be removed.
The ``_get_members_events_txn`` method isn't called from anywhere
so can be removed. 
							
						 
						
							2016-06-07 15:07:11 +01:00  
				
					
						
							
							
								 
						
							
							
								6a0afa582a 
								
							
								 
							
						 
						
							
							
								
								Load push rules in storage layer, so that they get cached  
							
							
							
						 
						
							2016-06-03 11:10:00 +01:00