Merge remote-tracking branch 'upstream/develop' into registration-workflow

2020-11-21 10:23:53 -06:00 · 2020-11-21 10:23:53 -06:00 · 30ed7b502f
commit 30ed7b502f
parent 9546c1444c ecd1ef8cb5
288 changed files with 3775 additions and 3624 deletions
--- a/lib/pleroma/web/twitter_api/controllers/password_controller.ex
+++ b/lib/pleroma/web/twitter_api/controllers/password_controller.ex
@ -17,6 +17,7 @@ defmodule Pleroma.Web.TwitterAPI.PasswordController do

  def reset(conn, %{"token" => token}) do
    with %{used: false} = token <- Repo.get_by(PasswordResetToken, %{token: token}),
+         false <- PasswordResetToken.expired?(token),
         %User{} = user <- User.get_cached_by_id(token.user_id) do
      render(conn, "reset.html", %{
        token: token,