Return "total" optionally

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 06ad303de1b442f842382a329753598e94ca195b..8264688d6dc83a54c348a2231829d7a4814939f9 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,7 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Mastodon API: Unsubscribe followers when they unfollow a user
 - AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private statuses)
 - Improve digest email template
-– Pagination: return `total` alongside with `items` when paginating
+– Pagination: (optional) return `total` alongside with `items` when paginating
 
 ### Fixed
 - Following from Osada

diff --git a/lib/pleroma/activity/search.ex b/lib/pleroma/activity/search.ex
index f7156c81cd2dfb03f9a75c956d94036877e360d8..f847ac2381faa0d25678aa79503a8cc1752ba24c 100644 (file)
--- a/lib/pleroma/activity/search.ex
+++ b/lib/pleroma/activity/search.ex
@@ -27,7 +27,6 @@ defmodule Pleroma.Activity.Search do
     |> maybe_restrict_local(user)
     |> maybe_restrict_author(author)
     |> Pagination.fetch_paginated(%{"offset" => offset, "limit" => limit}, :offset)
-    |> Map.get(:items)
     |> maybe_fetch(user, search_query)
   end
 

diff --git a/lib/pleroma/conversation/participation.ex b/lib/pleroma/conversation/participation.ex
index 5fd8d3d414272e5a14516867780a0b626035e396..ea5b9fe17ba0526647d78caf03f2f167fa130720 100644 (file)
--- a/lib/pleroma/conversation/participation.ex
+++ b/lib/pleroma/conversation/participation.ex
@@ -67,7 +67,6 @@ defmodule Pleroma.Conversation.Participation do
       preload: [conversation: [:users]]
     )
     |> Pleroma.Pagination.fetch_paginated(params)
-    |> Map.get(:items)
   end
 
   def for_user_and_conversation(user, conversation) do

diff --git a/lib/pleroma/notification.ex b/lib/pleroma/notification.ex
index 3e4ddd2ba052e746077488728d8d0b62753d98bf..5d29af8536a5b6d8409a87916b2aa58a1e9ab6c4 100644 (file)
--- a/lib/pleroma/notification.ex
+++ b/lib/pleroma/notification.ex
@@ -75,7 +75,6 @@ defmodule Pleroma.Notification do
     user
     |> for_user_query(opts)
     |> Pagination.fetch_paginated(opts)
-    |> Map.get(:items)
   end
 
   @doc """

diff --git a/lib/pleroma/pagination.ex b/lib/pleroma/pagination.ex
index d21ecf628400bb83913d6f1577655b0b775834ea..b55379c4a96c767978b57c894fd237030b693d6d 100644 (file)
--- a/lib/pleroma/pagination.ex
+++ b/lib/pleroma/pagination.ex
@@ -16,33 +16,41 @@ defmodule Pleroma.Pagination do
 
   def fetch_paginated(query, params, type \\ :keyset)
 
-  def fetch_paginated(query, params, :keyset) do
-    options = cast_params(params)
+  def fetch_paginated(query, %{"total" => true} = params, :keyset) do
     total = Repo.aggregate(query, :count, :id)
 
     %{
       total: total,
-      items:
-        query
-        |> paginate(options, :keyset)
-        |> Repo.all()
-        |> enforce_order(options)
+      items: fetch_paginated(query, Map.drop(params, ["total"]), :keyset)
     }
   end
 
-  def fetch_paginated(query, params, :offset) do
+  def fetch_paginated(query, params, :keyset) do
     options = cast_params(params)
+
+    query
+    |> paginate(options, :keyset)
+    |> Repo.all()
+    |> enforce_order(options)
+  end
+
+  def fetch_paginated(query, %{"total" => true} = params, :offset) do
     total = Repo.aggregate(query, :count, :id)
 
     %{
       total: total,
-      items:
-        query
-        |> paginate(options, :offset)
-        |> Repo.all()
+      items: fetch_paginated(query, Map.drop(params, ["total"]), :offset)
     }
   end
 
+  def fetch_paginated(query, params, :offset) do
+    options = cast_params(params)
+
+    query
+    |> paginate(options, :offset)
+    |> Repo.all()
+  end
+
   def paginate(query, options, method \\ :keyset)
 
   def paginate(query, options, :keyset) do

diff --git a/lib/pleroma/user/search.ex b/lib/pleroma/user/search.ex
index bc05639b53b5fb7ffac420fb4bdd8f727fd7852a..6fb2c2352f8aa9655f635ffc687ae40fb26f95ad 100644 (file)
--- a/lib/pleroma/user/search.ex
+++ b/lib/pleroma/user/search.ex
@@ -34,7 +34,6 @@ defmodule Pleroma.User.Search do
         query_string
         |> search_query(for_user, following)
         |> Pagination.fetch_paginated(%{"offset" => offset, "limit" => result_limit}, :offset)
-        |> Map.get(:items)
       end)
 
     results

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 8f07638cd00f18fe249729030765a40eaf2a149c..eeb826814423c620a3dc0e341093d00bccc7ab8e 100644 (file)
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -556,7 +556,6 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     q
     |> restrict_unlisted()
     |> Pagination.fetch_paginated(opts)
-    |> Map.get(:items)
     |> Enum.reverse()
   end
 
@@ -954,7 +953,6 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
 
     fetch_activities_query(recipients ++ list_memberships, opts)
     |> Pagination.fetch_paginated(opts)
-    |> Map.get(:items)
     |> Enum.reverse()
     |> maybe_update_cc(list_memberships, opts["user"])
   end
@@ -989,7 +987,6 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     fetch_activities_query([], opts)
     |> fetch_activities_bounded_query(recipients, recipients_with_public)
     |> Pagination.fetch_paginated(opts)
-    |> Map.get(:items)
     |> Enum.reverse()
   end
 

diff --git a/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
index d532ba685985d2ea94cf996b9c0e746f0e6ad66f..83e877c0e79e352022b6df5df528b59618e3d58f 100644 (file)
--- a/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
@@ -420,7 +420,6 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
       [user.ap_id]
       |> ActivityPub.fetch_activities_query(params)
       |> Pagination.fetch_paginated(params)
-      |> Map.get(:items)
 
     conn
     |> add_link_headers(:dm_timeline, activities)
@@ -1195,7 +1194,6 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
     bookmarks =
       Bookmark.for_user_query(user.id)
       |> Pagination.fetch_paginated(params)
-      |> Map.get(:items)
 
     activities =
       bookmarks

diff --git a/lib/pleroma/web/mastodon_api/mastodon_api.ex b/lib/pleroma/web/mastodon_api/mastodon_api.ex
index cf396294409b77e2b610983d3c0a597b4840312c..ac01d1ff39a42639f4b457b780b5893e0429c3e5 100644 (file)
--- a/lib/pleroma/web/mastodon_api/mastodon_api.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_api.ex
@@ -45,14 +45,12 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPI do
     user
     |> User.get_followers_query()
     |> Pagination.fetch_paginated(params)
-    |> Map.get(:items)
   end
 
   def get_friends(user, params \\ %{}) do
     user
     |> User.get_friends_query()
     |> Pagination.fetch_paginated(params)
-    |> Map.get(:items)
   end
 
   def get_notifications(user, params \\ %{}) do
@@ -62,14 +60,12 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPI do
     |> Notification.for_user_query(options)
     |> restrict(:exclude_types, options)
     |> Pagination.fetch_paginated(params)
-    |> Map.get(:items)
   end
 
   def get_scheduled_activities(user, params \\ %{}) do
     user
     |> ScheduledActivity.for_user_query()
     |> Pagination.fetch_paginated(params)
-    |> Map.get(:items)
   end
 
   defp cast_params(params) do

diff --git a/test/pagination_test.exs b/test/pagination_test.exs
index 048ab6f3c0942e15bac8ca9dc0fbd61703c0dee5..c0fbe7933abea885b2c3c49bf79efe7b352a030e 100644 (file)
--- a/test/pagination_test.exs
+++ b/test/pagination_test.exs
@@ -19,7 +19,9 @@ defmodule Pleroma.PaginationTest do
 
     test "paginates by min_id", %{notes: notes} do
       id = Enum.at(notes, 2).id |> Integer.to_string()
-      %{total: total, items: paginated} = Pagination.fetch_paginated(Object, %{"min_id" => id})
+
+      %{total: total, items: paginated} =
+        Pagination.fetch_paginated(Object, %{"min_id" => id, "total" => true})
 
       assert length(paginated) == 2
       assert total == 5
@@ -27,7 +29,9 @@ defmodule Pleroma.PaginationTest do
 
     test "paginates by since_id", %{notes: notes} do
       id = Enum.at(notes, 2).id |> Integer.to_string()
-      %{total: total, items: paginated} = Pagination.fetch_paginated(Object, %{"since_id" => id})
+
+      %{total: total, items: paginated} =
+        Pagination.fetch_paginated(Object, %{"since_id" => id, "total" => true})
 
       assert length(paginated) == 2
       assert total == 5
@@ -35,7 +39,9 @@ defmodule Pleroma.PaginationTest do
 
     test "paginates by max_id", %{notes: notes} do
       id = Enum.at(notes, 1).id |> Integer.to_string()
-      %{total: total, items: paginated} = Pagination.fetch_paginated(Object, %{"max_id" => id})
+
+      %{total: total, items: paginated} =
+        Pagination.fetch_paginated(Object, %{"max_id" => id, "total" => true})
 
       assert length(paginated) == 1
       assert total == 5
@@ -44,11 +50,9 @@ defmodule Pleroma.PaginationTest do
     test "paginates by min_id & limit", %{notes: notes} do
       id = Enum.at(notes, 2).id |> Integer.to_string()
 
-      %{total: total, items: paginated} =
-        Pagination.fetch_paginated(Object, %{"min_id" => id, "limit" => 1})
+      paginated = Pagination.fetch_paginated(Object, %{"min_id" => id, "limit" => 1})
 
       assert length(paginated) == 1
-      assert total == 5
     end
   end
 
@@ -60,19 +64,15 @@ defmodule Pleroma.PaginationTest do
     end
 
     test "paginates by limit" do
-      %{total: total, items: paginated} =
-        Pagination.fetch_paginated(Object, %{"limit" => 2}, :offset)
+      paginated = Pagination.fetch_paginated(Object, %{"limit" => 2}, :offset)
 
       assert length(paginated) == 2
-      assert total == 5
     end
 
     test "paginates by limit & offset" do
-      %{total: total, items: paginated} =
-        Pagination.fetch_paginated(Object, %{"limit" => 2, "offset" => 4}, :offset)
+      paginated = Pagination.fetch_paginated(Object, %{"limit" => 2, "offset" => 4}, :offset)
 
       assert length(paginated) == 1
-      assert total == 5
     end
   end
 end