Merge branch 'bugfix/formatting' into 'develop'
fix formatting See merge request pleroma/pleroma!301
This commit is contained in:
commit
927be2c62b
|
@ -13,9 +13,12 @@ def user_fetcher(username_or_email) do
|
||||||
:ok,
|
:ok,
|
||||||
cond do
|
cond do
|
||||||
# First, try logging in as if it was a name
|
# First, try logging in as if it was a name
|
||||||
user = Repo.get_by(User, %{nickname: username_or_email}) -> user
|
user = Repo.get_by(User, %{nickname: username_or_email}) ->
|
||||||
|
user
|
||||||
|
|
||||||
# If we get nil, we try using it as an email
|
# If we get nil, we try using it as an email
|
||||||
user = Repo.get_by(User, %{email: username_or_email}) -> user
|
user = Repo.get_by(User, %{email: username_or_email}) ->
|
||||||
|
user
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue