diff options
| author | lambadalambda <gitgud@rogerbraun.net> | 2017-04-10 08:44:19 -0400 |
|---|---|---|
| committer | lambadalambda <gitgud@rogerbraun.net> | 2017-04-10 08:44:19 -0400 |
| commit | b5e94bf9301713fd9eb3b80dbcf64ae6782092bc (patch) | |
| tree | 71f83f23cc47ae1058bdb26b23f12277c31acf7b /lib/pleroma/web/twitter_api/twitter_api_controller.ex | |
| parent | 567ec494c523ded79c69f4d1bb0be9e51ca09837 (diff) | |
| parent | 0016589aea391fd6b8d41257b7f39f76b5b93775 (diff) | |
| download | pleroma-b5e94bf9301713fd9eb3b80dbcf64ae6782092bc.tar.gz | |
Merge branch 'develop' into 'develop'
Add Follow activity insertion
See merge request !1
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api_controller.ex')
| -rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api_controller.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex index 02b902d08..f2c893e96 100644 --- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex +++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex @@ -44,7 +44,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do end def follow(%{assigns: %{user: user}} = conn, %{ "user_id" => followed_id }) do - { :ok, _user, follower } = TwitterAPI.follow(user, followed_id) + { :ok, _user, follower, _activity } = TwitterAPI.follow(user, followed_id) response = follower |> UserRepresenter.to_json(%{for: user}) |