diff options
| -rw-r--r-- | lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 16 | 
1 files changed, 8 insertions, 8 deletions
| diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex index 0840c2c5a..b099199af 100644 --- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex @@ -712,7 +712,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do      end    end -  def favourited_by(conn, %{"id" => id}) do +  def favourited_by(%{assigns: %{user: user}} = conn, %{"id" => id}) do      with %Activity{data: %{"object" => object}} <- Repo.get(Activity, id),           %Object{data: %{"likes" => likes}} <- Object.normalize(object) do        q = from(u in User, where: u.ap_id in ^likes) @@ -720,13 +720,13 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do        conn        |> put_view(AccountView) -      |> render(AccountView, "accounts.json", %{users: users, as: :user}) +      |> render(AccountView, "accounts.json", %{for: user, users: users, as: :user})      else        _ -> json(conn, [])      end    end -  def reblogged_by(conn, %{"id" => id}) do +  def reblogged_by(%{assigns: %{user: user}} = conn, %{"id" => id}) do      with %Activity{data: %{"object" => object}} <- Repo.get(Activity, id),           %Object{data: %{"announcements" => announces}} <- Object.normalize(object) do        q = from(u in User, where: u.ap_id in ^announces) @@ -734,7 +734,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do        conn        |> put_view(AccountView) -      |> render("accounts.json", %{users: users, as: :user}) +      |> render("accounts.json", %{for: user, users: users, as: :user})      else        _ -> json(conn, [])      end @@ -791,7 +791,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do        conn        |> add_link_headers(:followers, followers, user)        |> put_view(AccountView) -      |> render("accounts.json", %{users: followers, as: :user}) +      |> render("accounts.json", %{for: for_user, users: followers, as: :user})      end    end @@ -808,7 +808,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do        conn        |> add_link_headers(:following, followers, user)        |> put_view(AccountView) -      |> render("accounts.json", %{users: followers, as: :user}) +      |> render("accounts.json", %{for: for_user, users: followers, as: :user})      end    end @@ -816,7 +816,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do      with {:ok, follow_requests} <- User.get_follow_requests(followed) do        conn        |> put_view(AccountView) -      |> render("accounts.json", %{users: follow_requests, as: :user}) +      |> render("accounts.json", %{for: followed, users: follow_requests, as: :user})      end    end @@ -1243,7 +1243,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do           {:ok, users} = Pleroma.List.get_following(list) do        conn        |> put_view(AccountView) -      |> render("accounts.json", %{users: users, as: :user}) +      |> render("accounts.json", %{for: user, users: users, as: :user})      end    end | 
