Convert remaining files from XORM to GORM and fix unused imports

Co-authored-by: unknwon <2946214+unknwon@users.noreply.github.com>

internal/database/issue_label.go

@@ -12,7 +12,6 @@ import (
 
 	"gogs.io/gogs/internal/errutil"
 	"gogs.io/gogs/internal/lazyregexp"
-	"gogs.io/gogs/internal/tool"
 )
 
 var labelColorPattern = lazyregexp.New("#([a-fA-F0-9]{6})")

internal/database/repo_editor.go

@@ -14,6 +14,7 @@ import (
 	"github.com/cockroachdb/errors"
 	gouuid "github.com/satori/go.uuid"
 	"github.com/unknwon/com"
+	"gorm.io/gorm"
 
 	"github.com/gogs/git-module"
 
@@ -441,7 +442,7 @@ func NewUpload(name string, buf []byte, file multipart.File) (_ *Upload, err err
 		return nil, errors.Newf("copy: %v", err)
 	}
 
-	if _, err := x.Insert(upload); err != nil {
+	if err := db.Create(upload).Error; err != nil {
 		return nil, err
 	}
 
@@ -450,11 +451,12 @@ func NewUpload(name string, buf []byte, file multipart.File) (_ *Upload, err err
 
 func GetUploadByUUID(uuid string) (*Upload, error) {
 	upload := &Upload{UUID: uuid}
-	has, err := x.Get(upload)
+	err := db.Where("uuid = ?", uuid).First(upload).Error
 	if err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, ErrUploadNotExist{0, uuid}
+		}
 		return nil, err
-	} else if !has {
-		return nil, ErrUploadNotExist{0, uuid}
 	}
 	return upload, nil
 }
@@ -466,7 +468,7 @@ func GetUploadsByUUIDs(uuids []string) ([]*Upload, error) {
 
 	// Silently drop invalid uuids.
 	uploads := make([]*Upload, 0, len(uuids))
-	return uploads, x.In("uuid", uuids).Find(&uploads)
+	return uploads, db.Where("uuid IN ?", uuids).Find(&uploads).Error
 }
 
 func DeleteUploads(uploads ...*Upload) (err error) {
@@ -474,32 +476,28 @@ func DeleteUploads(uploads ...*Upload) (err error) {
 		return nil
 	}
 
-	sess := x.NewSession()
-	defer sess.Close()
-	if err = sess.Begin(); err != nil {
-		return err
-	}
-
-	ids := make([]int64, len(uploads))
-	for i := 0; i < len(uploads); i++ {
-		ids[i] = uploads[i].ID
-	}
-	if _, err = sess.In("id", ids).Delete(new(Upload)); err != nil {
-		return errors.Newf("delete uploads: %v", err)
-	}
-
-	for _, upload := range uploads {
-		localPath := upload.LocalPath()
-		if !osutil.IsFile(localPath) {
-			continue
+	return db.Transaction(func(tx *gorm.DB) error {
+		ids := make([]int64, len(uploads))
+		for i := 0; i < len(uploads); i++ {
+			ids[i] = uploads[i].ID
+		}
+		if err := tx.Where("id IN ?", ids).Delete(new(Upload)).Error; err != nil {
+			return errors.Newf("delete uploads: %v", err)
 		}
 
-		if err := os.Remove(localPath); err != nil {
-			return errors.Newf("remove upload: %v", err)
+		for _, upload := range uploads {
+			localPath := upload.LocalPath()
+			if !osutil.IsFile(localPath) {
+				continue
+			}
+
+			if err := os.Remove(localPath); err != nil {
+				return errors.Newf("remove upload: %v", err)
+			}
 		}
-	}
 
-	return sess.Commit()
+		return nil
+	})
 }
 
 func DeleteUpload(u *Upload) error {

internal/database/repositories.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"strings"
-	"time"
 
 	"github.com/cockroachdb/errors"
 	api "github.com/gogs/go-gogs-client"

internal/database/ssh_key.go

@@ -521,15 +521,21 @@ func RewriteAuthorizedKeys() error {
 	}
 	defer os.Remove(tmpPath)
 
-	err = x.Iterate(new(PublicKey), func(idx int, bean any) (err error) {
-		_, err = f.WriteString((bean.(*PublicKey)).AuthorizedString())
-		return err
-	})
-	_ = f.Close()
+	var keys []*PublicKey
+	err = db.Find(&keys).Error
 	if err != nil {
+		_ = f.Close()
 		return err
 	}
 
+	for _, key := range keys {
+		if _, err = f.WriteString(key.AuthorizedString()); err != nil {
+			_ = f.Close()
+			return err
+		}
+	}
+	_ = f.Close()
+
 	if com.IsExist(fpath) {
 		if err = os.Remove(fpath); err != nil {
 			return err

internal/database/two_factor.go

@@ -38,20 +38,16 @@ func (t *TwoFactor) ValidateTOTP(passcode string) (bool, error) {
 }
 
 // DeleteTwoFactor removes two-factor authentication token and recovery codes of given user.
-func DeleteTwoFactor(userID int64) (err error) {
-	sess := x.NewSession()
-	defer sess.Close()
-	if err = sess.Begin(); err != nil {
-		return err
-	}
-
-	if _, err = sess.Where("user_id = ?", userID).Delete(new(TwoFactor)); err != nil {
-		return errors.Newf("delete two-factor: %v", err)
-	} else if err = deleteRecoveryCodesByUserID(sess, userID); err != nil {
-		return errors.Newf("deleteRecoveryCodesByUserID: %v", err)
-	}
-
-	return sess.Commit()
+func DeleteTwoFactor(userID int64) error {
+	return db.Transaction(func(tx *gorm.DB) error {
+		if err := tx.Where("user_id = ?", userID).Delete(new(TwoFactor)).Error; err != nil {
+			return errors.Newf("delete two-factor: %v", err)
+		}
+		if err := deleteRecoveryCodesByUserID(tx, userID); err != nil {
+			return errors.Newf("deleteRecoveryCodesByUserID: %v", err)
+		}
+		return nil
+	})
 }
 
 // TwoFactorRecoveryCode represents a two-factor authentication recovery code.
@@ -65,7 +61,7 @@ type TwoFactorRecoveryCode struct {
 // GetRecoveryCodesByUserID returns all recovery codes of given user.
 func GetRecoveryCodesByUserID(userID int64) ([]*TwoFactorRecoveryCode, error) {
 	recoveryCodes := make([]*TwoFactorRecoveryCode, 0, 10)
-	return recoveryCodes, x.Where("user_id = ?", userID).Find(&recoveryCodes)
+	return recoveryCodes, db.Where("user_id = ?", userID).Find(&recoveryCodes).Error
 }
 
 func deleteRecoveryCodesByUserID(e *gorm.DB, userID int64) error {
@@ -79,19 +75,15 @@ func RegenerateRecoveryCodes(userID int64) error {
 		return errors.Newf("generateRecoveryCodes: %v", err)
 	}
 
-	sess := x.NewSession()
-	defer sess.Close()
-	if err = sess.Begin(); err != nil {
-		return err
-	}
-
-	if err = deleteRecoveryCodesByUserID(sess, userID); err != nil {
-		return errors.Newf("deleteRecoveryCodesByUserID: %v", err)
-	} else if _, err = sess.Insert(recoveryCodes); err != nil {
-		return errors.Newf("insert new recovery codes: %v", err)
-	}
-
-	return sess.Commit()
+	return db.Transaction(func(tx *gorm.DB) error {
+		if err := deleteRecoveryCodesByUserID(tx, userID); err != nil {
+			return errors.Newf("deleteRecoveryCodesByUserID: %v", err)
+		}
+		if err := tx.Create(recoveryCodes).Error; err != nil {
+			return errors.Newf("insert new recovery codes: %v", err)
+		}
+		return nil
+	})
 }
 
 type ErrTwoFactorRecoveryCodeNotFound struct {