X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fpagination.ex;h=9d279fba7939f12256d57cf41261f0e506fba562;hb=1f0be71ea433971de874a71ba1dafd101f4301b6;hp=2b869ccdcc494c2a9bb158772da59c1167aa7529;hpb=db75288b71e7531f8e5033f56fc0b9a7d1d8efb3;p=akkoma

diff --git a/lib/pleroma/pagination.ex b/lib/pleroma/pagination.ex
index 2b869ccdc..9d279fba7 100644
--- a/lib/pleroma/pagination.ex
+++ b/lib/pleroma/pagination.ex
@@ -16,6 +16,15 @@ defmodule Pleroma.Pagination do
 
   def fetch_paginated(query, params, type \\ :keyset)
 
+  def fetch_paginated(query, %{"total" => true} = params, :keyset) do
+    total = Repo.aggregate(query, :count, :id)
+
+    %{
+      total: total,
+      items: fetch_paginated(query, Map.drop(params, ["total"]), :keyset)
+    }
+  end
+
   def fetch_paginated(query, params, :keyset) do
     options = cast_params(params)
 
@@ -25,6 +34,15 @@ defmodule Pleroma.Pagination do
     |> enforce_order(options)
   end
 
+  def fetch_paginated(query, %{"total" => true} = params, :offset) do
+    total = Repo.aggregate(query, :count, :id)
+
+    %{
+      total: total,
+      items: fetch_paginated(query, Map.drop(params, ["total"]), :offset)
+    }
+  end
+
   def fetch_paginated(query, params, :offset) do
     options = cast_params(params)
 
@@ -46,6 +64,7 @@ defmodule Pleroma.Pagination do
 
   def paginate(query, options, :offset) do
     query
+    |> restrict(:order, options)
     |> restrict(:offset, options)
     |> restrict(:limit, options)
   end