From df2f59be911acd4626886befbc0c6bcd75752080 Mon Sep 17 00:00:00 2001
From: Phil Hagelberg <phil@hagelb.org>
Date: Mon, 4 Nov 2019 22:49:05 -0800
Subject: [PATCH] Pagination for user profiles.
---
.../web/static_fe/static_fe_controller.ex | 22 +++++++++++++++----
.../static_fe/static_fe/profile.html.eex | 9 ++++++++
2 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/lib/pleroma/web/static_fe/static_fe_controller.ex b/lib/pleroma/web/static_fe/static_fe_controller.ex
index a00c6db4f..9f4eeaa36 100644
--- a/lib/pleroma/web/static_fe/static_fe_controller.ex
+++ b/lib/pleroma/web/static_fe/static_fe_controller.ex
@@ -15,6 +15,8 @@ defmodule Pleroma.Web.StaticFE.StaticFEController do
plug(:put_view, Pleroma.Web.StaticFE.StaticFEView)
plug(:assign_id)
+ @page_keys ["max_id", "min_id", "limit", "since_id", "order"]
+
defp get_title(%Object{data: %{"name" => name}}) when is_binary(name),
do: name
@@ -53,7 +55,8 @@ defmodule Pleroma.Web.StaticFE.StaticFEController do
published: data["published"],
sensitive: data["sensitive"],
selected: selected,
- counts: get_counts(activity)
+ counts: get_counts(activity),
+ id: activity.id
}
end
@@ -68,14 +71,25 @@ defmodule Pleroma.Web.StaticFE.StaticFEController do
render(conn, "conversation.html", %{activities: timeline})
end
- def show(%{assigns: %{username_or_id: username_or_id}} = conn, _params) do
+ def show(%{assigns: %{username_or_id: username_or_id}} = conn, params) do
%User{} = user = User.get_cached_by_nickname_or_id(username_or_id)
timeline =
- ActivityPub.fetch_user_activities(user, nil, %{})
+ ActivityPub.fetch_user_activities(user, nil, Map.take(params, @page_keys))
|> Enum.map(&represent/1)
- render(conn, "profile.html", %{user: user, timeline: timeline})
+ prev_page_id =
+ (params["min_id"] || params["max_id"]) &&
+ List.first(timeline) && List.first(timeline).id
+
+ next_page_id = List.last(timeline) && List.last(timeline).id
+
+ render(conn, "profile.html", %{
+ user: user,
+ timeline: timeline,
+ prev_page_id: prev_page_id,
+ next_page_id: next_page_id
+ })
end
def assign_id(%{path_info: ["notice", notice_id]} = conn, _opts),
diff --git a/lib/pleroma/web/templates/static_fe/static_fe/profile.html.eex b/lib/pleroma/web/templates/static_fe/static_fe/profile.html.eex
index fa3df3b4e..94063c92d 100644
--- a/lib/pleroma/web/templates/static_fe/static_fe/profile.html.eex
+++ b/lib/pleroma/web/templates/static_fe/static_fe/profile.html.eex
@@ -18,5 +18,14 @@
<%= for activity <- @timeline do %>
<%= render("_notice.html", Map.put(activity, :selected, false)) %>
<% end %>
+ <p id="pagination">
+ <%= if @prev_page_id do %>
+ <%= link "«", to: "?min_id=" <> @prev_page_id %>
+ <% end %>
+ <%= if @prev_page_id && @next_page_id, do: " | " %>
+ <%= if @next_page_id do %>
+ <%= link "»", to: "?max_id=" <> @next_page_id %>
+ <% end %>
+ </p>
</div>
</main>
--
2.49.0