diff options
| author | Alex S <alex.strizhakov@gmail.com> | 2019-04-02 20:39:52 +0700 |
|---|---|---|
| committer | Alex S <alex.strizhakov@gmail.com> | 2019-04-02 20:39:52 +0700 |
| commit | fa8483cb808ef4b8b907d7ec0eeb882f3f47d927 (patch) | |
| tree | c710d397bb2c189026eee910ee910384abb8eab9 /lib/pleroma/web/twitter_api/twitter_api.ex | |
| parent | d140738edf75467420b35c500716cf89de66548d (diff) | |
| parent | 180b87257cae481d4d9ffc9f03a06268ad8df569 (diff) | |
| download | pleroma-fa8483cb808ef4b8b907d7ec0eeb882f3f47d927.tar.gz | |
Merging develop into feature/770-add-emoji-tags
Conflict test/web/twitter_api/util_controller_test.exs
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api.ex')
| -rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api.ex | 9 |
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 _ -> |