diff options
| author | David Baker <dave@matrix.org> | 2016-10-19 11:28:56 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-10-19 11:28:56 +0100 |
| commit | a7f48320b18ecfb7dce23a153fb2ade9de481aaa (patch) | |
| tree | a1722ba6980bb8066e948013e2bfb2ec2a660f26 /synapse/push | |
| parent | Convert emails to lowercase when storing (diff) | |
| parent | Merge pull request #1174 from matrix-org/erikj/email_push_noop (diff) | |
| download | synapse-a7f48320b18ecfb7dce23a153fb2ade9de481aaa.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/password_reset_case_insensitive
Diffstat (limited to 'synapse/push')
| -rw-r--r-- | synapse/push/emailpusher.py | 4 | ||||
| -rw-r--r-- | synapse/push/mailer.py | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/synapse/push/emailpusher.py b/synapse/push/emailpusher.py index 6600c9cd55..2eb325c7c7 100644 --- a/synapse/push/emailpusher.py +++ b/synapse/push/emailpusher.py @@ -150,6 +150,10 @@ class EmailPusher(object): soonest_due_at = None + if not unprocessed: + yield self.save_last_stream_ordering_and_success(self.max_stream_ordering) + return + for push_action in unprocessed: received_at = push_action['received_ts'] if received_at is None: diff --git a/synapse/push/mailer.py b/synapse/push/mailer.py index 3b63c19eca..53551632b6 100644 --- a/synapse/push/mailer.py +++ b/synapse/push/mailer.py @@ -372,7 +372,7 @@ class Mailer(object): state_event_id = room_state_ids[room_id][ ("m.room.member", event.sender) ] - state_event = yield self.get_event(state_event_id) + state_event = yield self.store.get_event(state_event_id) sender_name = name_from_member_event(state_event) if sender_name is not None and room_name is not None: |