logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 927be2c62b40fafdfd3eabba768bccf428d4c74d
parent: e394e5943dd2fa6602dc62d148259fd3e125a077
Author: kaniini <nenolod@gmail.com>
Date:   Sun, 26 Aug 2018 22:56:18 +0000

Merge branch 'bugfix/formatting' into 'develop'

fix formatting

See merge request pleroma/pleroma!301

Diffstat:

Mlib/pleroma/web/router.ex7+++++--
1 file changed, 5 insertions(+), 2 deletions(-)

diff --git 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