Avoid double imports (#17569)

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>

diff --git a/.revive.toml b/.revive.toml
index 74743d5ef4d4fa1f6454615b357306134bd910b5..499a4051a12831542594d106175b20c49ee33493 100644 (file)
--- a/.revive.toml
+++ b/.revive.toml
@@ -23,3 +23,4 @@ warningCode = 1
 [rule.unexported-return]
 [rule.indent-error-flow]
 [rule.errorf]
+[rule.duplicated-imports]

diff --git a/models/issue.go b/models/issue.go
index a27bb1cc7dec9d3e5a5f67d8cade628326a781c2..0bc1ebd209d29373571d1af252936485a0fb3e84 100644 (file)
--- a/models/issue.go
+++ b/models/issue.go
@@ -18,7 +18,6 @@ import (
        "code.gitea.io/gitea/modules/base"
        "code.gitea.io/gitea/modules/log"
        "code.gitea.io/gitea/modules/references"
-       "code.gitea.io/gitea/modules/structs"
        api "code.gitea.io/gitea/modules/structs"
        "code.gitea.io/gitea/modules/timeutil"
        "code.gitea.io/gitea/modules/util"
@@ -2116,7 +2115,7 @@ func (issue *Issue) ResolveMentionsByVisibility(ctx context.Context, doer *User,
 }
 
 // UpdateIssuesMigrationsByType updates all migrated repositories' issues from gitServiceType to replace originalAuthorID to posterID
-func UpdateIssuesMigrationsByType(gitServiceType structs.GitServiceType, originalAuthorID string, posterID int64) error {
+func UpdateIssuesMigrationsByType(gitServiceType api.GitServiceType, originalAuthorID string, posterID int64) error {
        _, err := db.GetEngine(db.DefaultContext).Table("issue").
                Where("repo_id IN (SELECT id FROM repository WHERE original_service_type = ?)", gitServiceType).
                And("original_author_id = ?", originalAuthorID).
@@ -2129,7 +2128,7 @@ func UpdateIssuesMigrationsByType(gitServiceType structs.GitServiceType, origina
 }
 
 // UpdateReactionsMigrationsByType updates all migrated repositories' reactions from gitServiceType to replace originalAuthorID to posterID
-func UpdateReactionsMigrationsByType(gitServiceType structs.GitServiceType, originalAuthorID string, userID int64) error {
+func UpdateReactionsMigrationsByType(gitServiceType api.GitServiceType, originalAuthorID string, userID int64) error {
        _, err := db.GetEngine(db.DefaultContext).Table("reaction").
                Where("original_author_id = ?", originalAuthorID).
                And(migratedIssueCond(gitServiceType)).

diff --git a/modules/convert/convert.go b/modules/convert/convert.go
index 3c309a82f861dde5fa71866850f4cd7aa54ba00c..2960f7741abaeec75f76442cf911ad9775037577 100644 (file)
--- a/modules/convert/convert.go
+++ b/modules/convert/convert.go
@@ -15,7 +15,6 @@ import (
        "code.gitea.io/gitea/models/login"
        "code.gitea.io/gitea/modules/git"
        "code.gitea.io/gitea/modules/log"
-       "code.gitea.io/gitea/modules/structs"
        api "code.gitea.io/gitea/modules/structs"
        "code.gitea.io/gitea/modules/util"
        "code.gitea.io/gitea/services/webhook"
@@ -158,7 +157,7 @@ func ToVerification(c *git.Commit) *api.PayloadCommitVerification {
                commitVerification.Payload = c.Signature.Payload
        }
        if verif.SigningUser != nil {
-               commitVerification.Signer = &structs.PayloadUser{
+               commitVerification.Signer = &api.PayloadUser{
                        Name:  verif.SigningUser.Name,
                        Email: verif.SigningUser.Email,
                }

diff --git a/modules/migrations/gitea_uploader.go b/modules/migrations/gitea_uploader.go
index 62e8924e5447e5a68d17bc5cd565786bdc3c301e..d62ce80c77f354b6a6dae028ddb53d17e750aded 100644 (file)
--- a/modules/migrations/gitea_uploader.go
+++ b/modules/migrations/gitea_uploader.go
@@ -20,7 +20,6 @@ import (
        "code.gitea.io/gitea/modules/git"
        "code.gitea.io/gitea/modules/log"
        "code.gitea.io/gitea/modules/migrations/base"
-       "code.gitea.io/gitea/modules/repository"
        repo_module "code.gitea.io/gitea/modules/repository"
        "code.gitea.io/gitea/modules/setting"
        "code.gitea.io/gitea/modules/storage"
@@ -111,7 +110,7 @@ func (g *GiteaLocalUploader) CreateRepo(repo *base.Repository, opts base.Migrate
        }
        r.DefaultBranch = repo.DefaultBranch
 
-       r, err = repository.MigrateRepositoryGitData(g.ctx, owner, r, base.MigrateOptions{
+       r, err = repo_module.MigrateRepositoryGitData(g.ctx, owner, r, base.MigrateOptions{
                RepoName:       g.repoName,
                Description:    repo.Description,
                OriginalURL:    repo.OriginalURL,
@@ -341,7 +340,7 @@ func (g *GiteaLocalUploader) CreateReleases(releases ...*base.Release) error {
 
 // SyncTags syncs releases with tags in the database
 func (g *GiteaLocalUploader) SyncTags() error {
-       return repository.SyncReleasesWithTags(g.repo, g.gitRepo)
+       return repo_module.SyncReleasesWithTags(g.repo, g.gitRepo)
 }
 
 // CreateIssues creates issues

diff --git a/routers/api/v1/repo/transfer.go b/routers/api/v1/repo/transfer.go
index 2e052aa4ff23af91f2e9641a14d8d4c0068f717f..c13a2e4857360f61e9b959df7b52dd9fb9a9dd15 100644 (file)
--- a/routers/api/v1/repo/transfer.go
+++ b/routers/api/v1/repo/transfer.go
@@ -12,7 +12,6 @@ import (
        "code.gitea.io/gitea/modules/context"
        "code.gitea.io/gitea/modules/convert"
        "code.gitea.io/gitea/modules/log"
-       "code.gitea.io/gitea/modules/structs"
        api "code.gitea.io/gitea/modules/structs"
        "code.gitea.io/gitea/modules/web"
        repo_service "code.gitea.io/gitea/services/repository"
@@ -65,7 +64,7 @@ func Transfer(ctx *context.APIContext) {
        }
 
        if newOwner.Type == models.UserTypeOrganization {
-               if !ctx.User.IsAdmin && newOwner.Visibility == structs.VisibleTypePrivate && !newOwner.HasMemberWithUserID(ctx.User.ID) {
+               if !ctx.User.IsAdmin && newOwner.Visibility == api.VisibleTypePrivate && !newOwner.HasMemberWithUserID(ctx.User.ID) {
                        // The user shouldn't know about this organization
                        ctx.Error(http.StatusNotFound, "", "The new owner does not exist or cannot be found")
                        return