MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-06-28 07:28:19 +02:00
Code Issues Projects Releases Wiki Activity

Fix TravisCI tests for PR #2301

Browse source
This commit is contained in:
Caleb James DeLisle 2017-06-23 15:15:18 +02:00
parent 1591eddaea
commit 75eba3b07d
3 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
synapse/config/pushconfig.py → push.py
View file

@ -13,9 +13,6 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # 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 from ._base import Config

2
synapse/config/homeserver.py
View file

@ -33,7 +33,7 @@ from .jwt import JWTConfig
from .password_auth_providers import PasswordAuthProviderConfig from .password_auth_providers import PasswordAuthProviderConfig
from .emailconfig import EmailConfig from .emailconfig import EmailConfig
from .workers import WorkerConfig from .workers import WorkerConfig
from .pushconfig import PushConfig from .push import PushConfig
class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig, class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig,

2
synapse/push/httppusher.py
View file

@ -275,7 +275,7 @@ class HttpPusher(object):
if event.type == 'm.room.member': if event.type == 'm.room.member':
d['notification']['membership'] = event.content['membership'] d['notification']['membership'] = event.content['membership']
d['notification']['user_is_target'] = event.state_key == self.user_id 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 d['notification']['content'] = event.content
# We no longer send aliases separately, instead, we send the human # We no longer send aliases separately, instead, we send the human