pleroma

commit: 677df5ceb370a22fa8df44e6ce5f6fa47d91f9b8
parent: 66575061851f13355958fd292ee545462bf191c0
Author: kaniini <ariadne@dereferenced.org>
Date:   Mon, 29 Jul 2019 20:10:59 +0000

Merge branch 'security/remote-follow-commonapi' into 'develop'

twitter api: utils: rework do_remote_follow() to use CommonAPI

Closes #1138

See merge request pleroma/pleroma!1506
Diffstat:
M
lib/pleroma/web/twitter_api/controllers/util_controller.ex
7
++-----

1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
@@ -15,7 +15,6 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
   alias Pleroma.Plugs.AuthenticationPlug
   alias Pleroma.User
   alias Pleroma.Web
-  alias Pleroma.Web.ActivityPub.ActivityPub
   alias Pleroma.Web.CommonAPI
   alias Pleroma.Web.WebFinger
 
@@ -100,8 +99,7 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
     with %User{} = user <- User.get_cached_by_nickname(username),
          true <- AuthenticationPlug.checkpw(password, user.password_hash),
          %User{} = _followed <- User.get_cached_by_id(id),
-         {:ok, follower} <- User.follow(user, followee),
-         {:ok, _activity} <- ActivityPub.follow(follower, followee) do
+         {:ok, _follower, _followee, _activity} <- CommonAPI.follow(user, followee) do
       conn
       |> render("followed.html", %{error: false})
     else
@@ -122,8 +120,7 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
 
   def do_remote_follow(%{assigns: %{user: user}} = conn, %{"user" => %{"id" => id}}) do
     with %User{} = followee <- User.get_cached_by_id(id),
-         {:ok, follower} <- User.follow(user, followee),
-         {:ok, _activity} <- ActivityPub.follow(follower, followee) do
+         {:ok, _follower, _followee, _activity} <- CommonAPI.follow(user, followee) do
       conn
       |> render("followed.html", %{error: false})
     else