commit: fd697cf2090b61db60a02694c3227850df176e2d
parent: 92b4a1aa1bc750bb077ae45c422967f9712e247d
Author: feld <feld@feld.me>
Date: Wed, 11 Dec 2019 22:37:16 +0000
Merge branch 'issue/1411' into 'develop'
[#1411] /api/v1/favourites: added sorting for activites by adds to favorites
See merge request pleroma/pleroma!1991
Diffstat:
6 files changed, 127 insertions(+), 42 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -91,6 +91,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- MRF: `Delete` activities being exempt from MRF policies
- OTP releases: Not being able to configure OAuth expired token cleanup interval
- OTP releases: Not being able to configure HTML sanitization policy
+- Favorites timeline now ordered by favorite date instead of post date
<details>
<summary>API Changes</summary>
diff --git a/lib/pleroma/object.ex b/lib/pleroma/object.ex
@@ -23,6 +23,23 @@ defmodule Pleroma.Object do
timestamps()
end
+ def with_joined_activity(query, activity_type \\ "Create", join_type \\ :inner) do
+ object_position = Map.get(query.aliases, :object, 0)
+
+ join(query, join_type, [{object, object_position}], a in Activity,
+ on:
+ fragment(
+ "COALESCE(?->'object'->>'id', ?->>'object') = (? ->> 'id') AND (?->>'type' = ?) ",
+ a.data,
+ a.data,
+ object.data,
+ a.data,
+ ^activity_type
+ ),
+ as: :object_activity
+ )
+ end
+
def create(data) do
Object.change(%Object{}, %{data: data})
|> Repo.insert()
diff --git a/lib/pleroma/pagination.ex b/lib/pleroma/pagination.ex
@@ -13,60 +13,63 @@ defmodule Pleroma.Pagination do
alias Pleroma.Repo
@default_limit 20
+ @page_keys ["max_id", "min_id", "limit", "since_id", "order"]
- def fetch_paginated(query, params, type \\ :keyset)
+ def page_keys, do: @page_keys
- def fetch_paginated(query, %{"total" => true} = params, :keyset) do
+ def fetch_paginated(query, params, type \\ :keyset, table_binding \\ nil)
+
+ def fetch_paginated(query, %{"total" => true} = params, :keyset, table_binding) do
total = Repo.aggregate(query, :count, :id)
%{
total: total,
- items: fetch_paginated(query, Map.drop(params, ["total"]), :keyset)
+ items: fetch_paginated(query, Map.drop(params, ["total"]), :keyset, table_binding)
}
end
- def fetch_paginated(query, params, :keyset) do
+ def fetch_paginated(query, params, :keyset, table_binding) do
options = cast_params(params)
query
- |> paginate(options, :keyset)
+ |> paginate(options, :keyset, table_binding)
|> Repo.all()
|> enforce_order(options)
end
- def fetch_paginated(query, %{"total" => true} = params, :offset) do
+ def fetch_paginated(query, %{"total" => true} = params, :offset, table_binding) do
total = Repo.aggregate(query, :count, :id)
%{
total: total,
- items: fetch_paginated(query, Map.drop(params, ["total"]), :offset)
+ items: fetch_paginated(query, Map.drop(params, ["total"]), :offset, table_binding)
}
end
- def fetch_paginated(query, params, :offset) do
+ def fetch_paginated(query, params, :offset, table_binding) do
options = cast_params(params)
query
- |> paginate(options, :offset)
+ |> paginate(options, :offset, table_binding)
|> Repo.all()
end
- def paginate(query, options, method \\ :keyset)
+ def paginate(query, options, method \\ :keyset, table_binding \\ nil)
- def paginate(query, options, :keyset) do
+ def paginate(query, options, :keyset, table_binding) do
query
- |> restrict(:min_id, options)
- |> restrict(:since_id, options)
- |> restrict(:max_id, options)
- |> restrict(:order, options)
- |> restrict(:limit, options)
+ |> restrict(:min_id, options, table_binding)
+ |> restrict(:since_id, options, table_binding)
+ |> restrict(:max_id, options, table_binding)
+ |> restrict(:order, options, table_binding)
+ |> restrict(:limit, options, table_binding)
end
- def paginate(query, options, :offset) do
+ def paginate(query, options, :offset, table_binding) do
query
- |> restrict(:order, options)
- |> restrict(:offset, options)
- |> restrict(:limit, options)
+ |> restrict(:order, options, table_binding)
+ |> restrict(:offset, options, table_binding)
+ |> restrict(:limit, options, table_binding)
end
defp cast_params(params) do
@@ -75,7 +78,8 @@ defmodule Pleroma.Pagination do
since_id: :string,
max_id: :string,
offset: :integer,
- limit: :integer
+ limit: :integer,
+ skip_order: :boolean
}
params =
@@ -88,38 +92,48 @@ defmodule Pleroma.Pagination do
changeset.changes
end
- defp restrict(query, :min_id, %{min_id: min_id}) do
- where(query, [q], q.id > ^min_id)
+ defp restrict(query, :min_id, %{min_id: min_id}, table_binding) do
+ where(query, [{q, table_position(query, table_binding)}], q.id > ^min_id)
end
- defp restrict(query, :since_id, %{since_id: since_id}) do
- where(query, [q], q.id > ^since_id)
+ defp restrict(query, :since_id, %{since_id: since_id}, table_binding) do
+ where(query, [{q, table_position(query, table_binding)}], q.id > ^since_id)
end
- defp restrict(query, :max_id, %{max_id: max_id}) do
- where(query, [q], q.id < ^max_id)
+ defp restrict(query, :max_id, %{max_id: max_id}, table_binding) do
+ where(query, [{q, table_position(query, table_binding)}], q.id < ^max_id)
end
- defp restrict(query, :order, %{min_id: _}) do
- order_by(query, [u], fragment("? asc nulls last", u.id))
+ defp restrict(query, :order, %{skip_order: true}, _), do: query
+
+ defp restrict(query, :order, %{min_id: _}, table_binding) do
+ order_by(
+ query,
+ [{u, table_position(query, table_binding)}],
+ fragment("? asc nulls last", u.id)
+ )
end
- defp restrict(query, :order, _options) do
- order_by(query, [u], fragment("? desc nulls last", u.id))
+ defp restrict(query, :order, _options, table_binding) do
+ order_by(
+ query,
+ [{u, table_position(query, table_binding)}],
+ fragment("? desc nulls last", u.id)
+ )
end
- defp restrict(query, :offset, %{offset: offset}) do
+ defp restrict(query, :offset, %{offset: offset}, _table_binding) do
offset(query, ^offset)
end
- defp restrict(query, :limit, options) do
+ defp restrict(query, :limit, options, _table_binding) do
limit = Map.get(options, :limit, @default_limit)
query
|> limit(^limit)
end
- defp restrict(query, _, _), do: query
+ defp restrict(query, _, _, _), do: query
defp enforce_order(result, %{min_id: _}) do
result
@@ -127,4 +141,10 @@ defmodule Pleroma.Pagination do
end
defp enforce_order(result, _), do: result
+
+ defp table_position(%Ecto.Query{} = query, binding_name) do
+ Map.get(query.aliases, binding_name, 0)
+ end
+
+ defp table_position(_, _), do: 0
end
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -1157,6 +1157,25 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
|> maybe_update_cc(list_memberships, opts["user"])
end
+ @doc """
+ Fetch favorites activities of user with order by sort adds to favorites
+ """
+ @spec fetch_favourites(User.t(), map(), atom()) :: list(Activity.t())
+ def fetch_favourites(user, params \\ %{}, pagination \\ :keyset) do
+ user.ap_id
+ |> Activity.Queries.by_actor()
+ |> Activity.Queries.by_type("Like")
+ |> Activity.with_joined_object()
+ |> Object.with_joined_activity()
+ |> select([_like, object, activity], %{activity | object: object})
+ |> order_by([like, _, _], desc: like.id)
+ |> Pagination.fetch_paginated(
+ Map.merge(params, %{"skip_order" => true}),
+ pagination,
+ :object_activity
+ )
+ end
+
defp maybe_update_cc(activities, list_memberships, %User{ap_id: user_ap_id})
when is_list(list_memberships) and length(list_memberships) > 0 do
Enum.map(activities, fn
diff --git a/lib/pleroma/web/mastodon_api/controllers/status_controller.ex b/lib/pleroma/web/mastodon_api/controllers/status_controller.ex
@@ -346,15 +346,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)
diff --git a/test/web/activity_pub/activity_pub_test.exs b/test/web/activity_pub/activity_pub_test.exs
@@ -1625,6 +1625,38 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
end
end
+ describe "fetch_favourites/3" do
+ test "returns a favourite activities sorted by adds to favorite" do
+ user = insert(:user)
+ other_user = insert(:user)
+ user1 = insert(:user)
+ user2 = insert(:user)
+ {:ok, a1} = CommonAPI.post(user1, %{"status" => "bla"})
+ {:ok, _a2} = CommonAPI.post(user2, %{"status" => "traps are happy"})
+ {:ok, a3} = CommonAPI.post(user2, %{"status" => "Trees Are "})
+ {:ok, a4} = CommonAPI.post(user2, %{"status" => "Agent Smith "})
+ {:ok, a5} = CommonAPI.post(user1, %{"status" => "Red or Blue "})
+
+ {:ok, _, _} = CommonAPI.favorite(a4.id, user)
+ {:ok, _, _} = CommonAPI.favorite(a3.id, other_user)
+ Process.sleep(1000)
+ {:ok, _, _} = CommonAPI.favorite(a3.id, user)
+ {:ok, _, _} = CommonAPI.favorite(a5.id, other_user)
+ Process.sleep(1000)
+ {:ok, _, _} = CommonAPI.favorite(a5.id, user)
+ {:ok, _, _} = CommonAPI.favorite(a4.id, other_user)
+ Process.sleep(1000)
+ {:ok, _, _} = CommonAPI.favorite(a1.id, user)
+ {:ok, _, _} = CommonAPI.favorite(a1.id, other_user)
+ result = ActivityPub.fetch_favourites(user)
+
+ assert Enum.map(result, & &1.id) == [a1.id, a5.id, a3.id, a4.id]
+
+ result = ActivityPub.fetch_favourites(user, %{"limit" => 2})
+ assert Enum.map(result, & &1.id) == [a1.id, a5.id]
+ end
+ end
+
describe "Move activity" do
test "create" do
%{ap_id: old_ap_id} = old_user = insert(:user)
