dkforest

commit 2e6b2683954335eef62521d344398bb0dadef0e6
parent c68e389fb05eacdf902eb00c34d9d4342ef201f3
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Sun, 31 Dec 2023 01:38:40 -0500

fix broken stuff after upgrade gorm

Diffstat:
M
pkg/database/database.go
 | 
4
+++-
M
pkg/database/tableChatMessages.go
 | 
3
+++
M
pkg/database/tableUsers.go
 | 
4
++--
M
pkg/web/handlers/paginator.go
 | 
2
+-

4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/pkg/database/database.go b/pkg/database/database.go
@@ -224,7 +224,9 @@ type IDkfDB interface {
 }
 
 func NewDkfDB(dbPath string) *DkfDB {
-	db, err := gorm.Open(sqlite.Open(dbPath), &gorm.Config{})
+	db, err := gorm.Open(sqlite.Open(dbPath), &gorm.Config{
+		//Logger: logger.Default.LogMode(logger.Silent),
+	})
 	if err != nil {
 		logrus.Fatal("Failed to open sqlite3 db : " + err.Error())
 	}
diff --git a/pkg/database/tableChatMessages.go b/pkg/database/tableChatMessages.go
@@ -9,6 +9,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"gorm.io/gorm"
 	"io"
 	"math"
 	"net/url"
@@ -420,6 +421,8 @@ func (d *DkfDB) GetChatMessages(roomID RoomID, roomKey string, username Username
 		q = q.Where(`to_user_id is null`)
 	}
 
+	q = q.Session(&gorm.Session{})
+
 	//-----------
 
 	q1 := q.Where("is_hellbanned = 0")
diff --git a/pkg/database/tableUsers.go b/pkg/database/tableUsers.go
@@ -374,8 +374,8 @@ func (u *User) ResetTutorial(db *DkfDB) {
 }
 
 func (u *User) ToggleDisplayHellbanned(db *DkfDB) {
-	u.DisplayHellbanned = !u.DisplayHellbanned
-	db.db.Exec(`UPDATE users SET display_hellbanned = ? WHERE id = ?`, u.DisplayHellbanned, u.ID)
+	//db.db.Model(u).Update("DisplayHellbanned", !u.DisplayHellbanned)
+	db.db.Model(u).Select("DisplayHellbanned").Updates(User{DisplayHellbanned: !u.DisplayHellbanned})
 }
 
 func (u *User) ToggleDisplayModerators(db *DkfDB) {
diff --git a/pkg/web/handlers/paginator.go b/pkg/web/handlers/paginator.go
@@ -32,7 +32,7 @@ func (p *Paginator) SetWantedPageQueryParam(v string) *Paginator {
 func (p *Paginator) Paginate(c echo.Context, query *gorm.DB) (int64, int64, int64, *gorm.DB) {
 	wantedPage := utils.DoParseInt64(c.QueryParam(p.wantedPageQueryParam))
 	var count int64
-	query.Count(&count)
+	query.Session(&gorm.Session{}).Count(&count)
 	resultsPerPage := p.resultsPerPage
 	page, maxPage := paginate(resultsPerPage, wantedPage, count)
 	query = query.Offset(int((page - 1) * resultsPerPage)).Limit(int(resultsPerPage))