Merge remote-tracking branch 'upstream/main'

* upstream/main:
  Fix incorrect ctx usage in defer function (go-gitea#27740)
  Enable followCursor for language stats bar (go-gitea#27713)
  teams: new View button (go-gitea#27685)
  fix issues in translation file (go-gitea#27699)
  Fix an indentation in the Chinese documentation of Act Runner (go-gitea#27730)
  [skip ci] Updated translations via Crowdin
  Fix org team endpoint (go-gitea#27721)
  Improve diff tree spacing (go-gitea#27714)
  refactor: make db iterate context aware (go-gitea#27710)
  [FIX] resolve confusing colors in languages stats by insert a gap (go-gitea#27704)
  Fix sticky diff header background (go-gitea#27697)
  Replace -1 with GhostUserID (go-gitea#27703)
  Clean some functions about project issue (go-gitea#27705)

Author: zjjhot

docs/content/usage/actions/act-runner.zh-cn.md

@@ -208,12 +208,12 @@ services:
 
 ```yaml
 cache:
-enabled: true
-dir: ""
-# 使用步骤 1. 获取的 LAN IP
-host: "192.168.8.17"
-# 使用步骤 2. 获取的端口号
-port: 8088
+  enabled: true
+  dir: ""
+  # 使用步骤 1. 获取的 LAN IP
+  host: "192.168.8.17"
+  # 使用步骤 2. 获取的端口号
+  port: 8088
 ```
 
 - 4.启动容器时, 将 Cache 端口映射至主机。

models/db/iterate.go

@@ -17,22 +17,27 @@ func Iterate[Bean any](ctx context.Context, cond builder.Cond, f func(ctx contex
 	batchSize := setting.Database.IterateBufferSize
 	sess := GetEngine(ctx)
 	for {
-		beans := make([]*Bean, 0, batchSize)
-		if cond != nil {
-			sess = sess.Where(cond)
-		}
-		if err := sess.Limit(batchSize, start).Find(&beans); err != nil {
-			return err
-		}
-		if len(beans) == 0 {
-			return nil
-		}
-		start += len(beans)
-
-		for _, bean := range beans {
-			if err := f(ctx, bean); err != nil {
+		select {
+		case <-ctx.Done():
+			return ctx.Err()
+		default:
+			beans := make([]*Bean, 0, batchSize)
+			if cond != nil {
+				sess = sess.Where(cond)
+			}
+			if err := sess.Limit(batchSize, start).Find(&beans); err != nil {
 				return err
 			}
+			if len(beans) == 0 {
+				return nil
+			}
+			start += len(beans)
+
+			for _, bean := range beans {
+				if err := f(ctx, bean); err != nil {
+					return err
+				}
+			}
 		}
 	}
 }

models/issues/comment.go

@@ -349,7 +349,7 @@ func (c *Comment) LoadPoster(ctx context.Context) (err error) {
 	c.Poster, err = user_model.GetPossibleUserByID(ctx, c.PosterID)
 	if err != nil {
 		if user_model.IsErrUserNotExist(err) {
-			c.PosterID = -1
+			c.PosterID = user_model.GhostUserID
 			c.Poster = user_model.NewGhostUser()
 		} else {
 			log.Error("getUserByID[%d]: %v", c.ID, err)

models/issues/issue.go

@@ -219,7 +219,7 @@ func (issue *Issue) LoadPoster(ctx context.Context) (err error) {
 	if issue.Poster == nil && issue.PosterID != 0 {
 		issue.Poster, err = user_model.GetPossibleUserByID(ctx, issue.PosterID)
 		if err != nil {
-			issue.PosterID = -1
+			issue.PosterID = user_model.GhostUserID
 			issue.Poster = user_model.NewGhostUser()
 			if !user_model.IsErrUserNotExist(err) {
 				return fmt.Errorf("getUserByID.(poster) [%d]: %w", issue.PosterID, err)

models/issues/issue_project.go

@@ -51,7 +51,7 @@ func (issue *Issue) ProjectBoardID(ctx context.Context) int64 {
 func LoadIssuesFromBoard(ctx context.Context, b *project_model.Board) (IssueList, error) {
 	issueList := make(IssueList, 0, 10)
 
-	if b.ID != 0 {
+	if b.ID > 0 {
 		issues, err := Issues(ctx, &IssuesOptions{
 			ProjectBoardID: b.ID,
 			ProjectID:      b.ProjectID,
@@ -65,7 +65,7 @@ func LoadIssuesFromBoard(ctx context.Context, b *project_model.Board) (IssueList
 
 	if b.Default {
 		issues, err := Issues(ctx, &IssuesOptions{
-			ProjectBoardID: -1, // Issues without ProjectBoardID
+			ProjectBoardID: db.NoConditionID,
 			ProjectID:      b.ProjectID,
 			SortType:       "project-column-sorting",
 		})
@@ -150,30 +150,3 @@ func addUpdateIssueProject(ctx context.Context, issue *Issue, doer *user_model.U
 		ProjectID: newProjectID,
 	})
 }
-
-// MoveIssueAcrossProjectBoards move a card from one board to another
-func MoveIssueAcrossProjectBoards(ctx context.Context, issue *Issue, board *project_model.Board) error {
-	ctx, committer, err := db.TxContext(ctx)
-	if err != nil {
-		return err
-	}
-	defer committer.Close()
-	sess := db.GetEngine(ctx)
-
-	var pis project_model.ProjectIssue
-	has, err := sess.Where("issue_id=?", issue.ID).Get(&pis)
-	if err != nil {
-		return err
-	}
-
-	if !has {
-		return fmt.Errorf("issue has to be added to a project first")
-	}
-
-	pis.ProjectBoardID = board.ID
-	if _, err := sess.ID(pis.ID).Cols("project_board_id").Update(&pis); err != nil {
-		return err
-	}
-
-	return committer.Commit()
-}

models/issues/issue_search.go

@@ -180,6 +180,17 @@ func applyProjectCondition(sess *xorm.Session, opts *IssuesOptions) *xorm.Sessio
 	return sess
 }
 
+func applyProjectBoardCondition(sess *xorm.Session, opts *IssuesOptions) *xorm.Session {
+	// opts.ProjectBoardID == 0 means all project boards,
+	// do not need to apply any condition
+	if opts.ProjectBoardID > 0 {
+		sess.In("issue.id", builder.Select("issue_id").From("project_issue").Where(builder.Eq{"project_board_id": opts.ProjectBoardID}))
+	} else if opts.ProjectBoardID == db.NoConditionID {
+		sess.In("issue.id", builder.Select("issue_id").From("project_issue").Where(builder.Neq{"project_board_id": 0}))
+	}
+	return sess
+}
+
 func applyRepoConditions(sess *xorm.Session, opts *IssuesOptions) *xorm.Session {
 	if len(opts.RepoIDs) == 1 {
 		opts.RepoCond = builder.Eq{"issue.repo_id": opts.RepoIDs[0]}
@@ -240,13 +251,7 @@ func applyConditions(sess *xorm.Session, opts *IssuesOptions) *xorm.Session {
 
 	applyProjectCondition(sess, opts)
 
-	if opts.ProjectBoardID != 0 {
-		if opts.ProjectBoardID > 0 {
-			sess.In("issue.id", builder.Select("issue_id").From("project_issue").Where(builder.Eq{"project_board_id": opts.ProjectBoardID}))
-		} else {
-			sess.In("issue.id", builder.Select("issue_id").From("project_issue").Where(builder.Eq{"project_board_id": 0}))
-		}
-	}
+	applyProjectBoardCondition(sess, opts)
 
 	switch opts.IsPull {
 	case util.OptionalBoolTrue:

models/issues/pull.go

@@ -272,7 +272,7 @@ func (pr *PullRequest) LoadAttributes(ctx context.Context) (err error) {
 	if pr.HasMerged && pr.Merger == nil {
 		pr.Merger, err = user_model.GetUserByID(ctx, pr.MergerID)
 		if user_model.IsErrUserNotExist(err) {
-			pr.MergerID = -1
+			pr.MergerID = user_model.GhostUserID
 			pr.Merger = user_model.NewGhostUser()
 		} else if err != nil {
 			return fmt.Errorf("getUserByID [%d]: %w", pr.MergerID, err)

models/user/avatar.go

@@ -58,8 +58,7 @@ func GenerateRandomAvatar(ctx context.Context, u *User) error {
 
 // AvatarLinkWithSize returns a link to the user's avatar with size. size <= 0 means default size
 func (u *User) AvatarLinkWithSize(ctx context.Context, size int) string {
-	if u.ID == -1 {
-		// ghost user
+	if u.IsGhost() {
 		return avatars.DefaultAvatarLink()
 	}
 

models/user/user.go

@@ -933,7 +933,7 @@ func GetUserByIDs(ctx context.Context, ids []int64) ([]*User, error) {
 // GetPossibleUserByID returns the user if id > 0 or return system usrs if id < 0
 func GetPossibleUserByID(ctx context.Context, id int64) (*User, error) {
 	switch id {
-	case -1:
+	case GhostUserID:
 		return NewGhostUser(), nil
 	case ActionsUserID:
 		return NewActionsUser(), nil
@@ -949,7 +949,7 @@ func GetPossibleUserByIDs(ctx context.Context, ids []int64) ([]*User, error) {
 	uniqueIDs := container.SetOf(ids...)
 	users := make([]*User, 0, len(ids))
 	_ = uniqueIDs.Remove(0)
-	if uniqueIDs.Remove(-1) {
+	if uniqueIDs.Remove(GhostUserID) {
 		users = append(users, NewGhostUser())
 	}
 	if uniqueIDs.Remove(ActionsUserID) {

models/user/user_system.go

@@ -9,12 +9,18 @@ import (
 	"code.gitea.io/gitea/modules/structs"
 )
 
+const (
+	GhostUserID        = -1
+	GhostUserName      = "Ghost"
+	GhostUserLowerName = "ghost"
+)
+
 // NewGhostUser creates and returns a fake user for someone has deleted their account.
 func NewGhostUser() *User {
 	return &User{
-		ID:        -1,
-		Name:      "Ghost",
-		LowerName: "ghost",
+		ID:        GhostUserID,
+		Name:      GhostUserName,
+		LowerName: GhostUserLowerName,
 	}
 }
 
@@ -23,13 +29,13 @@ func (u *User) IsGhost() bool {
 	if u == nil {
 		return false
 	}
-	return u.ID == -1 && u.Name == "Ghost"
+	return u.ID == GhostUserID && u.Name == GhostUserName
 }
 
 // NewReplaceUser creates and returns a fake user for external user
 func NewReplaceUser(name string) *User {
 	return &User{
-		ID:        -1,
+		ID:        0,
 		Name:      name,
 		LowerName: strings.ToLower(name),
 	}