aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/twitter_api/twitter_api.ex
diff options
context:
space:
mode:
authorIvan Tashkinov <ivant.business@gmail.com>2019-04-04 23:43:08 +0300
committerIvan Tashkinov <ivant.business@gmail.com>2019-04-04 23:43:08 +0300
commit45765918c377c6daf8ee8e5bfad4ea24f67766b6 (patch)
treea8ccea9436d7c533a481939a4724c62d8ffac4c0 /lib/pleroma/web/twitter_api/twitter_api.ex
parentf7cd9131d4aa0da3c4c0174acc56ce1bbdbd284c (diff)
parent9c9eec62c2fb67507708dd9e5d3f80a098881a6e (diff)
downloadpleroma-45765918c377c6daf8ee8e5bfad4ea24f67766b6.tar.gz
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts: # mix.exs
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api.ex')
-rw-r--r--lib/pleroma/web/twitter_api/twitter_api.ex9
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex
index d0e58e71b..9b081a316 100644
--- a/lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api.ex
@@ -227,12 +227,9 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
end
%{"screen_name" => nickname} ->
- case target = Repo.get_by(User, nickname: nickname) do
- nil ->
- {:error, "No user with such screen_name"}
-
- _ ->
- {:ok, target}
+ case User.get_by_nickname(nickname) do
+ nil -> {:error, "No user with such screen_name"}
+ target -> {:ok, target}
end
_ ->