dkforest

commit 6ac68aba6a0eb679897b4c97187942bd348a1b7e
parent 2e6b2683954335eef62521d344398bb0dadef0e6
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Sun, 31 Dec 2023 01:51:44 -0500

cleanup

Diffstat:
M
pkg/database/tableChatMessages.go
 | 
8
++++----

1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkg/database/tableChatMessages.go b/pkg/database/tableChatMessages.go
@@ -421,11 +421,10 @@ 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")
+	q1 := q.Session(&gorm.Session{})
+	q1 = q.Where("is_hellbanned = 0")
 	var out1 []ChatMessage
 	if err = q1.Find(&out1).Error; err != nil {
 		return out, err
@@ -444,7 +443,8 @@ func (d *DkfDB) GetChatMessages(roomID RoomID, roomKey string, username Username
 
 	var out2 []ChatMessage
 	if displayHellbanned {
-		q2 := q.Where("is_hellbanned = 1 AND id > ?", minID)
+		q2 := q.Session(&gorm.Session{})
+		q2 = q.Where("is_hellbanned = 1 AND id > ?", minID)
 		if minID1 > 0 {
 			q2 = q.Where("is_hellbanned = 1")
 		}