dkforest

commit 5b6235647b520a24c9520859195db3b727687cbc
parent f2cf4da2e9597ca2dfa89f3077f91eb49c0b01d9
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Sun, 15 Jan 2023 20:23:26 -0800

use paginator

Diffstat:
M
pkg/web/handlers/admin.go
 | 
16
+++-------------

1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/pkg/web/handlers/admin.go b/pkg/web/handlers/admin.go
@@ -169,31 +169,21 @@ func AdminFiledropsHandler(c echo.Context) error {
 }
 
 func AdminDownloadsHandler(c echo.Context) error {
-	wantedPage := utils.DoParseInt64(c.QueryParam("p"))
-
 	var data adminDownloadsData
 	data.ActiveTab = "downloads"
 
 	userQuery := c.QueryParam("u")
 
-	query := database.DB.Table("downloads")
+	query := database.DB.Table("downloads").Unscoped()
 	if userQuery != "" {
 		query = query.Where("user_id = ?", userQuery)
 	}
-	query.Count(&data.DownloadsCount)
 
-	data.CurrentPage, data.MaxPage = Paginate(ResultsPerPage, wantedPage, data.DownloadsCount)
+	data.CurrentPage, data.MaxPage, data.DownloadsCount, query = NewPaginator().Paginate(c, query)
 
-	resultsPerPage := int64(100)
-	query = database.DB.
-		Unscoped().
+	query = query.
 		Preload("User").
-		Offset((data.CurrentPage - 1) * resultsPerPage).
-		Limit(resultsPerPage).
 		Order("id DESC")
-	if userQuery != "" {
-		query = query.Where("user_id = ?", userQuery)
-	}
 	if err := query.Find(&data.Downloads).Error; err != nil {
 		logrus.Error(err)
 	}