mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-12-23 08:36:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bugfix/formatting' into 'develop'

Browse source 
fix formatting

See merge request pleroma/pleroma!301
This commit is contained in:
kaniini 2018-08-26 22:56:18 +00:00
commit 927be2c62b
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/pleroma/web/router.ex
View file

@ -13,9 +13,12 @@ defmodule Pleroma.Web.Router do
:ok,
cond do
# 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
user = Repo.get_by(User, %{email: username_or_email}) -> user
user = Repo.get_by(User, %{email: username_or_email}) ->
user
end
}
end