summary refs log tree commit diff
path: root/synapse/push
diff options
context:
space:
mode:
authorCaleb James DeLisle <cjd@cjdns.fr>2017-06-23 13:01:04 +0200
committerCaleb James DeLisle <cjd@cjdns.fr>2017-06-23 13:01:04 +0200
commit1591eddaea779d2805afb1acc102630a8e580f0d (patch)
tree409d544263d05f48766823b9d7ad0a90da74c1ea /synapse/push
parentMerge pull request #2297 from matrix-org/erikj/user_dir_fix (diff)
downloadsynapse-1591eddaea779d2805afb1acc102630a8e580f0d.tar.xz
Add configuration parameter to allow redaction of content from push messages for google/apple devices
Diffstat (limited to 'synapse/push')
-rw-r--r--synapse/push/httppusher.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/push/httppusher.py b/synapse/push/httppusher.py
index c0f8176e3d..f3f872895a 100644
--- a/synapse/push/httppusher.py
+++ b/synapse/push/httppusher.py
@@ -275,7 +275,7 @@ class HttpPusher(object):
         if event.type == 'm.room.member':
             d['notification']['membership'] = event.content['membership']
             d['notification']['user_is_target'] = event.state_key == self.user_id
-        if 'content' in event:
+        if not hs.config.push_redact_content and 'content' in event:
             d['notification']['content'] = event.content
 
         # We no longer send aliases separately, instead, we send the human