From efa506b874a0caf85800ec91f1aef4b2878840d3 Mon Sep 17 00:00:00 2001 From: 11backslashes Date: Sun, 24 Feb 2019 13:23:47 -0500 Subject: [PATCH] delegate user retrieval to the User module --- lib/pleroma/web/twitter_api/twitter_api.ex | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex index efdd0bf43..ab6470d78 100644 --- a/lib/pleroma/web/twitter_api/twitter_api.ex +++ b/lib/pleroma/web/twitter_api/twitter_api.ex @@ -229,18 +229,10 @@ def password_reset(nickname_or_email) do 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 case params do %{"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 -> {:error, "No user with such user_id"}