diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2019-06-05 13:38:01 +0100 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2019-06-05 13:38:01 +0100 |
| commit | 40596aec0ec6da1e8918255b75eb5329292901ab (patch) | |
| tree | a918b5ebfc4b48f8996b247df7ca75cd7cbb5d0f /synapse/storage/registration.py | |
| parent | Lint (diff) | |
| parent | Clean up debug logging (#5347) (diff) | |
| download | synapse-40596aec0ec6da1e8918255b75eb5329292901ab.tar.xz | |
Merge branch 'develop' into m-heroes-empty-room-name
Diffstat (limited to 'synapse/storage/registration.py')
| -rw-r--r-- | synapse/storage/registration.py | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/synapse/storage/registration.py b/synapse/storage/registration.py index 03a06a83d6..4cf159ba81 100644 --- a/synapse/storage/registration.py +++ b/synapse/storage/registration.py @@ -1,5 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright 2014 - 2016 OpenMarket Ltd +# Copyright 2014-2016 OpenMarket Ltd +# Copyright 2017-2018 New Vector Ltd +# Copyright 2019 The Matrix.org Foundation C.I.C. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -725,17 +727,7 @@ class RegistrationStore( raise StoreError(400, "User ID already taken.", errcode=Codes.USER_IN_USE) if self._account_validity.enabled: - now_ms = self.clock.time_msec() - expiration_ts = now_ms + self._account_validity.period - self._simple_insert_txn( - txn, - "account_validity", - values={ - "user_id": user_id, - "expiration_ts_ms": expiration_ts, - "email_sent": False, - } - ) + self.set_expiration_date_for_user_txn(txn, user_id) if token: # it's possible for this to get a conflict, but only for a single user |