dkforest

commit c25509b73f3b1f1012a3272ec16376e12ad366d5
parent 5218f999ab0dbfe6a49c3375c73dcbd2a2592d4f
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Sun, 15 Jan 2023 20:18:05 -0800

cleanup

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
@@ -88,31 +88,21 @@ func AdminEditGistHandler(c echo.Context) error {
 }
 
 func AdminGistsHandler(c echo.Context) error {
-	wantedPage := utils.DoParseInt64(c.QueryParam("p"))
-
 	var data adminGistsData
 	data.ActiveTab = "gists"
 
 	userQuery := c.QueryParam("u")
 
-	query := database.DB.Table("gists")
+	query := database.DB.Table("gists").Unscoped()
 	if userQuery != "" {
 		query = query.Where("user_id = ?", userQuery)
 	}
-	query.Count(&data.GistsCount)
 
-	data.CurrentPage, data.MaxPage = Paginate(ResultsPerPage, wantedPage, data.GistsCount)
+	data.CurrentPage, data.MaxPage, data.GistsCount, 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.Gists).Error; err != nil {
 		logrus.Error(err)
 	}