diff --git a/app/blueprints/users/account.py b/app/blueprints/users/account.py index 851d34b6..48662342 100644 --- a/app/blueprints/users/account.py +++ b/app/blueprints/users/account.py @@ -286,9 +286,7 @@ def verify_email(): flash(gettext("Unknown verification token!"), "danger") return redirect(url_for("homepage.home")) - delta = (datetime.datetime.now() - ver.created_at) - delta: datetime.timedelta - if delta.total_seconds() > 12*60*60: + if ver.is_expired: flash(gettext("Token has expired"), "danger") db.session.delete(ver) db.session.commit() diff --git a/app/models/users.py b/app/models/users.py index 928234d4..516e868b 100644 --- a/app/models/users.py +++ b/app/models/users.py @@ -371,6 +371,12 @@ class UserEmailVerification(db.Model): is_password_reset = db.Column(db.Boolean, nullable=False, default=False) created_at = db.Column(db.DateTime, nullable=False, default=datetime.datetime.utcnow) + @property + def is_expired(self): + delta = (datetime.datetime.now() - self.created_at) + delta: datetime.timedelta + return delta.total_seconds() > 12 * 60 * 60 + class EmailSubscription(db.Model): id = db.Column(db.Integer, primary_key=True) diff --git a/app/templates/users/modtools.html b/app/templates/users/modtools.html index b19515f8..a7f40bc2 100644 --- a/app/templates/users/modtools.html +++ b/app/templates/users/modtools.html @@ -112,4 +112,17 @@ {% endif %} + +

{{ _("Pending email verifications") }}

+ + {% endblock %}