alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'bugfix/236-ambiguous-route-for-numerical-handles' into 'develop' 

Bugfix #236 Prefer user look-up by nickname

See merge request pleroma/pleroma!860
This commit is contained in:
lambda 2019-03-01 09:48:24 +00:00
parent b37b26ab87 efa506b874
commit 2f00814475
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/pleroma/web/twitter_api/twitter_api.ex
View File

@ -229,18 +229,10 @@ def password_reset(nickname_or_email) do
end end
end end
def get_by_id_or_nickname(id_or_nickname) do
if !is_integer(id_or_nickname) && :error == Integer.parse(id_or_nickname) do
Repo.get_by(User, nickname: id_or_nickname)
else
Repo.get(User, id_or_nickname)
end
end
def get_user(user \\ nil, params) do def get_user(user \\ nil, params) do
case params do case params do
%{"user_id" => user_id} -> %{"user_id" => user_id} ->
case target = get_by_id_or_nickname(user_id) do case target = User.get_cached_by_nickname_or_id(user_id) do
nil -> nil ->
{:error, "No user with such user_id"} {:error, "No user with such user_id"}