From fd9294fccd5ded8bbc2b321402e242cb0b6eb19b Mon Sep 17 00:00:00 2001
From: zijiren233 <pyh1670605849@gmail.com>
Date: Sun, 12 Jan 2025 17:08:51 +0800
Subject: [PATCH] fix: db

---
 internal/db/db.go      | 7 -------
 internal/db/member.go  | 2 +-
 internal/db/room.go    | 2 +-
 internal/db/setting.go | 2 +-
 internal/db/user.go    | 2 +-
 5 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/internal/db/db.go b/internal/db/db.go
index 325ce8c..2b23a09 100644
--- a/internal/db/db.go
+++ b/internal/db/db.go
@@ -12,7 +12,6 @@ import (
 	// import fastjson serializer
 	_ "github.com/synctv-org/synctv/utils/fastJSONSerializer"
 	"gorm.io/gorm"
-	"gorm.io/gorm/clause"
 )
 
 var (
@@ -379,9 +378,3 @@ func HandleUpdateResult(result *gorm.DB, entityName string) error {
 	}
 	return nil
 }
-
-func OnConflictDoNothing() *gorm.DB {
-	return db.Clauses(clause.OnConflict{
-		DoNothing: true,
-	})
-}
diff --git a/internal/db/member.go b/internal/db/member.go
index 83984a9..3de6ce4 100644
--- a/internal/db/member.go
+++ b/internal/db/member.go
@@ -48,7 +48,7 @@ func FirstOrCreateRoomMemberRelation(roomID, userID string, conf ...CreateRoomMe
 	for _, c := range conf {
 		c(d)
 	}
-	err := OnConflictDoNothing().Where("room_id = ? AND user_id = ?", roomID, userID).Attrs(d).FirstOrCreate(roomMemberRelation).Error
+	err := db.Where("room_id = ? AND user_id = ?", roomID, userID).Attrs(d).FirstOrCreate(roomMemberRelation).Error
 	return roomMemberRelation, err
 }
 
diff --git a/internal/db/room.go b/internal/db/room.go
index eef82cc..1b544e2 100644
--- a/internal/db/room.go
+++ b/internal/db/room.go
@@ -111,7 +111,7 @@ func GetRoomByID(id string) (*model.Room, error) {
 
 func CreateOrLoadRoomSettings(roomID string) (*model.RoomSettings, error) {
 	var rs model.RoomSettings
-	err := OnConflictDoNothing().Where(model.RoomSettings{ID: roomID}).Attrs(model.DefaultRoomSettings()).FirstOrCreate(&rs).Error
+	err := db.Where(model.RoomSettings{ID: roomID}).Attrs(model.DefaultRoomSettings()).FirstOrCreate(&rs).Error
 	return &rs, err
 }
 
diff --git a/internal/db/setting.go b/internal/db/setting.go
index 95047d4..a6b826d 100644
--- a/internal/db/setting.go
+++ b/internal/db/setting.go
@@ -62,7 +62,7 @@ func GetSettingItemValue(name string) (string, error) {
 }
 
 func FirstOrCreateSettingItemValue(s *model.Setting) error {
-	return OnConflictDoNothing().Where("name = ?", s.Name).FirstOrCreate(s, model.Setting{
+	return db.Where("name = ?", s.Name).FirstOrCreate(s, model.Setting{
 		Value: s.Value,
 		Type:  s.Type,
 		Group: s.Group,
diff --git a/internal/db/user.go b/internal/db/user.go
index 83c71c4..5eb8295 100644
--- a/internal/db/user.go
+++ b/internal/db/user.go
@@ -119,7 +119,7 @@ func CreateOrLoadUserWithProvider(username, password string, p string, puid stri
 		c(user)
 	}
 	user.EnableAutoAddUsernameSuffix()
-	err = OnConflictDoNothing().Joins("JOIN user_providers ON users.id = user_providers.user_id").
+	err = db.Joins("JOIN user_providers ON users.id = user_providers.user_id").
 		Where("user_providers.provider = ? AND user_providers.provider_user_id = ?", p, puid).
 		FirstOrCreate(user).Error
 	if err != nil {