summary refs log tree commit diff
path: root/synapse/push
diff options
context:
space:
mode:
authorDavid Baker <dbkr@users.noreply.github.com>2017-11-15 10:47:38 +0000
committerGitHub <noreply@github.com>2017-11-15 10:47:38 +0000
commit7190a550dc766a820f27781b33a990cb0769e731 (patch)
tree8bf624e922f47ef2e3b0b484b5430501e3329b19 /synapse/push
parentMerge pull request #2648 from krombel/update_prometheus (diff)
parentPrint instead of logging (diff)
downloadsynapse-7190a550dc766a820f27781b33a990cb0769e731.tar.xz
Merge pull request #2650 from matrix-org/dbkr/push_include_content_option
Rename redact_content option to include_content
Diffstat (limited to 'synapse/push')
-rw-r--r--synapse/push/httppusher.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/push/httppusher.py b/synapse/push/httppusher.py
index 74c0bc462c..c16f61452c 100644
--- a/synapse/push/httppusher.py
+++ b/synapse/push/httppusher.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 # Copyright 2015, 2016 OpenMarket Ltd
+# Copyright 2017 New Vector Ltd
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -295,7 +296,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 not self.hs.config.push_redact_content and 'content' in event:
+        if self.hs.config.push_include_content and 'content' in event:
             d['notification']['content'] = event.content
 
         # We no longer send aliases separately, instead, we send the human