Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b17af156c7 
								
							
								 
							
						 
						
							
							
								
								Remove where clause  
							
							 
							
							
							
						 
						
							2016-09-12 17:05:54 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c94de0ab60 
								
							
								 
							
						 
						
							
							
								
								Add WHERE clause support to index creation  
							
							 
							
							
							
						 
						
							2016-09-12 16:55:01 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								fa20c9ce94 
								
							
								 
							
						 
						
							
							
								
								Change the index to be stream_ordering, highlight  
							
							 
							
							
							
						 
						
							2016-09-12 14:04:08 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								5ef5435529 
								
							
								 
							
						 
						
							
							
								
								Remove unused import  
							
							 
							
							
							
						 
						
							2016-09-12 13:32:58 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								7cd6edb947 
								
							
								 
							
						 
						
							
							
								
								Use register_background_index_update  
							
							 
							
							
							
						 
						
							2016-09-12 12:54:48 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								0294c14ec4 
								
							
								 
							
						 
						
							
							
								
								Add back in query change  
							
							 
							
							
							
						 
						
							2016-09-12 12:43:56 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								7fe42cf949 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/make_notif_highlight_query_fast  
							
							 
							
							
							
						 
						
							2016-09-12 12:37:09 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								15ca0c6a4d 
								
							
								 
							
						 
						
							
							
								
								Make reindex happen in bg  
							
							 
							
							
							
						 
						
							2016-09-12 12:36:36 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								54417999b6 
								
							
								 
							
						 
						
							
							
								
								Revert "Add index to event_push_actions"  
							
							 
							
							
							
						 
						
							2016-09-12 10:39:55 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								b91e2833b3 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into dbkr/make_notif_highlight_query_fast  
							
							 
							
							
							
						 
						
							2016-09-09 19:11:34 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								f2acc3dcf9 
								
							
								 
							
						 
						
							
							
								
								Add index to event_push_actions  
							
							 
							
							... 
							
							
							
							and remove room_id caluse so it uses it
Mostly from @negativemjark 
							
						 
						
							2016-09-09 18:54:54 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								b8f84f99ff 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1081  from matrix-org/dbkr/notifications_only_highlight  
							
							 
							
							... 
							
							
							
							Implement `only=highlight` on `/notifications` 
							
						 
						
							2016-09-09 00:09:51 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								4ef222ab61 
								
							
								 
							
						 
						
							
							
								
								Implement `only=highlight` on `/notifications`  
							
							 
							
							
							
						 
						
							2016-09-08 13:43:35 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								c5b49eb7ca 
								
							
								 
							
						 
						
							
							
								
								Fix /notifications API when used with `from` param  
							
							 
							
							
							
						 
						
							2016-09-08 09:40:10 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								6e80c03d45 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into dbkr/notifications_api  
							
							 
							
							
							
						 
						
							2016-08-20 00:16:18 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ba214a5e32 
								
							
								 
							
						 
						
							
							
								
								Remove lru option  
							
							 
							
							
							
						 
						
							2016-08-19 14:17:11 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								b4ecf0b886 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into dbkr/notifications_api  
							
							 
							
							
							
						 
						
							2016-08-11 14:09:13 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								8dad08a950 
								
							
								 
							
						 
						
							
							
								
								Fix SQL to supply arguments in the same order  
							
							 
							
							
							
						 
						
							2016-07-29 09:57:13 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								0a7d3cd00f 
								
							
								 
							
						 
						
							
							
								
								Create separate methods for getting messages to push  
							
							 
							
							... 
							
							
							
							for the email and http pushers rather than trying to make a single
method that will work with their conflicting requirements.
The http pusher needs to get the messages in ascending stream order, and
doesn't want to miss a message.
The email pusher needs to get the messages in descending timestamp order,
and doesn't mind if it misses messages. 
							
						 
						
							2016-07-28 20:24:24 +01:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								370135ad0b 
								
							
								 
							
						 
						
							
							
								
								Comment get_unread_push_actions_for_user_in_range function  
							
							 
							
							
							
						 
						
							2016-07-28 16:47:37 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								d44d11d864 
								
							
								 
							
						 
						
							
							
								
								Use true/false for boolean parameter inclusive to avoid potential for sqli, and possibly make the code clearer  
							
							 
							
							
							
						 
						
							2016-07-05 10:39:13 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								0fb76c71ac 
								
							
								 
							
						 
						
							
							
								
								Use different SQL for postgres and sqlite3 for when using multicolumn indexes  
							
							 
							
							
							
						 
						
							2016-07-04 19:44:55 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								b5fb7458d5 
								
							
								 
							
						 
						
							
							
								
								Actually we need to order these properly  
							
							 
							
							... 
							
							
							
							otherwise we'll end up returning the wrong 20 
							
						 
						
							2016-06-22 18:07:14 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								f73fdb04a6 
								
							
								 
							
						 
						
							
							
								
								Style  
							
							 
							
							
							
						 
						
							2016-06-22 17:51:40 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								3a4120e49a 
								
							
								 
							
						 
						
							
							
								
								Put most recent 20 messages in notif  
							
							 
							
							... 
							
							
							
							Fixes https://github.com/vector-im/vector-web/issues/1648  
							
						 
						
							2016-06-22 17:47:18 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								d60eed0710 
								
							
								 
							
						 
						
							
							
								
								Limit number of notifications in an email notification  
							
							 
							
							
							
						 
						
							2016-06-01 11:45:43 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								37b7e84620 
								
							
								 
							
						 
						
							
							
								
								Include the ts the notif was received at  
							
							 
							
							
							
						 
						
							2016-05-24 11:33:32 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								a24bc5b2dc 
								
							
								 
							
						 
						
							
							
								
								Add GET /notifications API  
							
							 
							
							
							
						 
						
							2016-05-23 18:33:51 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								31b5395ab6 
								
							
								 
							
						 
						
							
							
								
								Remove debug logging  
							
							 
							
							
							
						 
						
							2016-05-23 16:32:01 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								c2da3406fc 
								
							
								 
							
						 
						
							
							
								
								Oops, missing comma  
							
							 
							
							
							
						 
						
							2016-05-20 18:03:31 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								ccffb0965d 
								
							
								 
							
						 
						
							
							
								
								Remove stale line  
							
							 
							
							
							
						 
						
							2016-05-20 17:59:10 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								18d68bfee4 
								
							
								 
							
						 
						
							
							
								
								Handle empty events table  
							
							 
							
							
							
						 
						
							2016-05-20 17:58:09 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								d4503e25ed 
								
							
								 
							
						 
						
							
							
								
								Make deleting push actions more efficient  
							
							 
							
							... 
							
							
							
							There's no index on received_ts, so manually binary search using the stream_ordering index, and only update it once an hour. 
							
						 
						
							2016-05-20 17:56:10 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								149fa411e2 
								
							
								 
							
						 
						
							
							
								
								Only delete push actions after 30 days  
							
							 
							
							
							
						 
						
							2016-05-20 15:25:12 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e00e8f2166 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #769  from matrix-org/erikj/push_actions_delete  
							
							 
							
							... 
							
							
							
							Delete old pushers 
							
						 
						
							2016-05-13 14:41:36 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								80be396464 
								
							
								 
							
						 
						
							
							
								
								Correct SQL statement for postgres  
							
							 
							
							... 
							
							
							
							In standard sql, join binds tighter than comma, so we were joining on the wrong table. Postgres follows the standard (apparently). 
							
						 
						
							2016-05-04 13:19:59 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								183f23f10d 
								
							
								 
							
						 
						
							
							
								
								Delete old pushers  
							
							 
							
							
							
						 
						
							2016-05-03 14:22:33 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								35b7b8e4bc 
								
							
								 
							
						 
						
							
							
								
								Remove unused function  
							
							 
							
							
							
						 
						
							2016-04-29 20:10:34 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								b0a1036d93 
								
							
								 
							
						 
						
							
							
								
								Use explicit join  
							
							 
							
							
							
						 
						
							2016-04-29 19:28:56 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								8f99cd5996 
								
							
								 
							
						 
						
							
							
								
								Oops, actually specify the user id  
							
							 
							
							
							
						 
						
							2016-04-29 19:27:03 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								60f44c098d 
								
							
								 
							
						 
						
							
							
								
								Remove unnecessary if  
							
							 
							
							
							
						 
						
							2016-04-29 19:17:10 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								50ad8005e4 
								
							
								 
							
						 
						
							
							
								
								Put spaces at start of line  
							
							 
							
							
							
						 
						
							2016-04-29 19:16:15 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								f63bd4ff47 
								
							
								 
							
						 
						
							
							
								
								Send a rather basic email notif  
							
							 
							
							... 
							
							
							
							Also pep8 fixes 
							
						 
						
							2016-04-20 13:02:01 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								07d765209d 
								
							
								 
							
						 
						
							
							
								
								First bits of emailpusher  
							
							 
							
							... 
							
							
							
							Mostly logic of when to send an email 
							
						 
						
							2016-04-19 14:24:36 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a2546b9082 
								
							
								 
							
						 
						
							
							
								
								Fix query for get_unread_push_actions_for_user_in_range  
							
							 
							
							
							
						 
						
							2016-04-14 11:08:31 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								767fc0b739 
								
							
								 
							
						 
						
							
							
								
								pep8  
							
							 
							
							
							
						 
						
							2016-04-13 14:23:27 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								54d08c8868 
								
							
								 
							
						 
						
							
							
								
								Only return unread notifications  
							
							 
							
							... 
							
							
							
							Make get_unread_push_actions_for_user_in_range only return unread event actions, being more true to its name. Done in two separate sql queries to get actions after a read receipt and those in a room wiht no receipt at all. SQL queries by Erik. 
							
						 
						
							2016-04-13 14:16:45 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								3fb35cbd6f 
								
							
								 
							
						 
						
							
							
								
								Oops, inequality fail  
							
							 
							
							
							
						 
						
							2016-04-07 17:33:37 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								0fd1cd2400 
								
							
								 
							
						 
						
							
							
								
								pep8  
							
							 
							
							
							
						 
						
							2016-04-06 16:50:47 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								7e2c89a37f 
								
							
								 
							
						 
						
							
							
								
								Make pushers use the event_push_actions table instead of listening on an event stream & running the rules again. Sytest passes, but remaining to do:  
							
							 
							
							... 
							
							
							
							* Make badges work again
 * Remove old, unused code 
							
						 
						
							2016-04-06 15:42:15 +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
							
						 
						
							 
							
							
							
								
							
								6cf0ba1466 
								
							
								 
							
						 
						
							
							
								
								Bump get_unread_event_push_actions_by_room_for_user cache  
							
							 
							
							
							
						 
						
							2016-03-22 14:18:21 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								b9977ea667 
								
							
								 
							
						 
						
							
							
								
								Remove dead code for setting device specific rules.  
							
							 
							
							... 
							
							
							
							It wasn't possible to hit the code from the API because of a typo
in parsing the request path. Since no-one was using the feature
we might as well remove the dead code. 
							
						 
						
							2016-02-18 16:05:13 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								0214745239 
								
							
								 
							
						 
						
							
							
								
								Rename functions  
							
							 
							
							
							
						 
						
							2016-02-10 11:09:56 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								7b0d846407 
								
							
								 
							
						 
						
							
							
								
								Atomically persit push actions when we persist the event  
							
							 
							
							
							
						 
						
							2016-02-09 16:19:15 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4d36e73230 
								
							
								 
							
						 
						
							
							
								
								Actually return something sensible  
							
							 
							
							
							
						 
						
							2016-02-03 16:35:00 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								aa4af94c69 
								
							
								 
							
						 
						
							
							
								
								We return dicts now.  
							
							 
							
							
							
						 
						
							2016-02-03 16:29:32 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								771528ab13 
								
							
								 
							
						 
						
							
							
								
								Change event_push_actions_rm_tokens schema  
							
							 
							
							
							
						 
						
							2016-02-03 10:50:49 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								10f76dc5da 
								
							
								 
							
						 
						
							
							
								
								Make LRU cache not default to treecache & add options to use it  
							
							 
							
							
							
						 
						
							2016-01-22 12:10:33 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								42eae4634f 
								
							
								 
							
						 
						
							
							
								
								Use new invalidate_many cache invalidation to invalidate the event_push_actions cache appropriately.  
							
							 
							
							
							
						 
						
							2016-01-22 11:22:48 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								8f66fe6392 
								
							
								 
							
						 
						
							
							
								
								Cache get_unread_event_push_actions_by_room_for_user  
							
							 
							
							
							
						 
						
							2016-01-21 15:02:07 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3adcc4c86a 
								
							
								 
							
						 
						
							
							
								
								Return highlight_count in /sync  
							
							 
							
							
							
						 
						
							2016-01-19 11:35:50 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								a8e9e0b916 
								
							
								 
							
						 
						
							
							
								
								Remove the PushersTable and EventPushActionsTable objects  
							
							 
							
							
							
						 
						
							2016-01-12 14:41:26 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								992928304f 
								
							
								 
							
						 
						
							
							
								
								Delete notifications for redacted events  
							
							 
							
							
							
						 
						
							2016-01-06 11:58:46 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								c79f221192 
								
							
								 
							
						 
						
							
							
								
								Add is_guest flag to users db to track whether a user is a guest user or not. Use this so we can run _filter_events_for_client when calculating event_push_actions.  
							
							 
							
							
							
						 
						
							2016-01-06 11:38:09 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								4eb7b950c8 
								
							
								 
							
						 
						
							
							
								
								= not == in sql  
							
							 
							
							
							
						 
						
							2016-01-04 18:11:17 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								c914d67cda 
								
							
								 
							
						 
						
							
							
								
								Rename event-actions to event_push_actions as per PR request  
							
							 
							
							
							
						 
						
							2016-01-04 14:05:37 +00:00