aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2018-08-26 22:56:18 +0000
committerkaniini <nenolod@gmail.com>2018-08-26 22:56:18 +0000
commit927be2c62b40fafdfd3eabba768bccf428d4c74d (patch)
tree75514700ffff06c66afa4c06225f97f4d17686b4 /lib
parente394e5943dd2fa6602dc62d148259fd3e125a077 (diff)
parentbc3c30430e564a510c80694ef30091942520d1e8 (diff)
downloadpleroma-927be2c62b40fafdfd3eabba768bccf428d4c74d.tar.gz
Merge branch 'bugfix/formatting' into 'develop'
fix formatting See merge request pleroma/pleroma!301
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/router.ex7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 913152c5a..68e159f6a 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -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