From b093947d84127789e5a3a662a9e11d0b9438180e Mon Sep 17 00:00:00 2001
From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com>
Date: Thu, 7 Sep 2023 15:58:37 +0100
Subject: [chore] much improved paging package (#2182)

---
 internal/processing/blocks.go | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

(limited to 'internal/processing/blocks.go')

diff --git a/internal/processing/blocks.go b/internal/processing/blocks.go
index 8996dff92..014b6af21 100644
--- a/internal/processing/blocks.go
+++ b/internal/processing/blocks.go
@@ -34,11 +34,11 @@ import (
 func (p *Processor) BlocksGet(
 	ctx context.Context,
 	requestingAccount *gtsmodel.Account,
-	page paging.Pager,
+	page *paging.Page,
 ) (*apimodel.PageableResponse, gtserror.WithCode) {
 	blocks, err := p.state.DB.GetAccountBlocks(ctx,
 		requestingAccount.ID,
-		&page,
+		page,
 	)
 	if err != nil && !errors.Is(err, db.ErrNoEntries) {
 		return nil, gtserror.NewErrorInternalError(err)
@@ -77,13 +77,10 @@ func (p *Processor) BlocksGet(
 		items = append(items, account)
 	}
 
-	return util.PackagePageableResponse(util.PageableResponseParams{
-		Items:          items,
-		Path:           "/api/v1/blocks",
-		NextMaxIDKey:   "max_id",
-		PrevMinIDKey:   "since_id",
-		NextMaxIDValue: nextMaxIDValue,
-		PrevMinIDValue: prevMinIDValue,
-		Limit:          page.Limit,
-	})
+	return paging.PackageResponse(paging.ResponseParams{
+		Items: items,
+		Path:  "/api/v1/blocks",
+		Next:  page.Next(nextMaxIDValue),
+		Prev:  page.Prev(prevMinIDValue),
+	}), nil
 }
-- 
cgit v1.2.3