diff options
| author | Erik Johnston <erik@matrix.org> | 2017-03-13 09:59:54 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-03-13 09:59:54 +0000 |
| commit | 672dcf59d3f9da12da43a77e316e2eec76d3ee4c (patch) | |
| tree | 9186644b06ef01e609ca018e02100ceecf0f3ea4 /synapse/push/emailpusher.py | |
| parent | Merge tag 'v0.19.3-rc1' into release-v0.19.3 (diff) | |
| parent | Revert "Support registration & login with phone number" (diff) | |
| download | synapse-672dcf59d3f9da12da43a77e316e2eec76d3ee4c.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.19.3
Diffstat (limited to 'synapse/push/emailpusher.py')
| -rw-r--r-- | synapse/push/emailpusher.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/push/emailpusher.py b/synapse/push/emailpusher.py index 2eb325c7c7..c7afd11111 100644 --- a/synapse/push/emailpusher.py +++ b/synapse/push/emailpusher.py @@ -218,7 +218,8 @@ class EmailPusher(object): ) def seconds_until(self, ts_msec): - return (ts_msec - self.clock.time_msec()) / 1000 + secs = (ts_msec - self.clock.time_msec()) / 1000 + return max(secs, 0) def get_room_throttle_ms(self, room_id): if room_id in self.throttle_params: |