diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2019-12-14 21:44:10 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-12-14 21:44:10 +0300 |
| commit | 67cb46e15dd5fa16da257a9b0e5166266d10c694 (patch) | |
| tree | 6801ecba06ea3aac7086c57834e1413e5bb0c84a /lib/pleroma/web/mastodon_api/controllers/status_controller.ex | |
| parent | 2b821036c4bd84cee51c9fcace5a4b3764c3bba1 (diff) | |
| parent | 8efacfed677ea2f06ac228294faec77a38060976 (diff) | |
Merge branch 'develop' into issue/1383
Diffstat (limited to 'lib/pleroma/web/mastodon_api/controllers/status_controller.ex')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/controllers/status_controller.ex | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/status_controller.ex b/lib/pleroma/web/mastodon_api/controllers/status_controller.ex index d70749dfa..287d1631c 100644 --- a/lib/pleroma/web/mastodon_api/controllers/status_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/status_controller.ex @@ -349,15 +349,11 @@ defmodule Pleroma.Web.MastodonAPI.StatusController do @doc "GET /api/v1/favourites" def favourites(%{assigns: %{user: user}} = conn, params) do - params = - params - |> Map.put("type", "Create") - |> Map.put("favorited_by", user.ap_id) - |> Map.put("blocking_user", user) - activities = - ActivityPub.fetch_activities([], params) - |> Enum.reverse() + ActivityPub.fetch_favourites( + user, + Map.take(params, Pleroma.Pagination.page_keys()) + ) conn |> add_link_headers(activities) |