diff options
| author | dtluna <dtluna@openmailbox.org> | 2017-04-20 10:39:18 +0300 |
|---|---|---|
| committer | dtluna <dtluna@openmailbox.org> | 2017-04-20 10:39:18 +0300 |
| commit | d952b6cd7bd54f6d10d4f71e0ffb25b5f0e20582 (patch) | |
| tree | d02067e6cb7efcdb3913e11c542f527093f4555d /lib/pleroma/web/twitter_api/twitter_api_controller.ex | |
| parent | eda742c78b0087033ee96f27c13dbdc00741cf87 (diff) | |
| parent | 369be708b2126e15fd870977810b3e71514d9979 (diff) | |
| download | pleroma-d952b6cd7bd54f6d10d4f71e0ffb25b5f0e20582.tar.gz | |
Merge branch 'feature/follow-by-screen-name' of ssh.gitgud.io:dtluna/pleroma into feature/follow-unfollow-by-screen-name
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api_controller.ex')
| -rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api_controller.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex index 8b5e6270b..92c20f97a 100644 --- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex +++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex @@ -57,8 +57,8 @@ defmodule Pleroma.Web.TwitterAPI.Controller do end end - def follow(%{assigns: %{user: user}} = conn, %{ "user_id" => followed_id }) do - case TwitterAPI.follow(user, followed_id) do + def follow(%{assigns: %{user: user}} = conn, params) do + case TwitterAPI.follow(user, params) do { :ok, user, followed, _activity } -> response = followed |> UserRepresenter.to_json(%{for: user}) conn |