summary refs log tree commit diff
path: root/synapse/notifier.py
diff options
context:
space:
mode:
authorKrombel <krombel@krombel.de>2017-06-21 14:48:21 +0200
committerKrombel <krombel@krombel.de>2017-06-21 14:48:21 +0200
commit4202fba82a255eb52783a91d873b91aa8ef2191c (patch)
tree73975e960b5a80f7a466cbf62810639662093d4a /synapse/notifier.py
parentreplaced json.dumps with encode_canonical_json (diff)
parentMerge pull request #2292 from matrix-org/erikj/quarantine_media (diff)
downloadsynapse-4202fba82a255eb52783a91d873b91aa8ef2191c.tar.xz
Merge branch 'develop' into avoid_duplicate_filters
Diffstat (limited to 'synapse/notifier.py')
-rw-r--r--synapse/notifier.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/notifier.py b/synapse/notifier.py

index 48566187ab..385208b574 100644 --- a/synapse/notifier.py +++ b/synapse/notifier.py
@@ -251,7 +251,8 @@ class Notifier(object): """Notify any user streams that are interested in this room event""" # poke any interested application service. preserve_fn(self.appservice_handler.notify_interested_services)( - room_stream_id) + room_stream_id + ) if self.federation_sender: preserve_fn(self.federation_sender.notify_new_events)(