From 422d0f324fa18743129ce81139319ead7cb579ce Mon Sep 17 00:00:00 2001 From: Roger Braun Date: Sun, 17 Sep 2017 13:09:49 +0200 Subject: [PATCH] MastodonAPI: Add user favorites endpoint. --- lib/pleroma/web/activity_pub/activity_pub.ex | 7 +++++++ .../web/mastodon_api/mastodon_api_controller.ex | 12 ++++++++++++ lib/pleroma/web/router.ex | 2 ++ .../mastodon_api_controller_test.exs | 17 +++++++++++++++++ 4 files changed, 38 insertions(+) diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index c4f7f432c..0cfd22d7b 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -147,6 +147,12 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do end defp restrict_type(query, _), do: query + defp restrict_favorited_by(query, %{"favorited_by" => ap_id}) do + from activity in query, + where: fragment("? <@ (? #> '{\"object\",\"likes\"}')", ^ap_id, activity.data) + end + defp restrict_favorited_by(query, _), do: query + def fetch_activities(recipients, opts \\ %{}) do base_query = from activity in Activity, limit: 20, @@ -160,6 +166,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do |> restrict_max(opts) |> restrict_actor(opts) |> restrict_type(opts) + |> restrict_favorited_by(opts) |> Repo.all |> Enum.reverse end diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex index c231ff7f8..dd1044024 100644 --- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex @@ -312,6 +312,18 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do json(conn, res) end + def favourites(%{assigns: %{user: user}} = conn, params) do + params = conn + |> Map.put("type", "Create") + |> Map.put("favorited_by", user.ap_id) + + activities = ActivityPub.fetch_activities([], params) + |> Enum.reverse + + conn + |> render(StatusView, "index.json", %{activities: activities, for: user, as: :activity}) + end + def relationship_noop(%{assigns: %{user: user}} = conn, %{"id" => id}) do Logger.debug("Unimplemented, returning unmodified relationship") with %User{} = target <- Repo.get(User, id) do diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index 38ad3ebcb..6abf234c6 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -58,6 +58,8 @@ defmodule Pleroma.Web.Router do get "/timelines/home", MastodonAPIController, :home_timeline + get "/favourites", MastodonAPIController, :favourites + post "/statuses", MastodonAPIController, :post_status delete "/statuses/:id", MastodonAPIController, :delete_status diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs index 4261ac6b1..56888140d 100644 --- a/test/web/mastodon_api/mastodon_api_controller_test.exs +++ b/test/web/mastodon_api/mastodon_api_controller_test.exs @@ -341,4 +341,21 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do [account] = results["accounts"] assert account["acct"] == "shp@social.heldscal.la" end + + test "returns the favorites of a user", %{conn: conn} do + user = insert(:user) + other_user = insert(:user) + + {:ok, _} = CommonAPI.post(other_user, %{"status" => "bla"}) + {:ok, activity} = CommonAPI.post(other_user, %{"status" => "traps are happy"}) + + {:ok, _, _} = CommonAPI.favorite(activity.id, user) + + conn = conn + |> assign(:user, user) + |> get("/api/v1/favourites") + + assert [status] = json_response(conn, 200) + assert status["id"] == activity.id + end end