|
|
@ -736,14 +736,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
|
|
|
|
|
|
|
|
|
|
|
|
def follow(%{assigns: %{user: follower}} = conn, %{"id" => id}) do
|
|
|
|
def follow(%{assigns: %{user: follower}} = conn, %{"id" => id}) do
|
|
|
|
with %User{} = followed <- Repo.get(User, id),
|
|
|
|
with %User{} = followed <- Repo.get(User, id),
|
|
|
|
{:ok, follower} <- User.maybe_direct_follow(follower, followed),
|
|
|
|
{:ok, follower, followed, _} <- CommonAPI.follow(follower, followed) do
|
|
|
|
{:ok, _activity} <- ActivityPub.follow(follower, followed),
|
|
|
|
|
|
|
|
{:ok, follower, followed} <-
|
|
|
|
|
|
|
|
User.wait_and_refresh(
|
|
|
|
|
|
|
|
Config.get([:activitypub, :follow_handshake_timeout]),
|
|
|
|
|
|
|
|
follower,
|
|
|
|
|
|
|
|
followed
|
|
|
|
|
|
|
|
) do
|
|
|
|
|
|
|
|
conn
|
|
|
|
conn
|
|
|
|
|> put_view(AccountView)
|
|
|
|
|> put_view(AccountView)
|
|
|
|
|> render("relationship.json", %{user: follower, target: followed})
|
|
|
|
|> render("relationship.json", %{user: follower, target: followed})
|
|
|
@ -757,8 +750,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
|
|
|
|
|
|
|
|
|
|
|
|
def follow(%{assigns: %{user: follower}} = conn, %{"uri" => uri}) do
|
|
|
|
def follow(%{assigns: %{user: follower}} = conn, %{"uri" => uri}) do
|
|
|
|
with %User{} = followed <- Repo.get_by(User, nickname: uri),
|
|
|
|
with %User{} = followed <- Repo.get_by(User, nickname: uri),
|
|
|
|
{:ok, follower} <- User.maybe_direct_follow(follower, followed),
|
|
|
|
{:ok, follower, followed, _} <- CommonAPI.follow(follower, followed) do
|
|
|
|
{:ok, _activity} <- ActivityPub.follow(follower, followed) do
|
|
|
|
|
|
|
|
conn
|
|
|
|
conn
|
|
|
|
|> put_view(AccountView)
|
|
|
|
|> put_view(AccountView)
|
|
|
|
|> render("account.json", %{user: followed, for: follower})
|
|
|
|
|> render("account.json", %{user: followed, for: follower})
|
|
|
|