summary refs log tree commit diff
path: root/synapse/handlers/message.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-10-20 19:27:41 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2020-10-20 19:27:41 +0100
commit8ee3f063a82e33e1f9adb495f96eec57e857eb0a (patch)
treea98a1dbffab83cea2a7c50feba106dcdc6cb6cbd /synapse/handlers/message.py
parentMerge commit '536f4a248' into anoa/dinsic_release_1_21_x (diff)
parentShow a confirmation page during user password reset (#8004) (diff)
downloadsynapse-8ee3f063a82e33e1f9adb495f96eec57e857eb0a.tar.xz
Merge commit 'a3a90ee03' into anoa/dinsic_release_1_21_x
* commit 'a3a90ee03':
  Show a confirmation page during user password reset (#8004)
  Do not error when thumbnailing invalid files (#8236)
  Remove some unused distributor signals (#8216)
  Fixup pusher pool notifications (#8287)
  Revert "Fixup pusher pool notifications"
  Fixup pusher pool notifications
Diffstat (limited to 'synapse/handlers/message.py')
-rw-r--r--synapse/handlers/message.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py

index cc9baa6a68..4d011dfe9a 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py
@@ -1148,7 +1148,7 @@ class EventCreationHandler: # If there's an expiry timestamp on the event, schedule its expiry. self._message_handler.maybe_schedule_expiry(event) - await self.pusher_pool.on_new_notifications(event_stream_id, max_stream_id) + await self.pusher_pool.on_new_notifications(max_stream_id) def _notify(): try: