diff options
| author | David Baker <dave@matrix.org> | 2016-10-14 15:10:38 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-10-14 15:10:38 +0100 |
| commit | bcb1245a2d4746d539ef60b9ca40e7ad16056efa (patch) | |
| tree | c5927411c6d329bbabbf3e41f8d98cda588b24ff /synapse/app/pusher.py | |
| parent | Make password reset email field case insensitive (diff) | |
| parent | Merge pull request #1169 from matrix-org/erikj/fix_email_notifs (diff) | |
| download | synapse-bcb1245a2d4746d539ef60b9ca40e7ad16056efa.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/password_reset_case_insensitive
Diffstat (limited to 'synapse/app/pusher.py')
| -rw-r--r-- | synapse/app/pusher.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/app/pusher.py b/synapse/app/pusher.py index d59f4a571c..1a6f5507a9 100644 --- a/synapse/app/pusher.py +++ b/synapse/app/pusher.py @@ -197,7 +197,7 @@ class PusherServer(HomeServer): yield start_pusher(user_id, app_id, pushkey) stream = results.get("events") - if stream: + if stream and stream["rows"]: min_stream_id = stream["rows"][0][0] max_stream_id = stream["position"] preserve_fn(pusher_pool.on_new_notifications)( @@ -205,7 +205,7 @@ class PusherServer(HomeServer): ) stream = results.get("receipts") - if stream: + if stream and stream["rows"]: rows = stream["rows"] affected_room_ids = set(row[1] for row in rows) min_stream_id = rows[0][0] |