dkforest

commit d033b63e58fd493f3a14b4b1331eeeacd67dd3a9
parent 42fac9bf684a2b3752d85383016921f821fd722a
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Sun, 15 Jan 2023 21:33:52 -0800

cleanup

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

2 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/pkg/web/handlers/admin.go b/pkg/web/handlers/admin.go
@@ -98,10 +98,10 @@ func AdminGistsHandler(c echo.Context) error {
 
 	data.CurrentPage, data.MaxPage, data.GistsCount, query = NewPaginator().Paginate(c, query)
 
-	query = query.
+	if err := query.
 		Preload("User").
-		Order("id DESC")
-	if err := query.Find(&data.Gists).Error; err != nil {
+		Order("id DESC").
+		Find(&data.Gists).Error; err != nil {
 		logrus.Error(err)
 	}
 
@@ -255,8 +255,7 @@ func AdminHandler(c echo.Context) error {
 
 	data.CurrentPage, data.MaxPage, data.UsersCount, query = NewPaginator().Paginate(c, query)
 
-	query = query.Order("id DESC")
-	if err := query.Find(&data.Users).Error; err != nil {
+	if err := query.Order("id DESC").Find(&data.Users).Error; err != nil {
 		logrus.Error(err)
 	}
 	return c.Render(http.StatusOK, "admin.users", data)
@@ -275,8 +274,10 @@ func SessionsHandler(c echo.Context) error {
 
 	data.CurrentPage, data.MaxPage, data.SessionsCount, query = NewPaginator().Paginate(c, query)
 
-	query = query.Order("created_at DESC")
-	if err := query.Preload("User").Find(&data.Sessions).Error; err != nil {
+	if err := query.
+		Preload("User").
+		Order("created_at DESC").
+		Find(&data.Sessions).Error; err != nil {
 		logrus.Error(err)
 	}
 	return c.Render(http.StatusOK, "admin.sessions", data)
@@ -296,8 +297,11 @@ func IgnoredHandler(c echo.Context) error {
 
 	data.CurrentPage, data.MaxPage, data.IgnoredCount, query = NewPaginator().Paginate(c, query)
 
-	query = query.Order("created_at DESC")
-	if err := query.Preload("User").Preload("IgnoredUser").Find(&data.Ignored).Error; err != nil {
+	if err := query.
+		Preload("User").
+		Preload("IgnoredUser").
+		Order("created_at DESC").
+		Find(&data.Ignored).Error; err != nil {
 		logrus.Error(err)
 	}
 	return c.Render(http.StatusOK, "admin.ignored", data)
diff --git a/pkg/web/handlers/handlers.go b/pkg/web/handlers/handlers.go
@@ -3111,11 +3111,12 @@ func ChatArchiveHandler(c echo.Context) error {
 
 	data.CurrentPage, data.MaxPage, data.MessagesCount, query = NewPaginator().SetResultPerPage(300).Paginate(c, query)
 
-	query = query.Order("id DESC").
+	if err := query.
+		Order("id DESC").
 		Preload("Room").
 		Preload("User").
-		Preload("ToUser")
-	if err := query.Find(&data.Messages).Error; err != nil {
+		Preload("ToUser").
+		Find(&data.Messages).Error; err != nil {
 		logrus.Error(err)
 	}