Rename almost all Ctx functions (#22071)

1 files changed, 20 insertions, 25 deletions

diff --git a/modules/repository/collaborator.go b/modules/repository/collaborator.go
index 44c03f999e..f2b9515187 100644
--- a/modules/repository/collaborator.go
+++ b/modules/repository/collaborator.go
@@ -13,30 +13,25 @@ import (
 	user_model "code.gitea.io/gitea/models/user"
 )
 
-func addCollaborator(ctx context.Context, repo *repo_model.Repository, u *user_model.User) error {
-	collaboration := &repo_model.Collaboration{
-		RepoID: repo.ID,
-		UserID: u.ID,
-	}
-
-	has, err := db.GetByBean(ctx, collaboration)
-	if err != nil {
-		return err
-	} else if has {
-		return nil
-	}
-	collaboration.Mode = perm.AccessModeWrite
-
-	if err = db.Insert(ctx, collaboration); err != nil {
-		return err
-	}
-
-	return access_model.RecalculateUserAccess(ctx, repo, u.ID)
-}
-
-// AddCollaborator adds new collaboration to a repository with default access mode.
-func AddCollaborator(repo *repo_model.Repository, u *user_model.User) error {
-	return db.WithTx(db.DefaultContext, func(ctx context.Context) error {
-		return addCollaborator(ctx, repo, u)
+func AddCollaborator(ctx context.Context, repo *repo_model.Repository, u *user_model.User) error {
+	return db.AutoTx(ctx, func(ctx context.Context) error {
+		collaboration := &repo_model.Collaboration{
+			RepoID: repo.ID,
+			UserID: u.ID,
+		}
+
+		has, err := db.GetByBean(ctx, collaboration)
+		if err != nil {
+			return err
+		} else if has {
+			return nil
+		}
+		collaboration.Mode = perm.AccessModeWrite
+
+		if err = db.Insert(ctx, collaboration); err != nil {
+			return err
+		}
+
+		return access_model.RecalculateUserAccess(ctx, repo, u.ID)
 	})
 }