diff options
| author | lain <lain@soykaf.club> | 2021-01-26 14:24:32 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2021-01-26 14:24:32 +0000 |
| commit | 229acae6c3da541ebb0438cb7f310cdce1df92b3 (patch) | |
| tree | 8b93f46ac090021e7e53db392ba54a3c48b31fda /lib/pleroma/web/twitter_api/twitter_api.ex | |
| parent | 71166b30a42ad3a8988049992bcab93c7e2ed656 (diff) | |
| parent | 250e2020987b1fc65251ba9564e41b38ba060391 (diff) | |
| download | pleroma-229acae6c3da541ebb0438cb7f310cdce1df92b3.tar.gz | |
Merge branch 'develop' into '2435-list-multiple-users'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api.ex')
| -rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex index f6d721da6..76ca82d20 100644 --- a/lib/pleroma/web/twitter_api/twitter_api.ex +++ b/lib/pleroma/web/twitter_api/twitter_api.ex @@ -59,7 +59,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do def password_reset(nickname_or_email) do with true <- is_binary(nickname_or_email), - %User{local: true, email: email, deactivated: false} = user when is_binary(email) <- + %User{local: true, email: email, is_active: true} = user when is_binary(email) <- User.get_by_nickname_or_email(nickname_or_email), {:ok, token_record} <- Pleroma.PasswordResetToken.create_token(user) do user |