diff options
author | 11backslashes <reversesolidi@protonmail.com> | 2019-02-24 13:23:47 -0500 |
---|---|---|
committer | 11backslashes <reversesolidi@protonmail.com> | 2019-02-24 13:23:47 -0500 |
commit | efa506b874a0caf85800ec91f1aef4b2878840d3 (patch) | |
tree | 3a202d85809516abb2f408d6fb7d9b9dae61947b | |
parent | 7daa9a8c42272e0f1fd0ac3af31e0cf131d86219 (diff) | |
download | pleroma-efa506b874a0caf85800ec91f1aef4b2878840d3.tar.gz |
delegate user retrieval to the User module
-rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api.ex | 10 |
1 files changed, 1 insertions, 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 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI 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"} |