diff options
author | Erik Johnston <erikj@jki.re> | 2017-06-24 13:13:51 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-24 13:13:51 +0100 |
commit | ff13c5e7af3ae6b6469acc0aeee01ffb7be144c6 (patch) | |
tree | 73287e2ea5c82bcb573136105f0095b1f226a6c8 /synapse/push/httppusher.py | |
parent | Merge pull request #2299 from matrix-org/erikj/segregate_url_cache_downloads (diff) | |
parent | Change the config file generator to more descriptive explanation of push.reda... (diff) | |
download | synapse-ff13c5e7af3ae6b6469acc0aeee01ffb7be144c6.tar.xz |
Merge pull request #2301 from xwiki-labs/push-redact-content
Add configuration parameter to allow redaction of content from push m…
Diffstat (limited to 'synapse/push/httppusher.py')
-rw-r--r-- | synapse/push/httppusher.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/push/httppusher.py b/synapse/push/httppusher.py index c0f8176e3d..8a5d473108 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 self.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 |