2a98ba0ed3 
								
							
								 
							
						 
						
							
							
								
								Rename redact_content option to include_content  
							
							... 
							
							
							
							The redact_content option never worked because it read the wrong config
section. The PR introducing it
(https://github.com/matrix-org/synapse/pull/2301 ) had feedback suggesting the
name be changed to not re-use the term 'redact' but this wasn't
incorporated.
This reanmes the option to give it a less confusing name, and also
means that people who've set the redact_content option won't suddenly
see a behaviour change when upgrading synapse, but instead can set
include_content if they want to.
This PR also updates the wording of the config comment to clarify
that this has no effect on event_id_only push.
Includes https://github.com/matrix-org/synapse/pull/2422  
							
						 
						
							2017-11-08 10:35:30 +00:00  
				
					
						
							
							
								 
						
							
							
								eaaabc6c4f 
								
							
								 
							
						 
						
							
							
								
								replace 'except:' with 'except Exception:'  
							
							... 
							
							
							
							what could possibly go wrong 
							
						 
						
							2017-10-23 15:52:32 +01:00  
				
					
						
							
							
								 
						
							
							
								436ee0a2ea 
								
							
								 
							
						 
						
							
							
								
								Also include the room_id  
							
							... 
							
							
							
							as really it's part of the event ID 
							
						 
						
							2017-09-18 15:58:38 +01:00  
				
					
						
							
							
								 
						
							
							
								b393f5db51 
								
							
								 
							
						 
						
							
							
								
								Use .get - it's much shorter  
							
							
							
						 
						
							2017-09-18 15:50:26 +01:00  
				
					
						
							
							
								 
						
							
							
								a2562f9d74 
								
							
								 
							
						 
						
							
							
								
								Add support for event_id_only push format  
							
							... 
							
							
							
							Param in the data dict of a pusher that tells an HTTP pusher to
send just the event_id of the event it's notifying about and the
notification counts. For clients that want to go & fetch the body
of the event themselves anyway. 
							
						 
						
							2017-09-18 15:39:39 +01:00  
				
					
						
							
							
								 
						
							
							
								75eba3b07d 
								
							
								 
							
						 
						
							
							
								
								Fix TravisCI tests for PR  #2301  
							
							
							
						 
						
							2017-06-23 15:15:18 +02:00  
				
					
						
							
							
								 
						
							
							
								1591eddaea 
								
							
								 
							
						 
						
							
							
								
								Add configuration parameter to allow redaction of content from push messages for google/apple devices  
							
							
							
						 
						
							2017-06-23 13:01:04 +02:00  
				
					
						
							
							
								 
						
							
							
								7356d52e73 
								
							
								 
							
						 
						
							
							
								
								Fix up push to use get_current_state_ids  
							
							
							
						 
						
							2016-08-25 18:35:49 +01:00  
				
					
						
							
							
								 
						
							
							
								b260f92936 
								
							
								 
							
						 
						
							
							
								
								Ignore AlreadyCalled errors on timer cancel  
							
							
							
						 
						
							2016-07-31 16:00:12 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								870c45913e 
								
							
								 
							
						 
						
							
							
								
								Use similar naming we use in email notifs for push  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/vector-web/issues/1654  
							
						 
						
							2016-06-24 11:41:11 +01:00  
				
					
						
							
							
								 
						
							
							
								a3ac837599 
								
							
								 
							
						 
						
							
							
								
								Optionally split out the pushers into a separate process  
							
							
							
						 
						
							2016-04-21 17:22:37 +01:00  
				
					
						
							
							
								 
						
							
							
								86e9bbc74e 
								
							
								 
							
						 
						
							
							
								
								Add missing yield  
							
							
							
						 
						
							2016-04-14 11:56:52 +01:00  
				
					
						
							
							
								 
						
							
							
								e40f25ebe1 
								
							
								 
							
						 
						
							
							
								
								Rename log context  
							
							
							
						 
						
							2016-04-14 11:54:14 +01:00  
				
					
						
							
							
								 
						
							
							
								2ae91a9e2f 
								
							
								 
							
						 
						
							
							
								
								Make send_badge private  
							
							
							
						 
						
							2016-04-14 11:37:50 +01:00  
				
					
						
							
							
								 
						
							
							
								56da835eaf 
								
							
								 
							
						 
						
							
							
								
								Add necessary logging contexts  
							
							
							
						 
						
							2016-04-14 11:33:50 +01:00  
				
					
						
							
							
								 
						
							
							
								7be1065b8f 
								
							
								 
							
						 
						
							
							
								
								Add extra Measure  
							
							
							
						 
						
							2016-04-14 11:26:15 +01:00  
				
					
						
							
							
								 
						
							
							
								9bb041791c 
								
							
								 
							
						 
						
							
							
								
								Run unsafe proces in a loop until we've caught up  
							
							... 
							
							
							
							and wrap unsafe process in a try block 
							
						 
						
							2016-04-11 12:48:30 +01:00  
				
					
						
							
							
								 
						
							
							
								d96a070a3a 
								
							
								 
							
						 
						
							
							
								
								Actually check if we;re processing  
							
							
							
						 
						
							2016-04-08 16:49:39 +01:00  
				
					
						
							
							
								 
						
							
							
								7b6d519482 
								
							
								 
							
						 
						
							
							
								
								Make sure max stream ordering only increases  
							
							
							
						 
						
							2016-04-08 14:08:16 +01:00  
				
					
						
							
							
								 
						
							
							
								52d1008661 
								
							
								 
							
						 
						
							
							
								
								Unsafe process should call itself if the max has changed  
							
							
							
						 
						
							2016-04-08 14:06:54 +01:00  
				
					
						
							
							
								 
						
							
							
								ce3fe52498 
								
							
								 
							
						 
						
							
							
								
								Comment why unsafe process is unsafe  
							
							
							
						 
						
							2016-04-08 14:02:38 +01:00  
				
					
						
							
							
								 
						
							
							
								a4a31fa8dc 
								
							
								 
							
						 
						
							
							
								
								Only pass in what we need  
							
							
							
						 
						
							2016-04-07 17:37:19 +01:00  
				
					
						
							
							
								 
						
							
							
								15e0f1696f 
								
							
								 
							
						 
						
							
							
								
								Wrap process in a flag so we don't process whist already processing.  
							
							
							
						 
						
							2016-04-07 17:31:08 +01:00  
				
					
						
							
							
								 
						
							
							
								fa129ce5b5 
								
							
								 
							
						 
						
							
							
								
								Add measure blocks  
							
							
							
						 
						
							2016-04-07 17:12:29 +01:00  
				
					
						
							
							
								 
						
							
							
								e1e042f2a1 
								
							
								 
							
						 
						
							
							
								
								Add comments on min_stream_id  
							
							... 
							
							
							
							saying that the min stream id won't be completely accurate all the time 
							
						 
						
							2016-04-07 17:09:36 +01:00  
				
					
						
							
							
								 
						
							
							
								d549fdfa22 
								
							
								 
							
						 
						
							
							
								
								Remove code that's now been obsoleted or moved elsewhere  
							
							
							
						 
						
							2016-04-07 16:31:38 +01:00  
				
					
						
							
							
								 
						
							
							
								92e3071623 
								
							
								 
							
						 
						
							
							
								
								Send badge count pushes.  
							
							... 
							
							
							
							Also fix bugs with retrying. 
							
						 
						
							2016-04-07 15:39:53 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								afb7b377f2 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into push_badge_counts  
							
							
							
						 
						
							2016-01-19 18:17:23 +00:00  
				
					
						
							
							
								 
						
							
							
								12623c99b6 
								
							
								 
							
						 
						
							
							
								
								Use the unread notification count to send accurate badge counts in push notifications.  
							
							
							
						 
						
							2016-01-13 18:55:57 +00:00  
				
					
						
							
							
								 
						
							
							
								9c1f853d58 
								
							
								 
							
						 
						
							
							
								
								Rename 'user_name' to 'user_id' in push to make it consistent with the rest of the code  
							
							
							
						 
						
							2016-01-13 13:32:59 +00:00  
				
					
						
							
							
								 
						
							
							
								6c28ac260c 
								
							
								 
							
						 
						
							
							
								
								copyrights  
							
							
							
						 
						
							2016-01-07 04:26:29 +00:00  
				
					
						
							
							
								 
						
							
							
								37b2d69bbc 
								
							
								 
							
						 
						
							
							
								
								Reuse a single http client, rather than creating new ones  
							
							
							
						 
						
							2015-12-02 11:36:02 +00:00  
				
					
						
							
							
								 
						
							
							
								be9dafcd37 
								
							
								 
							
						 
						
							
							
								
								Dial down logging for failed pushers  
							
							
							
						 
						
							2015-03-06 15:32:38 +00:00  
				
					
						
							
							
								 
						
							
							
								5ecc768970 
								
							
								 
							
						 
						
							
							
								
								Add attribute so push gateways can tell if a member event is about the user in question  
							
							
							
						 
						
							2015-03-06 14:41:50 +00:00  
				
					
						
							
							
								 
						
							
							
								b457f1677c 
								
							
								 
							
						 
						
							
							
								
								Send room ID in http notifications so clients know which room to go to if the user responds to the notification.  
							
							
							
						 
						
							2015-02-19 10:06:17 +00:00  
				
					
						
							
							
								 
						
							
							
								dc7bb70f22 
								
							
								 
							
						 
						
							
							
								
								s/instance_handle/profile_tag/  
							
							
							
						 
						
							2015-02-03 16:51:07 +00:00  
				
					
						
							
							
								 
						
							
							
								365e007bee 
								
							
								 
							
						 
						
							
							
								
								Ignore empty strings for display names & room names in notifications  
							
							
							
						 
						
							2015-01-31 12:48:06 +00:00  
				
					
						
							
							
								 
						
							
							
								fc946f3b8d 
								
							
								 
							
						 
						
							
							
								
								Include content in notification pokes  
							
							
							
						 
						
							2015-01-29 21:59:17 +00:00  
				
					
						
							
							
								 
						
							
							
								0b16886397 
								
							
								 
							
						 
						
							
							
								
								Change 'from' in notification pokes to 'sender' to match client API v2. Send sender display names where they exist.  
							
							
							
						 
						
							2015-01-29 18:51:22 +00:00  
				
					
						
							
							
								 
						
							
							
								acb68a39e0 
								
							
								 
							
						 
						
							
							
								
								Code style fixes.  
							
							
							
						 
						
							2015-01-29 16:12:40 +00:00  
				
					
						
							
							
								 
						
							
							
								5f2665320f 
								
							
								 
							
						 
						
							
							
								
								It is 2015  
							
							
							
						 
						
							2015-01-28 14:11:45 +00:00  
				
					
						
							
							
								 
						
							
							
								273b12729b 
								
							
								 
							
						 
						
							
							
								
								Reset badge count to zero when last active time is bumped  
							
							
							
						 
						
							2015-01-28 11:55:49 +00:00  
				
					
						
							
							
								 
						
							
							
								b481889117 
								
							
								 
							
						 
						
							
							
								
								Support membership events and more camelcase/underscores  
							
							
							
						 
						
							2015-01-26 17:27:28 +00:00  
				
					
						
							
							
								 
						
							
							
								f21f9fa3c5 
								
							
								 
							
						 
						
							
							
								
								Use push settings!  
							
							
							
						 
						
							2015-01-23 17:07:06 +00:00  
				
					
						
							
							
								 
						
							
							
								5d5932d493 
								
							
								 
							
						 
						
							
							
								
								use underscores everywhere, not camelcase.  
							
							
							
						 
						
							2015-01-20 11:52:08 +00:00  
				
					
						
							
							
								 
						
							
							
								afb714f7be 
								
							
								 
							
						 
						
							
							
								
								add instance_handles to pushers so we have a way to refer to them even if the push token changes.  
							
							
							
						 
						
							2015-01-20 11:49:48 +00:00  
				
					
						
							
							
								 
						
							
							
								2ca2dbc821 
								
							
								 
							
						 
						
							
							
								
								Send room name and first alias in notification poke.  
							
							
							
						 
						
							2015-01-15 16:56:18 +00:00