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/config/pushconfig.py b/synapse/config/pushconfig.py
deleted file mode 100644
index afe8aba0a8..0000000000
--- a/synapse/config/pushconfig.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright 2015, 2016 OpenMarket Ltd
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# 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
-
-
-class PushConfig(Config):
- def read_config(self, config):
- self.push_redact_content = False
-
- push_config = config.get("email", {})
- self.push_redact_content = push_config.get("redact_content", False)
-
- def default_config(self, config_dir_path, server_name, **kwargs):
- return """
- # Control how push messages are sent to google/apple to notifications.
- # Normally every message is posted to a push server hosted by matrix.org
- # which is registered with google and apple in order to allow push
- # notifications to be sent to mobile devices.
- # Setting redact_content to true will make the push messages contain no
- # message content which will provide increased privacy.
- #
- #push:
- # redact_content: false
- """
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
|
