logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 63ffa4842ca475ed0bd2c2bc2b124889ebdc6d4b
parent: 750de7d84272c050ce7158f9c51dfe6d9823e81c
Author: kaniini <nenolod@gmail.com>
Date:   Mon, 25 Mar 2019 02:24:27 +0000

Merge branch 'fix/mastoapi-liked' into 'develop'

Serve non-public activities in /api/v1/favourites

Closes #648

See merge request pleroma/pleroma!970

Diffstat:

Mlib/pleroma/web/mastodon_api/mastodon_api_controller.ex6++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex @@ -944,12 +944,14 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do end def favourites(%{assigns: %{user: user}} = conn, params) do - activities = + params = params |> Map.put("type", "Create") |> Map.put("favorited_by", user.ap_id) |> Map.put("blocking_user", user) - |> ActivityPub.fetch_public_activities() + + activities = + ActivityPub.fetch_activities([], params) |> Enum.reverse() conn