diff options
| author | kaniini <nenolod@gmail.com> | 2019-03-25 02:24:27 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-03-25 02:24:27 +0000 |
| commit | 63ffa4842ca475ed0bd2c2bc2b124889ebdc6d4b (patch) | |
| tree | 5d8b6f57240a05948e921855db787afa33923c8e | |
| parent | 750de7d84272c050ce7158f9c51dfe6d9823e81c (diff) | |
| parent | a7f58b3c13ae90ae9085a7837de3b2a549f4c225 (diff) | |
| download | pleroma-63ffa4842ca475ed0bd2c2bc2b124889ebdc6d4b.tar.gz pleroma-63ffa4842ca475ed0bd2c2bc2b124889ebdc6d4b.zip | |
Merge branch 'fix/mastoapi-liked' into 'develop'
Serve non-public activities in /api/v1/favourites
Closes #648
See merge request pleroma/pleroma!970
| -rw-r--r-- | lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 6 |
1 files 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 index 2eb1da561..6be0f2baf 100644 --- 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 |