diff options
| author | Ariadne Conill <ariadne@dereferenced.org> | 2019-07-29 20:00:57 +0000 |
|---|---|---|
| committer | Ariadne Conill <ariadne@dereferenced.org> | 2019-07-31 20:12:25 +0000 |
| commit | e5cb15ce2b23f0b70fd80077a72d9399267663e2 (patch) | |
| tree | e2ec844e32b8e21f2c1f8ee5600b7d50d97d6a89 | |
| parent | d18a7dc0de2535236a1e1f6d8d41388fdf69322f (diff) | |
| download | pleroma-e5cb15ce2b23f0b70fd80077a72d9399267663e2.tar.gz | |
twitter api: utils: rework do_remote_follow() to use CommonAPI
Closes #1138
| -rw-r--r-- | lib/pleroma/web/twitter_api/controllers/util_controller.ex | 7 |
1 files 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 index b1863528f..39bc2efce 100644 --- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex +++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex @@ -13,7 +13,6 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do alias Pleroma.Notification alias Pleroma.User alias Pleroma.Web - alias Pleroma.Web.ActivityPub.ActivityPub alias Pleroma.Web.CommonAPI alias Pleroma.Web.OStatus alias Pleroma.Web.WebFinger @@ -98,8 +97,7 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do with %User{} = user <- User.get_cached_by_nickname(username), true <- Pbkdf2.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 @@ -120,8 +118,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 |