diff options
| author | Caleb James DeLisle <cjd@cjdns.fr> | 2017-06-23 15:15:18 +0200 |
|---|---|---|
| committer | Caleb James DeLisle <cjd@cjdns.fr> | 2017-06-23 15:15:18 +0200 |
| commit | 75eba3b07d58743f24068efef67d5755f58207ba (patch) | |
| tree | 57ee957b40b4cfbabd2be0545fe1fe0fe24af3a7 /synapse | |
| parent | Add configuration parameter to allow redaction of content from push messages ... (diff) | |
| download | synapse-75eba3b07d58743f24068efef67d5755f58207ba.tar.xz | |
Fix TravisCI tests for PR #2301
Diffstat (limited to '')
| -rw-r--r-- | push.py (renamed from synapse/config/pushconfig.py) | 3 | ||||
| -rw-r--r-- | synapse/config/homeserver.py | 2 | ||||
| -rw-r--r-- | synapse/push/httppusher.py | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/synapse/config/pushconfig.py b/push.py index afe8aba0a8..4e5f428820 100644 --- a/synapse/config/pushconfig.py +++ b/push.py @@ -13,9 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -# This file can't be called email.py because if it is, we cannot: -import email.utils - from ._base import Config diff --git a/synapse/config/homeserver.py b/synapse/config/homeserver.py index 327c7e4fc6..b22cacf8dc 100644 --- a/synapse/config/homeserver.py +++ b/synapse/config/homeserver.py @@ -33,7 +33,7 @@ from .jwt import JWTConfig from .password_auth_providers import PasswordAuthProviderConfig from .emailconfig import EmailConfig from .workers import WorkerConfig -from .pushconfig import PushConfig +from .push import PushConfig class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig, diff --git a/synapse/push/httppusher.py b/synapse/push/httppusher.py index f3f872895a..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 not hs.config.push_redact_content and '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 |