From ac82797cd8630275d61bab689f077187b9326277 Mon Sep 17 00:00:00 2001 From: Nicolas Date: Thu, 7 May 2026 21:52:54 +0200 Subject: [PATCH 01/18] feat(repo): add co-author parsing and avatar components Extract and harden co-author trailer parsing, add reusable co-author avatar templates, and wire commit/repo views to render co-author metadata. --- models/user/user.go | 46 +++++++++++++- modules/git/commit.go | 53 ++++++++++++++-- options/locale/locale_en-US.json | 4 ++ routers/web/repo/commit.go | 5 ++ routers/web/repo/view.go | 6 ++ .../repo/commit_coauthor_avatar_stack.tmpl | 49 +++++++++++++++ templates/repo/commit_coauthor_avatars.tmpl | 43 +++++++++++++ templates/repo/commit_page.tmpl | 15 +++++ templates/repo/commits_list.tmpl | 14 +---- templates/repo/latest_commit.tmpl | 10 +-- web_src/css/repo.css | 63 ++++++++++++++++++- 11 files changed, 280 insertions(+), 28 deletions(-) create mode 100644 templates/repo/commit_coauthor_avatar_stack.tmpl create mode 100644 templates/repo/commit_coauthor_avatars.tmpl diff --git a/models/user/user.go b/models/user/user.go index 8a39eca634e43..7a45d7087889a 100644 --- a/models/user/user.go +++ b/models/user/user.go @@ -1140,9 +1140,16 @@ func GetUsersBySource(ctx context.Context, s *auth.Source) ([]*User, error) { return users, err } +// CoAuthorUser represents a co-author parsed from a commit trailer, with optional Gitea user. +type CoAuthorUser struct { + GiteaUser *User + TrailerSignature *git.Signature +} + // UserCommit represents a commit with validation of user. type UserCommit struct { //revive:disable-line:exported - User *User + User *User + CoAuthors []*CoAuthorUser *git.Commit } @@ -1158,6 +1165,27 @@ func ValidateCommitWithEmail(ctx context.Context, c *git.Commit) *User { return u } +// CoAuthorsFromCommit resolves co-author signatures from a commit into CoAuthorUser values. +func CoAuthorsFromCommit(ctx context.Context, c *git.Commit) ([]*CoAuthorUser, error) { + sigs := c.CoAuthorSignatures() + if len(sigs) == 0 { + return nil, nil + } + emails := make([]string, len(sigs)) + for i, sig := range sigs { + emails[i] = sig.Email + } + emailUserMap, err := GetUsersByEmails(ctx, emails) + if err != nil { + return nil, err + } + coAuthors := make([]*CoAuthorUser, len(sigs)) + for i, sig := range sigs { + coAuthors[i] = &CoAuthorUser{GiteaUser: emailUserMap.GetByEmail(sig.Email), TrailerSignature: sig} + } + return coAuthors, nil +} + // ValidateCommitsWithEmails checks if authors' e-mails of commits are corresponding to users. func ValidateCommitsWithEmails(ctx context.Context, oldCommits []*git.Commit) ([]*UserCommit, error) { var ( @@ -1168,6 +1196,9 @@ func ValidateCommitsWithEmails(ctx context.Context, oldCommits []*git.Commit) ([ if c.Author != nil { emailSet.Add(c.Author.Email) } + for _, sig := range c.CoAuthorSignatures() { + emailSet.Add(sig.Email) + } } emailUserMap, err := GetUsersByEmails(ctx, emailSet.Values()) @@ -1177,9 +1208,18 @@ func ValidateCommitsWithEmails(ctx context.Context, oldCommits []*git.Commit) ([ for _, c := range oldCommits { user := emailUserMap.GetByEmail(c.Author.Email) // FIXME: why ValidateCommitsWithEmails uses "Author", but ParseCommitsWithSignature uses "Committer"? + coAuthorSigs := c.CoAuthorSignatures() + coAuthors := make([]*CoAuthorUser, 0, len(coAuthorSigs)) + for _, sig := range coAuthorSigs { + coAuthors = append(coAuthors, &CoAuthorUser{ + GiteaUser: emailUserMap.GetByEmail(sig.Email), + TrailerSignature: sig, + }) + } newCommits = append(newCommits, &UserCommit{ - User: user, - Commit: c, + User: user, + CoAuthors: coAuthors, + Commit: c, }) } return newCommits, nil diff --git a/modules/git/commit.go b/modules/git/commit.go index b576451db8703..34e6d64b8606d 100644 --- a/modules/git/commit.go +++ b/modules/git/commit.go @@ -17,10 +17,11 @@ import ( ) type CommitMessage struct { - MessageRaw string - messageUTF8 *string - messageTitle *string - messageBody *string + MessageRaw string + messageUTF8 *string + messageTitle *string + messageBody *string + messageCoAuthors *[]*Signature } // Commit represents a git commit. @@ -68,6 +69,50 @@ func (c *CommitMessage) MessageBody() string { return *c.messageBody } +// CoAuthorSignatures parses "Co-authored-by:" and "Co-committed-by:" trailers +// from the trailing block of the commit message and returns deduplicated +// Signature values. Only the last paragraph of the body is scanned so that +// quoted or in-body occurrences (e.g. inside a revert/cherry-pick description) +// are not misinterpreted as trailers, matching `git interpret-trailers`. +func (c *CommitMessage) CoAuthorSignatures() []*Signature { + if c.messageCoAuthors != nil { + return *c.messageCoAuthors + } + var sigs []*Signature + seen := make(map[string]struct{}) + body := strings.TrimRight(c.MessageBody(), "\n") + if idx := strings.LastIndex(body, "\n\n"); idx >= 0 { + body = body[idx+2:] + } + for line := range strings.SplitSeq(body, "\n") { + var rest string + var ok bool + if rest, ok = strings.CutPrefix(line, "Co-authored-by:"); !ok { + rest, ok = strings.CutPrefix(line, "Co-committed-by:") + if !ok { + continue + } + } + rest = strings.TrimSpace(rest) + name, emailWithBracket, ok := strings.Cut(rest, " <") + if !ok { + continue + } + email, _, ok := strings.Cut(emailWithBracket, ">") + if !ok { + continue + } + email = strings.ToLower(strings.TrimSpace(email)) + if _, exists := seen[email]; exists { + continue + } + seen[email] = struct{}{} + sigs = append(sigs, &Signature{Name: strings.TrimSpace(name), Email: email}) + } + c.messageCoAuthors = &sigs + return sigs +} + // ParentID returns oid of n-th parent (0-based index). // It returns nil if no such parent exists. func (c *Commit) ParentID(n int) (ObjectID, error) { diff --git a/options/locale/locale_en-US.json b/options/locale/locale_en-US.json index c7ec133e5732c..18acdb059c18e 100644 --- a/options/locale/locale_en-US.json +++ b/options/locale/locale_en-US.json @@ -2589,6 +2589,10 @@ "repo.diff.review.reject": "Request changes", "repo.diff.review.self_approve": "Pull request authors can't approve their own pull request", "repo.diff.committed_by": "committed by", + "repo.diff.coauthored_by": "co-authored by", + "repo.commits.coauthor_and": "and", + "repo.commits.coauthor_others_1": "%d other", + "repo.commits.coauthor_others_n": "%d others", "repo.diff.protected": "Protected", "repo.diff.image.side_by_side": "Side by Side", "repo.diff.image.swipe": "Swipe", diff --git a/routers/web/repo/commit.go b/routers/web/repo/commit.go index 6c973696ffef6..b54a1dbf9b943 100644 --- a/routers/web/repo/commit.go +++ b/routers/web/repo/commit.go @@ -382,6 +382,11 @@ func Diff(ctx *context.Context) { verification := asymkey_service.ParseCommitWithSignature(ctx, commit) ctx.Data["Verification"] = verification ctx.Data["Author"] = user_model.ValidateCommitWithEmail(ctx, commit) + if coAuthors, err := user_model.CoAuthorsFromCommit(ctx, commit); err != nil { + log.Error("CoAuthorsFromCommit: %v", err) + } else { + ctx.Data["CoAuthors"] = coAuthors + } ctx.Data["Parents"] = parents ctx.Data["DiffNotAvailable"] = diffShortStat.NumFiles == 0 diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go index 2d95d5233e36c..d0cf7d6f6fbfa 100644 --- a/routers/web/repo/view.go +++ b/routers/web/repo/view.go @@ -135,6 +135,12 @@ func loadLatestCommitData(ctx *context.Context, latestCommit *git.Commit) bool { ctx.Data["LatestCommitVerification"] = verification ctx.Data["LatestCommitUser"] = user_model.ValidateCommitWithEmail(ctx, latestCommit) + if coAuthors, err := user_model.CoAuthorsFromCommit(ctx, latestCommit); err != nil { + log.Error("CoAuthorsFromCommit: %v", err) + } else { + ctx.Data["LatestCommitCoAuthors"] = coAuthors + } + statuses, err := git_model.GetLatestCommitStatus(ctx, ctx.Repo.Repository.ID, latestCommit.ID.String(), db.ListOptionsAll) if err != nil { log.Error("GetLatestCommitStatus: %v", err) diff --git a/templates/repo/commit_coauthor_avatar_stack.tmpl b/templates/repo/commit_coauthor_avatar_stack.tmpl new file mode 100644 index 0000000000000..772e054aaac38 --- /dev/null +++ b/templates/repo/commit_coauthor_avatar_stack.tmpl @@ -0,0 +1,49 @@ +{{if or .CoAuthors .CoAuthorSignatures}} + {{- $additionalClasses := .AdditionalClasses -}} + + {{- if .AuthorUser -}} + {{- ctx.AvatarUtils.Avatar .AuthorUser 20 -}} + {{- else -}} + {{- ctx.AvatarUtils.AvatarByEmail .AuthorSignature.Email .AuthorSignature.Name 20 -}} + {{- end -}} + {{- if .CoAuthors -}} + {{- $coCount := len .CoAuthors -}} + {{- $maxCo := 9 -}} + {{- $visibleCo := .CoAuthors -}} + {{- $overflow := 0 -}} + {{- if gt $coCount $maxCo -}} + {{- $visibleCo = slice .CoAuthors 0 $maxCo -}} + {{- $overflow = Eval $coCount "-" $maxCo -}} + {{- end -}} + {{- range $visibleCo -}} + {{- if .GiteaUser -}} + {{- ctx.AvatarUtils.Avatar .GiteaUser 20 -}} + {{- else -}} + {{- ctx.AvatarUtils.AvatarByEmail .TrailerSignature.Email .TrailerSignature.Name 20 -}} + {{- end -}} + {{- end -}} + {{- if gt $overflow 0 -}} + +{{$overflow}} + {{- end -}} + {{- else -}} + {{- $coCount := len .CoAuthorSignatures -}} + {{- $maxCo := 9 -}} + {{- $visibleCo := .CoAuthorSignatures -}} + {{- $overflow := 0 -}} + {{- if gt $coCount $maxCo -}} + {{- $visibleCo = slice .CoAuthorSignatures 0 $maxCo -}} + {{- $overflow = Eval $coCount "-" $maxCo -}} + {{- end -}} + {{- range $visibleCo -}} + {{- ctx.AvatarUtils.AvatarByEmail .Email .Name 20 -}} + {{- end -}} + {{- if gt $overflow 0 -}} + +{{$overflow}} + {{- end -}} + {{- end -}} + +{{else if .AuthorUser}} + {{- ctx.AvatarUtils.Avatar .AuthorUser 20 .AdditionalClasses -}} +{{else}} + {{- ctx.AvatarUtils.AvatarByEmail .AuthorSignature.Email .AuthorSignature.Name 20 .AdditionalClasses -}} +{{end}} diff --git a/templates/repo/commit_coauthor_avatars.tmpl b/templates/repo/commit_coauthor_avatars.tmpl new file mode 100644 index 0000000000000..04c04d5186f06 --- /dev/null +++ b/templates/repo/commit_coauthor_avatars.tmpl @@ -0,0 +1,43 @@ +{{/* + Renders the author/co-author avatar stack and name text for a commit. + Args (via dict): + AuthorUser - *user_model.User (may be nil if no Gitea account) + AuthorSignature - *git.Signature (always set: name + email from git) + CoAuthors - []*user_model.CoAuthorUser + fields: GiteaUser (*User, may be nil), TrailerSignature (*git.Signature) + + Avatar stack is capped at 10 children (author + up to 9 co-authors); any + remainder is collapsed into a trailing "+N" chip. The .coauthor-avatar-stack + CSS rules expect at most 10 children to fan out cleanly on hover. +*/}} + +{{- if .CoAuthors -}} + {{- $coCount := len .CoAuthors -}} + {{template "repo/commit_coauthor_avatar_stack" dict "AuthorUser" .AuthorUser "AuthorSignature" .AuthorSignature "CoAuthors" .CoAuthors}} + {{- if .AuthorUser -}} + {{- .AuthorUser.GetShortDisplayNameLinkHTML -}} + {{- else -}} + {{.AuthorSignature.Name}} + {{- end -}} + {{" "}}{{ctx.Locale.Tr "repo.commits.coauthor_and"}}{{" "}} + {{- if eq $coCount 1 -}} + {{- with index .CoAuthors 0 -}} + {{- if .GiteaUser -}} + {{.GiteaUser.GetDisplayName}} + {{- else -}} + {{.TrailerSignature.Name}} + {{- end -}} + {{- end -}} + {{- else -}} + {{- ctx.Locale.TrN $coCount "repo.commits.coauthor_others_1" "repo.commits.coauthor_others_n" $coCount -}} + {{- end -}} +{{- else -}} + {{- if .AuthorUser -}} + {{- template "repo/commit_coauthor_avatar_stack" dict "AuthorUser" .AuthorUser "AuthorSignature" .AuthorSignature "AdditionalClasses" "tw-mr-1" -}} + {{- .AuthorUser.GetShortDisplayNameLinkHTML -}} + {{- else -}} + {{- template "repo/commit_coauthor_avatar_stack" dict "AuthorSignature" .AuthorSignature "AdditionalClasses" "tw-mr-1" -}} + {{.AuthorSignature.Name}} + {{- end -}} +{{- end -}} + diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl index 975cd303ec4fc..cda0d297237e9 100644 --- a/templates/repo/commit_page.tmpl +++ b/templates/repo/commit_page.tmpl @@ -155,6 +155,21 @@ {{end}} + {{if .CoAuthors}} +
+ {{ctx.Locale.Tr "repo.diff.coauthored_by"}} + {{range .CoAuthors}} + {{if .GiteaUser}} + {{ctx.AvatarUtils.Avatar .GiteaUser 20}} + {{.GiteaUser.GetDisplayName}} + {{else}} + {{ctx.AvatarUtils.AvatarByEmail .TrailerSignature.Email .TrailerSignature.Name 20}} + {{.TrailerSignature.Name}} + {{end}} + {{end}} +
+ {{end}} + {{if .Verification}} {{template "repo/commit_sign_badge" dict "CommitSignVerification" .Verification}} {{end}} diff --git a/templates/repo/commits_list.tmpl b/templates/repo/commits_list.tmpl index e79d189b8d3fb..e80b6cdc24ec5 100644 --- a/templates/repo/commits_list.tmpl +++ b/templates/repo/commits_list.tmpl @@ -2,9 +2,9 @@ - + - + @@ -14,15 +14,7 @@ {{range $commit := .Commits}} ` } + +// CoAuthorAvatarStack renders an avatar stack for the commit author and co-authors. +// authorUser may be nil when no Gitea account is linked; authorSig must always be set. +func (ut *RenderUtils) CoAuthorAvatarStack(authorUser *user_model.User, authorSig *git.Signature, coAuthors []*user_model.CoAuthorUser, additionalClasses string) template.HTML { + au := NewAvatarUtils(ut.ctx) + if len(coAuthors) == 0 { + if authorUser != nil { + return au.Avatar(authorUser, 20, additionalClasses) + } + return au.AvatarByEmail(authorSig.Email, authorSig.Name, 20, additionalClasses) + } + + const maxCo = 9 + visibleCo := coAuthors + overflow := 0 + if len(coAuthors) > maxCo { + visibleCo = coAuthors[:maxCo] + overflow = len(coAuthors) - maxCo + } + + wrapperClass := "coauthor-avatar-stack-wrapper" + if additionalClasses != "" { + wrapperClass += " " + additionalClasses + } + + var b strings.Builder + b.WriteString(``) + b.WriteString(``) + + if authorUser != nil { + b.WriteString(string(htmlutil.HTMLFormat(`%s`, + template.URL(authorUser.HomeLink()), authorUser.GetDisplayName(), au.Avatar(authorUser, 20)))) + } else { + b.WriteString(string(au.AvatarByEmail(authorSig.Email, authorSig.Name, 20))) + } + + for _, co := range visibleCo { + if co.GiteaUser != nil { + b.WriteString(string(htmlutil.HTMLFormat(`%s`, + template.URL(co.GiteaUser.HomeLink()), co.GiteaUser.GetDisplayName(), au.Avatar(co.GiteaUser, 20)))) + } else { + b.WriteString(string(au.AvatarByEmail(co.TrailerSignature.Email, co.TrailerSignature.Name, 20))) + } + } + + b.WriteString(``) // end coauthor-avatar-stack + + if overflow > 0 { + locale := ut.ctx.Value(translation.ContextKey).(translation.Locale) + overflowLabel := locale.TrN(overflow, "repo.commits.coauthor_others_1", "repo.commits.coauthor_others_n", overflow) + b.WriteString(string(htmlutil.HTMLFormat(`+%d`, + overflowLabel, overflowLabel, overflow))) + } + + b.WriteString(``) // end coauthor-avatar-stack-wrapper + return template.HTML(b.String()) +} + +// CoAuthorAvatars renders the author/co-author avatar stack with descriptive name text. +func (ut *RenderUtils) CoAuthorAvatars(authorUser *user_model.User, authorSig *git.Signature, coAuthors []*user_model.CoAuthorUser) template.HTML { + locale := ut.ctx.Value(translation.ContextKey).(translation.Locale) + var b strings.Builder + b.WriteString(``) + + if len(coAuthors) > 0 { + b.WriteString(string(ut.CoAuthorAvatarStack(authorUser, authorSig, coAuthors, ""))) + if authorUser != nil { + b.WriteString(string(authorUser.GetShortDisplayNameLinkHTML())) + } else { + b.WriteString(html.EscapeString(authorSig.Name)) + } + b.WriteString(" " + string(locale.Tr("repo.commits.coauthor_and")) + " ") + if len(coAuthors) == 1 { + co := coAuthors[0] + if co.GiteaUser != nil { + b.WriteString(string(htmlutil.HTMLFormat(`%s`, + template.URL(co.GiteaUser.HomeLink()), co.GiteaUser.GetDisplayName()))) + } else { + b.WriteString(html.EscapeString(co.TrailerSignature.Name)) + } + } else { + b.WriteString(string(locale.Tr("repo.commits.coauthor_people", len(coAuthors)+1))) + } + } else { + b.WriteString(string(ut.CoAuthorAvatarStack(authorUser, authorSig, nil, "tw-mr-1"))) + if authorUser != nil { + b.WriteString(string(authorUser.GetShortDisplayNameLinkHTML())) + } else { + b.WriteString(html.EscapeString(authorSig.Name)) + } + } + + b.WriteString(``) + return template.HTML(b.String()) +} diff --git a/templates/repo/blame.tmpl b/templates/repo/blame.tmpl index e6ae31891d6ce..eb2ab68ddf5a2 100644 --- a/templates/repo/blame.tmpl +++ b/templates/repo/blame.tmpl @@ -43,7 +43,7 @@
- {{template "repo/commit_coauthor_avatar_stack" dict "AuthorUser" $row.AuthorUser "AuthorSignature" $row.Author "CoAuthors" $row.CoAuthors}} + {{ctx.RenderUtils.CoAuthorAvatarStack $row.AuthorUser $row.Author $row.CoAuthors ""}}
{{ctx.RenderUtils.RenderCommitMessageLinkSubject $row.CommitMessage $row.CommitURL $.Repository}} diff --git a/templates/repo/commit_coauthor_avatar_stack.tmpl b/templates/repo/commit_coauthor_avatar_stack.tmpl deleted file mode 100644 index f9bd9e031cfb4..0000000000000 --- a/templates/repo/commit_coauthor_avatar_stack.tmpl +++ /dev/null @@ -1,35 +0,0 @@ -{{if .CoAuthors}} - {{- $additionalClasses := .AdditionalClasses -}} - {{- $coCount := len .CoAuthors -}} - {{- $maxCo := 9 -}} - {{- $visibleCo := .CoAuthors -}} - {{- $overflow := 0 -}} - {{- if gt $coCount $maxCo -}} - {{- $visibleCo = slice .CoAuthors 0 $maxCo -}} - {{- $overflow = Eval $coCount "-" $maxCo -}} - {{- end -}} - - - {{- if .AuthorUser -}} - {{- ctx.AvatarUtils.Avatar .AuthorUser 20 -}} - {{- else -}} - {{- ctx.AvatarUtils.AvatarByEmail .AuthorSignature.Email .AuthorSignature.Name 20 -}} - {{- end -}} - {{- range $visibleCo -}} - {{- if .GiteaUser -}} - {{- ctx.AvatarUtils.Avatar .GiteaUser 20 -}} - {{- else -}} - {{- ctx.AvatarUtils.AvatarByEmail .TrailerSignature.Email .TrailerSignature.Name 20 -}} - {{- end -}} - {{- end -}} - - {{- if gt $overflow 0 -}} - {{- $overflowLabel := ctx.Locale.TrN $overflow "repo.commits.coauthor_others_1" "repo.commits.coauthor_others_n" $overflow -}} - +{{$overflow}} - {{- end -}} - -{{else if .AuthorUser}} - {{- ctx.AvatarUtils.Avatar .AuthorUser 20 .AdditionalClasses -}} -{{else}} - {{- ctx.AvatarUtils.AvatarByEmail .AuthorSignature.Email .AuthorSignature.Name 20 .AdditionalClasses -}} -{{end}} diff --git a/templates/repo/commit_coauthor_avatars.tmpl b/templates/repo/commit_coauthor_avatars.tmpl deleted file mode 100644 index a6b73de79443c..0000000000000 --- a/templates/repo/commit_coauthor_avatars.tmpl +++ /dev/null @@ -1,44 +0,0 @@ -{{/* - Renders the author/co-author avatar stack and name text for a commit. - Args (via dict): - AuthorUser - *user_model.User (may be nil if no Gitea account) - AuthorSignature - *git.Signature (always set: name + email from git) - CoAuthors - []*user_model.CoAuthorUser - fields: GiteaUser (*User, may be nil), TrailerSignature (*git.Signature) - - Avatar stack is capped at 10 children (author + up to 9 co-authors); any - remainder is collapsed into a trailing "+N" chip. The .coauthor-avatar-stack - CSS rules expect at most 10 children to fan out cleanly on hover. -*/}} - -{{- if .CoAuthors -}} - {{- $coCount := len .CoAuthors -}} - {{template "repo/commit_coauthor_avatar_stack" dict "AuthorUser" .AuthorUser "AuthorSignature" .AuthorSignature "CoAuthors" .CoAuthors}} - {{- if .AuthorUser -}} - {{- .AuthorUser.GetShortDisplayNameLinkHTML -}} - {{- else -}} - {{.AuthorSignature.Name}} - {{- end -}} - {{" "}}{{ctx.Locale.Tr "repo.commits.coauthor_and"}}{{" "}} - {{- if eq $coCount 1 -}} - {{- with index .CoAuthors 0 -}} - {{- if .GiteaUser -}} - {{.GiteaUser.GetDisplayName}} - {{- else -}} - {{.TrailerSignature.Name}} - {{- end -}} - {{- end -}} - {{- else -}} - {{- $peopleCount := Eval $coCount "+" 1 -}} - {{- ctx.Locale.Tr "repo.commits.coauthor_people" $peopleCount -}} - {{- end -}} -{{- else -}} - {{- if .AuthorUser -}} - {{- template "repo/commit_coauthor_avatar_stack" dict "AuthorUser" .AuthorUser "AuthorSignature" .AuthorSignature "AdditionalClasses" "tw-mr-1" -}} - {{- .AuthorUser.GetShortDisplayNameLinkHTML -}} - {{- else -}} - {{- template "repo/commit_coauthor_avatar_stack" dict "AuthorSignature" .AuthorSignature "AdditionalClasses" "tw-mr-1" -}} - {{.AuthorSignature.Name}} - {{- end -}} -{{- end -}} - diff --git a/templates/repo/commits_list.tmpl b/templates/repo/commits_list.tmpl index e80b6cdc24ec5..18680c18a9443 100644 --- a/templates/repo/commits_list.tmpl +++ b/templates/repo/commits_list.tmpl @@ -14,7 +14,7 @@ {{range $commit := .Commits}}
` } +// commitAuthorSearchURL returns the repo's commits-by-author search URL for the current +// ref, or an empty URL when no repo/ref context is available (e.g. dashboard feed). +func (ut *RenderUtils) commitAuthorSearchURL(authorName string) template.URL { + if authorName == "" { + return "" + } + data := ut.ctx.GetData() + repoLink, _ := data["RepoLink"].(string) + refSubURL, _ := data["RefTypeNameSubURL"].(string) + if repoLink == "" || refSubURL == "" { + return "" + } + return template.URL(repoLink + "/commits/" + refSubURL + "/search?q=" + url.QueryEscape("author:"+authorName)) +} + // CoAuthorAvatarStack renders an avatar stack for the commit author and co-authors. // authorUser may be nil when no Gitea account is linked; authorSig must always be set. +// Each stack child carries an inline `--n` custom property so the CSS can apply +// z-index and the :hover translate without hardcoding nth-child rules. func (ut *RenderUtils) CoAuthorAvatarStack(authorUser *user_model.User, authorSig *git.Signature, coAuthors []*user_model.CoAuthorUser, additionalClasses string) template.HTML { au := NewAvatarUtils(ut.ctx) if len(coAuthors) == 0 { @@ -347,78 +363,129 @@ func (ut *RenderUtils) CoAuthorAvatarStack(authorUser *user_model.User, authorSi overflow = len(coAuthors) - maxCo } - wrapperClass := "coauthor-avatar-stack-wrapper" + wrapperClass := "avatar-stack-wrapper" if additionalClasses != "" { wrapperClass += " " + additionalClasses } var b strings.Builder - b.WriteString(``) - b.WriteString(``) + b.WriteString(string(htmlutil.HTMLFormat(``, wrapperClass))) + + appendLinked := func(idx int, u *user_model.User) { + href := ut.commitAuthorSearchURL(u.Name) + if href == "" { + href = template.URL(u.HomeLink()) + } + b.WriteString(string(htmlutil.HTMLFormat(`%s`, + href, idx, au.Avatar(u, 20)))) + } + appendUnlinked := func(idx int, sig *git.Signature) { + if href := ut.commitAuthorSearchURL(sig.Name); href != "" { + b.WriteString(string(htmlutil.HTMLFormat(`%s`, + href, idx, au.AvatarByEmail(sig.Email, sig.Name, 20)))) + return + } + b.WriteString(string(htmlutil.HTMLFormat(`%s`, + idx, au.AvatarByEmail(sig.Email, sig.Name, 20)))) + } if authorUser != nil { - b.WriteString(string(htmlutil.HTMLFormat(`%s`, - template.URL(authorUser.HomeLink()), authorUser.GetDisplayName(), au.Avatar(authorUser, 20)))) + appendLinked(0, authorUser) } else { - b.WriteString(string(au.AvatarByEmail(authorSig.Email, authorSig.Name, 20))) + appendUnlinked(0, authorSig) } - - for _, co := range visibleCo { + for i, co := range visibleCo { if co.GiteaUser != nil { - b.WriteString(string(htmlutil.HTMLFormat(`%s`, - template.URL(co.GiteaUser.HomeLink()), co.GiteaUser.GetDisplayName(), au.Avatar(co.GiteaUser, 20)))) + appendLinked(i+1, co.GiteaUser) } else { - b.WriteString(string(au.AvatarByEmail(co.TrailerSignature.Email, co.TrailerSignature.Name, 20))) + appendUnlinked(i+1, co.TrailerSignature) } } - b.WriteString(``) // end coauthor-avatar-stack - if overflow > 0 { - locale := ut.ctx.Value(translation.ContextKey).(translation.Locale) - overflowLabel := locale.TrN(overflow, "repo.commits.coauthor_others_1", "repo.commits.coauthor_others_n", overflow) - b.WriteString(string(htmlutil.HTMLFormat(`+%d`, - overflowLabel, overflowLabel, overflow))) + b.WriteString(string(htmlutil.HTMLFormat( + `+%d`, + len(visibleCo)+1, overflow, overflow))) } - b.WriteString(``) // end coauthor-avatar-stack-wrapper + b.WriteString(``) return template.HTML(b.String()) } // CoAuthorAvatars renders the author/co-author avatar stack with descriptive name text. +// Label rules follow GitHub: 2 total = ` and `; 3+ total opens +// a popup listing all participants on click. func (ut *RenderUtils) CoAuthorAvatars(authorUser *user_model.User, authorSig *git.Signature, coAuthors []*user_model.CoAuthorUser) template.HTML { locale := ut.ctx.Value(translation.ContextKey).(translation.Locale) + stackClass := "" + if len(coAuthors) == 0 { + stackClass = "tw-mr-1" + } + var b strings.Builder b.WriteString(``) + b.WriteString(string(ut.CoAuthorAvatarStack(authorUser, authorSig, coAuthors, stackClass))) + + switch len(coAuthors) { + case 0: + b.WriteString(string(ut.authorNameLinkHTML(authorUser, authorSig))) + case 1: + b.WriteString(string(ut.authorNameLinkHTML(authorUser, authorSig))) + b.WriteString(string(htmlutil.HTMLFormat(`%s`, locale.Tr("repo.commits.coauthor_and")))) + b.WriteString(string(ut.authorNameLinkHTML(coAuthors[0].GiteaUser, coAuthors[0].TrailerSignature))) + default: + total := len(coAuthors) + 1 + b.WriteString(string(htmlutil.HTMLFormat( + `%s`, + locale.Tr("repo.commits.coauthor_people", total)))) + b.WriteString(`
`) + b.WriteString(string(ut.participantRowHTML(authorUser, authorSig))) + for _, co := range coAuthors { + b.WriteString(string(ut.participantRowHTML(co.GiteaUser, co.TrailerSignature))) + } + b.WriteString(`
`) + } - if len(coAuthors) > 0 { - b.WriteString(string(ut.CoAuthorAvatarStack(authorUser, authorSig, coAuthors, ""))) - if authorUser != nil { - b.WriteString(string(authorUser.GetShortDisplayNameLinkHTML())) - } else { - b.WriteString(html.EscapeString(authorSig.Name)) + b.WriteString(``) + return template.HTML(b.String()) +} + +// authorNameLinkHTML renders a muted link for an author. In a repo context the +// link targets the repo's commit search filtered by author; otherwise it falls +// back to the user's profile (or a mailto link when no Gitea account matches). +func (ut *RenderUtils) authorNameLinkHTML(u *user_model.User, sig *git.Signature) template.HTML { + if u != nil { + if href := ut.commitAuthorSearchURL(u.Name); href != "" { + return htmlutil.HTMLFormat(`%s`, href, u.GetDisplayName()) } - b.WriteString(" " + string(locale.Tr("repo.commits.coauthor_and")) + " ") - if len(coAuthors) == 1 { - co := coAuthors[0] - if co.GiteaUser != nil { - b.WriteString(string(htmlutil.HTMLFormat(`%s`, - template.URL(co.GiteaUser.HomeLink()), co.GiteaUser.GetDisplayName()))) - } else { - b.WriteString(html.EscapeString(co.TrailerSignature.Name)) - } - } else { - b.WriteString(string(locale.Tr("repo.commits.coauthor_people", len(coAuthors)+1))) + return u.GetShortDisplayNameLinkHTML() + } + if href := ut.commitAuthorSearchURL(sig.Name); href != "" { + return htmlutil.HTMLFormat(`%s`, href, sig.Name) + } + return htmlutil.HTMLFormat(`%s`, sig.Email, sig.Name) +} + +// participantRowHTML renders one row of the authors popup: avatar + linked name. +func (ut *RenderUtils) participantRowHTML(u *user_model.User, sig *git.Signature) template.HTML { + au := NewAvatarUtils(ut.ctx) + var href template.URL + var avatar template.HTML + var name string + if u != nil { + href = ut.commitAuthorSearchURL(u.Name) + if href == "" { + href = template.URL(u.HomeLink()) } + avatar = au.Avatar(u, 20) + name = u.GetDisplayName() } else { - b.WriteString(string(ut.CoAuthorAvatarStack(authorUser, authorSig, nil, "tw-mr-1"))) - if authorUser != nil { - b.WriteString(string(authorUser.GetShortDisplayNameLinkHTML())) - } else { - b.WriteString(html.EscapeString(authorSig.Name)) + href = ut.commitAuthorSearchURL(sig.Name) + if href == "" { + href = template.URL("mailto:" + sig.Email) } + avatar = au.AvatarByEmail(sig.Email, sig.Name, 20) + name = sig.Name } - - b.WriteString(``) - return template.HTML(b.String()) + return htmlutil.HTMLFormat(`%s%s`, href, avatar, name) } diff --git a/modules/templates/util_render_test.go b/modules/templates/util_render_test.go index 5c37f084df63d..2ec7c0f6a74b1 100644 --- a/modules/templates/util_render_test.go +++ b/modules/templates/util_render_test.go @@ -13,15 +13,25 @@ import ( "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/markup" "code.gitea.io/gitea/modules/reqctx" "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/setting/config" "code.gitea.io/gitea/modules/test" "code.gitea.io/gitea/modules/translation" "github.com/stretchr/testify/assert" ) +type stubDynGetter struct{} + +func (stubDynGetter) GetValue(ctx context.Context, key string) (string, bool) { + return "", false +} +func (stubDynGetter) GetRevision(ctx context.Context) int { return 0 } +func (stubDynGetter) InvalidateCache() {} + func testInput() string { s := ` space @mention-user /just/a/path.bin @@ -54,6 +64,9 @@ func TestMain(m *testing.M) { return username == "mention-user" }, }) + if config.GetDynGetter() == nil { + config.SetDynGetter(stubDynGetter{}) + } os.Exit(m.Run()) } @@ -223,3 +236,67 @@ func TestUserMention(t *testing.T) { rendered := newTestRenderUtils(t).MarkdownToHtml("@no-such-user @mention-user @mention-user") assert.Equal(t, `

@no-such-user @mention-user @mention-user

`, strings.TrimSpace(string(rendered))) } + +func TestCoAuthorAvatars(t *testing.T) { + ut := newTestRenderUtils(t) + authorSig := &git.Signature{Name: "Alice", Email: "alice@example.com"} + mkCo := func(name, email string) *user_model.CoAuthorUser { + return &user_model.CoAuthorUser{TrailerSignature: &git.Signature{Name: name, Email: email}} + } + + t.Run("zero co-authors renders bare author, no label", func(t *testing.T) { + got := string(ut.CoAuthorAvatars(nil, authorSig, nil)) + assert.Contains(t, got, ``) + assert.Contains(t, got, "Alice") + assert.NotContains(t, got, "coauthor_and") + assert.NotContains(t, got, "coauthor_people") + assert.NotContains(t, got, "avatar-stack") + }) + + t.Run("single co-author uses and label", func(t *testing.T) { + got := string(ut.CoAuthorAvatars(nil, authorSig, []*user_model.CoAuthorUser{mkCo("Bob", "bob@example.com")})) + assert.Contains(t, got, "repo.commits.coauthor_and") + assert.Contains(t, got, "Bob") + assert.NotContains(t, got, "coauthor_people") + assert.Contains(t, got, ``) + }) + + t.Run("two co-authors switches to N people label with tippy popup", func(t *testing.T) { + got := string(ut.CoAuthorAvatars(nil, authorSig, + []*user_model.CoAuthorUser{mkCo("Bob", "bob@example.com"), mkCo("Carol", "carol@example.com")})) + assert.Contains(t, got, "repo.commits.coauthor_people:3") + assert.NotContains(t, got, "repo.commits.coauthor_and") + assert.Contains(t, got, `data-global-init="initAuthorsPopup"`) + assert.Contains(t, got, `
`) + assert.Contains(t, got, `class="authors-popup"`) + }) + + t.Run("overflow chip renders for >9 co-authors", func(t *testing.T) { + cos := make([]*user_model.CoAuthorUser, 11) + for i := range cos { + cos[i] = mkCo("X", "x@example.com") + } + got := string(ut.CoAuthorAvatars(nil, authorSig, cos)) + assert.Contains(t, got, `class="avatar-stack-overflow-chip`) + assert.Contains(t, got, "+2") + assert.Contains(t, got, "repo.commits.coauthor_people:12") + assert.Contains(t, got, `data-global-init="initAuthorsPopup"`) + }) + + t.Run("chip alone renders for 10 co-authors", func(t *testing.T) { + cos := make([]*user_model.CoAuthorUser, 10) + for i := range cos { + cos[i] = mkCo("X", "x@example.com") + } + got := string(ut.CoAuthorAvatarStack(nil, authorSig, cos, "")) + assert.Contains(t, got, `class="avatar-stack-overflow-chip`) + assert.Contains(t, got, "+1") + }) + + t.Run("each stack child carries inline --n", func(t *testing.T) { + got := string(ut.CoAuthorAvatarStack(nil, authorSig, + []*user_model.CoAuthorUser{mkCo("Bob", "bob@example.com")}, "")) + assert.Contains(t, got, `style="--n:0"`) + assert.Contains(t, got, `style="--n:1"`) + }) +} diff --git a/routers/web/devtest/devtest.go b/routers/web/devtest/devtest.go index af548430169de..b412c6fdf2d29 100644 --- a/routers/web/devtest/devtest.go +++ b/routers/web/devtest/devtest.go @@ -159,6 +159,57 @@ func prepareMockDataBadgeActionsSvg(ctx *context.Context) { ctx.Data["SelectedStyle"] = selectedStyle } +func prepareMockDataCoAuthorAvatars(ctx *context.Context) { + mockUsers, _ := db.Find[user_model.User](ctx, user_model.SearchUserOptions{ListOptions: db.ListOptions{PageSize: 3}}) + if len(mockUsers) == 0 { + return + } + u0 := mockUsers[0] + u1, u2 := u0, u0 + if len(mockUsers) >= 2 { + u1 = mockUsers[1] + } + if len(mockUsers) >= 3 { + u2 = mockUsers[2] + } + + authorSig := func(u *user_model.User) *git.Signature { + return &git.Signature{Name: u.Name, Email: u.Email} + } + coLinked := func(u *user_model.User) *user_model.CoAuthorUser { + return &user_model.CoAuthorUser{GiteaUser: u, TrailerSignature: authorSig(u)} + } + coUnlinked := func(name, email string) *user_model.CoAuthorUser { + return &user_model.CoAuthorUser{TrailerSignature: &git.Signature{Name: name, Email: email}} + } + nUnlinked := func(n int) []*user_model.CoAuthorUser { + out := make([]*user_model.CoAuthorUser, n) + for i := range out { + out[i] = coUnlinked(fmt.Sprintf("Contributor %d", i+1), fmt.Sprintf("contrib%d@example.com", i+1)) + } + return out + } + + type scenario struct { + Label string + AuthorUser *user_model.User + AuthorSig *git.Signature + CoAuthors []*user_model.CoAuthorUser + } + ctx.Data["CoAuthorScenarios"] = []scenario{ + {Label: "linked author, no co-authors", AuthorUser: u0, AuthorSig: authorSig(u0)}, + {Label: "unlinked author, no co-authors", AuthorSig: &git.Signature{Name: "External Contributor", Email: "external@example.com"}}, + {Label: "1 linked co-author", AuthorUser: u0, AuthorSig: authorSig(u0), CoAuthors: []*user_model.CoAuthorUser{coLinked(u1)}}, + {Label: "1 unlinked co-author", AuthorUser: u0, AuthorSig: authorSig(u0), CoAuthors: []*user_model.CoAuthorUser{coUnlinked("Bob Smith", "bob@example.com")}}, + {Label: "2 co-authors (3 people)", AuthorUser: u0, AuthorSig: authorSig(u0), CoAuthors: []*user_model.CoAuthorUser{coLinked(u1), coUnlinked("Bob Smith", "bob@example.com")}}, + {Label: "3 co-authors mixed (4 people)", AuthorUser: u0, AuthorSig: authorSig(u0), CoAuthors: []*user_model.CoAuthorUser{coLinked(u1), coLinked(u2), coUnlinked("Bob Smith", "bob@example.com")}}, + {Label: "9 co-authors (max visible, no overflow)", AuthorUser: u0, AuthorSig: authorSig(u0), CoAuthors: nUnlinked(9)}, + {Label: "10 co-authors (overflow +1)", AuthorUser: u0, AuthorSig: authorSig(u0), CoAuthors: nUnlinked(10)}, + {Label: "15 co-authors (overflow +6)", AuthorUser: u0, AuthorSig: authorSig(u0), CoAuthors: nUnlinked(15)}, + {Label: "30 co-authors (overflow +21)", AuthorUser: u0, AuthorSig: authorSig(u0), CoAuthors: nUnlinked(30)}, + } +} + func prepareMockDataRelativeTime(ctx *context.Context) { now := time.Now() ctx.Data["TimeNow"] = now @@ -196,6 +247,8 @@ func prepareMockData(ctx *context.Context) { prepareMockDataToastAndMessage(ctx) case "/devtest/unicode-escape": prepareMockDataUnicodeEscape(ctx) + case "/devtest/coauthor-avatars": + prepareMockDataCoAuthorAvatars(ctx) } } diff --git a/routers/web/repo/blame.go b/routers/web/repo/blame.go index 62697d708c480..d85fe67d7f1b3 100644 --- a/routers/web/repo/blame.go +++ b/routers/web/repo/blame.go @@ -223,7 +223,7 @@ func processBlameParts(ctx *context.Context, blameParts []*gitrepo.BlamePart) ma return commitNames } -func renderBlameFillFirstBlameRow(repoLink string, part *gitrepo.BlamePart, commit *user_model.UserCommit, br *blameRow) { +func fillFirstBlameRow(repoLink string, part *gitrepo.BlamePart, commit *user_model.UserCommit, br *blameRow) { br.AuthorUser = commit.User br.CoAuthors = commit.CoAuthors br.Author = commit.Author @@ -256,7 +256,7 @@ func renderBlame(ctx *context.Context, blameParts []*gitrepo.BlamePart, commitNa } if partLineIdx == 0 { - renderBlameFillFirstBlameRow(ctx.Repo.RepoLink, part, commitNames[part.Sha], br) + fillFirstBlameRow(ctx.Repo.RepoLink, part, commitNames[part.Sha], br) } } } diff --git a/services/repository/gitgraph/graph_models.go b/services/repository/gitgraph/graph_models.go index fb33d3c0a0451..7168e4403478d 100644 --- a/services/repository/gitgraph/graph_models.go +++ b/services/repository/gitgraph/graph_models.go @@ -131,20 +131,7 @@ func (graph *Graph) LoadAndProcessCommits(ctx context.Context, repository *repo_ if c.Commit.Author != nil && emailUserMap != nil { c.User = emailUserMap.GetByEmail(c.Commit.Author.Email) } - coAuthorSigs := c.Commit.CoAuthorSignatures() - if len(coAuthorSigs) > 0 { - c.CoAuthors = make([]*user_model.CoAuthorUser, 0, len(coAuthorSigs)) - for _, sig := range coAuthorSigs { - var giteaUser *user_model.User - if emailUserMap != nil { - giteaUser = emailUserMap.GetByEmail(sig.Email) - } - c.CoAuthors = append(c.CoAuthors, &user_model.CoAuthorUser{ - GiteaUser: giteaUser, - TrailerSignature: sig, - }) - } - } + c.CoAuthors = user_model.CoAuthorUsersFromSigs(c.Commit.CoAuthorSignatures(), emailUserMap) c.Verification = asymkey_service.ParseCommitWithSignature(ctx, c.Commit) diff --git a/templates/devtest/coauthor-avatars.tmpl b/templates/devtest/coauthor-avatars.tmpl new file mode 100644 index 0000000000000..9cc81866d7f70 --- /dev/null +++ b/templates/devtest/coauthor-avatars.tmpl @@ -0,0 +1,18 @@ +{{template "devtest/devtest-header"}} +
+
+

Co-Author Avatars

+
{{ctx.Locale.Tr "repo.commits.author"}}{{ctx.Locale.Tr "repo.commits.author"}} {{StringUtils.ToUpper $.Repository.ObjectFormatName}}{{ctx.Locale.Tr "repo.commits.message"}}{{ctx.Locale.Tr "repo.commits.message"}} {{ctx.Locale.Tr "repo.commits.date"}}
- - {{- if .User -}} - {{- ctx.AvatarUtils.Avatar .User 20 "tw-mr-2" -}} - {{- .User.GetShortDisplayNameLinkHTML -}} - {{- else -}} - {{- ctx.AvatarUtils.AvatarByEmail .Author.Email .Author.Name 20 "tw-mr-2" -}} - {{- .Author.Name -}} - {{- end -}} - + {{template "repo/commit_coauthor_avatars" dict "AuthorUser" .User "AuthorSignature" .Author "CoAuthors" .CoAuthors}} {{$commitBaseLink := ""}} diff --git a/templates/repo/latest_commit.tmpl b/templates/repo/latest_commit.tmpl index c0518189b85a2..3a3b162ba51a9 100644 --- a/templates/repo/latest_commit.tmpl +++ b/templates/repo/latest_commit.tmpl @@ -2,15 +2,7 @@ {{if not .LatestCommit}} … {{else}} - - {{- if .LatestCommitUser -}} - {{- ctx.AvatarUtils.Avatar .LatestCommitUser 20 "tw-mr-2" -}} - {{.LatestCommitUser.GetShortDisplayNameLinkHTML}} - {{- else if .LatestCommit.Author -}} - {{- ctx.AvatarUtils.AvatarByEmail .LatestCommit.Author.Email .LatestCommit.Author.Name 20 "tw-mr-2" -}} - {{.LatestCommit.Author.Name}} - {{- end -}} - + {{template "repo/commit_coauthor_avatars" dict "AuthorUser" .LatestCommitUser "AuthorSignature" .LatestCommit.Author "CoAuthors" .LatestCommitCoAuthors}} {{template "repo/commit_sign_badge" dict "Commit" .LatestCommit "CommitBaseLink" (print .RepoLink "/commit") "CommitSignVerification" .LatestCommitVerification}} diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 3eb016650f16f..135eeec2810e6 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -1403,11 +1403,72 @@ tbody.commit-list { } .author-wrapper { - max-width: 180px; + max-width: 240px; align-self: center; white-space: nowrap; } +.coauthor-avatar-stack { + display: inline-flex; + align-items: center; + vertical-align: middle; + margin-right: 0.25rem; +} + +/* each direct child of the stack is either (linked user) or (no account) */ +.coauthor-avatar-stack > * { + margin-left: -12px; + transition: transform 0.15s ease; + position: relative; + z-index: 0; + display: inline-flex; + border-radius: 50%; +} + +.coauthor-avatar-stack > *:first-child { + margin-left: 0; +} + +.coauthor-avatar-stack .avatar { + border: 2px solid var(--color-body); + border-radius: 50%; +} + +.coauthor-overflow-chip { + display: inline-flex; + align-items: center; + justify-content: center; + width: 20px; + height: 20px; + font-size: 10px; + font-weight: var(--font-weight-semibold); + border: 2px solid var(--color-body); + border-radius: 50%; + background: var(--color-secondary); + color: var(--color-text); +} + +.coauthor-avatar-stack > *:nth-child(1) { z-index: 20; } +.coauthor-avatar-stack > *:nth-child(2) { z-index: 19; } +.coauthor-avatar-stack > *:nth-child(3) { z-index: 18; } +.coauthor-avatar-stack > *:nth-child(4) { z-index: 17; } +.coauthor-avatar-stack > *:nth-child(5) { z-index: 16; } +.coauthor-avatar-stack > *:nth-child(6) { z-index: 15; } +.coauthor-avatar-stack > *:nth-child(7) { z-index: 14; } +.coauthor-avatar-stack > *:nth-child(8) { z-index: 13; } +.coauthor-avatar-stack > *:nth-child(9) { z-index: 12; } +.coauthor-avatar-stack > *:nth-child(10) { z-index: 11; } + +.coauthor-avatar-stack:hover > *:nth-child(2) { transform: translateX(12px); } +.coauthor-avatar-stack:hover > *:nth-child(3) { transform: translateX(24px); } +.coauthor-avatar-stack:hover > *:nth-child(4) { transform: translateX(36px); } +.coauthor-avatar-stack:hover > *:nth-child(5) { transform: translateX(48px); } +.coauthor-avatar-stack:hover > *:nth-child(6) { transform: translateX(60px); } +.coauthor-avatar-stack:hover > *:nth-child(7) { transform: translateX(72px); } +.coauthor-avatar-stack:hover > *:nth-child(8) { transform: translateX(84px); } +.coauthor-avatar-stack:hover > *:nth-child(9) { transform: translateX(96px); } +.coauthor-avatar-stack:hover > *:nth-child(10) { transform: translateX(108px); } + .latest-commit .message-wrapper { max-width: calc(100% - 2.5rem); } From 10461b2f4e4539f3088a3c90a091457b2f117abf Mon Sep 17 00:00:00 2001 From: Nicolas Date: Thu, 7 May 2026 21:53:01 +0200 Subject: [PATCH 02/18] feat(repo): display co-author stacks beside commit SHAs Show co-author avatar stacks on commit SHA surfaces including commits list rows, graph, blame, and dashboard feeds, with repository-level data propagation and tests. Co-Authored-By: Claude Opus 4.7 --- modules/repository/commits.go | 2 + modules/repository/commits_test.go | 8 +++- routers/web/repo/blame.go | 18 ++++---- services/repository/gitgraph/graph_models.go | 46 ++++++++++++++++---- templates/repo/blame.tmpl | 2 +- templates/repo/commit_sign_badge.tmpl | 4 +- templates/repo/commits_list_small.tmpl | 6 +-- templates/repo/graph/commits.tmpl | 9 +--- templates/user/dashboard/feeds.tmpl | 2 +- 9 files changed, 60 insertions(+), 37 deletions(-) diff --git a/modules/repository/commits.go b/modules/repository/commits.go index 32550a9f03eec..546e88109041c 100644 --- a/modules/repository/commits.go +++ b/modules/repository/commits.go @@ -29,6 +29,7 @@ type PushCommit struct { AuthorName string CommitterEmail string CommitterName string + CoAuthors []*git.Signature Timestamp time.Time } @@ -157,6 +158,7 @@ func CommitToPushCommit(commit *git.Commit) *PushCommit { AuthorName: commit.Author.Name, CommitterEmail: commit.Committer.Email, CommitterName: commit.Committer.Name, + CoAuthors: commit.CoAuthorSignatures(), Timestamp: commit.Author.When, } } diff --git a/modules/repository/commits_test.go b/modules/repository/commits_test.go index 46db7b028b3a1..a4c0eea8b52d2 100644 --- a/modules/repository/commits_test.go +++ b/modules/repository/commits_test.go @@ -145,14 +145,18 @@ func TestCommitToPushCommit(t *testing.T) { ID: sha1, Author: sig, Committer: sig, - CommitMessage: git.CommitMessage{MessageRaw: "Commit Message"}, + CommitMessage: git.CommitMessage{MessageRaw: "Commit Message\n\nCo-authored-by: Jane Doe "}, }) assert.Equal(t, hexString, pushCommit.Sha1) - assert.Equal(t, "Commit Message", pushCommit.Message) + assert.Equal(t, "Commit Message\n\nCo-authored-by: Jane Doe ", pushCommit.Message) assert.Equal(t, "example@example.com", pushCommit.AuthorEmail) assert.Equal(t, "John Doe", pushCommit.AuthorName) assert.Equal(t, "example@example.com", pushCommit.CommitterEmail) assert.Equal(t, "John Doe", pushCommit.CommitterName) + if assert.Len(t, pushCommit.CoAuthors, 1) { + assert.Equal(t, "jane@example.com", pushCommit.CoAuthors[0].Email) + assert.Equal(t, "Jane Doe", pushCommit.CoAuthors[0].Name) + } assert.Equal(t, now, pushCommit.Timestamp) } diff --git a/routers/web/repo/blame.go b/routers/web/repo/blame.go index 803397f33f1d4..62697d708c480 100644 --- a/routers/web/repo/blame.go +++ b/routers/web/repo/blame.go @@ -29,12 +29,14 @@ import ( type blameRow struct { RowNumber int - Avatar template.HTML PreviousSha string PreviousShaURL string CommitURL string CommitMessage string CommitSince template.HTML + AuthorUser *user_model.User + CoAuthors []*user_model.CoAuthorUser + Author *git.Signature Code template.HTML EscapeStatus *charset.EscapeStatus @@ -221,13 +223,10 @@ func processBlameParts(ctx *context.Context, blameParts []*gitrepo.BlamePart) ma return commitNames } -func renderBlameFillFirstBlameRow(repoLink string, avatarUtils *templates.AvatarUtils, part *gitrepo.BlamePart, commit *user_model.UserCommit, br *blameRow) { - if commit.User != nil { - br.Avatar = avatarUtils.Avatar(commit.User, 18) - } else { - br.Avatar = avatarUtils.AvatarByEmail(commit.Author.Email, commit.Author.Name, 18) - } - +func renderBlameFillFirstBlameRow(repoLink string, part *gitrepo.BlamePart, commit *user_model.UserCommit, br *blameRow) { + br.AuthorUser = commit.User + br.CoAuthors = commit.CoAuthors + br.Author = commit.Author br.PreviousSha = part.PreviousSha br.PreviousShaURL = fmt.Sprintf("%s/blame/commit/%s/%s", repoLink, url.PathEscape(part.PreviousSha), util.PathEscapeSegments(part.PreviousPath)) br.CommitURL = fmt.Sprintf("%s/commit/%s", repoLink, url.PathEscape(part.Sha)) @@ -243,7 +242,6 @@ func renderBlame(ctx *context.Context, blameParts []*gitrepo.BlamePart, commitNa buf := &bytes.Buffer{} rows := make([]*blameRow, 0) - avatarUtils := templates.NewAvatarUtils(ctx) rowNumber := 0 // will be 1-based for _, part := range blameParts { for partLineIdx, line := range part.Lines { @@ -258,7 +256,7 @@ func renderBlame(ctx *context.Context, blameParts []*gitrepo.BlamePart, commitNa } if partLineIdx == 0 { - renderBlameFillFirstBlameRow(ctx.Repo.RepoLink, avatarUtils, part, commitNames[part.Sha], br) + renderBlameFillFirstBlameRow(ctx.Repo.RepoLink, part, commitNames[part.Sha], br) } } } diff --git a/services/repository/gitgraph/graph_models.go b/services/repository/gitgraph/graph_models.go index fc2eb85b87fd1..96ab2639c50de 100644 --- a/services/repository/gitgraph/graph_models.go +++ b/services/repository/gitgraph/graph_models.go @@ -93,9 +93,7 @@ func (graph *Graph) AddCommit(row, column int, flowID int64, data []byte) error // before finally retrieving the latest status func (graph *Graph) LoadAndProcessCommits(ctx context.Context, repository *repo_model.Repository, gitRepo *git.Repository) error { var err error - var ok bool - - emails := map[string]*user_model.User{} + emailSet := map[string]struct{}{} keyMap := map[string]bool{} for _, c := range graph.Commits { @@ -106,13 +104,44 @@ func (graph *Graph) LoadAndProcessCommits(ctx context.Context, repository *repo_ if err != nil { return fmt.Errorf("GetCommit: %s Error: %w", c.Rev, err) } - if c.Commit.Author != nil { - email := c.Commit.Author.Email - if c.User, ok = emails[email]; !ok { - c.User, _ = user_model.GetUserByEmail(ctx, email) - emails[email] = c.User + emailSet[c.Commit.Author.Email] = struct{}{} + } + for _, sig := range c.Commit.CoAuthorSignatures() { + emailSet[sig.Email] = struct{}{} + } + } + + allEmails := make([]string, 0, len(emailSet)) + for email := range emailSet { + allEmails = append(allEmails, email) + } + var emailUserMap *user_model.EmailUserMap + if len(allEmails) > 0 { + emailUserMap, err = user_model.GetUsersByEmails(ctx, allEmails) + if err != nil { + log.Error("GetUsersByEmails: %v", err) + } + } + + for _, c := range graph.Commits { + if c.Commit == nil { + continue + } + if c.Commit.Author != nil && emailUserMap != nil { + c.User = emailUserMap.GetByEmail(c.Commit.Author.Email) + } + coAuthorSigs := c.Commit.CoAuthorSignatures() + c.CoAuthors = make([]*user_model.CoAuthorUser, 0, len(coAuthorSigs)) + for _, sig := range coAuthorSigs { + var giteaUser *user_model.User + if emailUserMap != nil { + giteaUser = emailUserMap.GetByEmail(sig.Email) } + c.CoAuthors = append(c.CoAuthors, &user_model.CoAuthorUser{ + GiteaUser: giteaUser, + TrailerSignature: sig, + }) } c.Verification = asymkey_service.ParseCommitWithSignature(ctx, c.Commit) @@ -248,6 +277,7 @@ func newRefsFromRefNames(refNames []byte) []git.Reference { type Commit struct { Commit *git.Commit User *user_model.User + CoAuthors []*user_model.CoAuthorUser Verification *asymkey_model.CommitVerification Status *git_model.CommitStatus Flow int64 diff --git a/templates/repo/blame.tmpl b/templates/repo/blame.tmpl index 8bdefa5d43e2c..e6ae31891d6ce 100644 --- a/templates/repo/blame.tmpl +++ b/templates/repo/blame.tmpl @@ -43,7 +43,7 @@
- {{$row.Avatar}} + {{template "repo/commit_coauthor_avatar_stack" dict "AuthorUser" $row.AuthorUser "AuthorSignature" $row.Author "CoAuthors" $row.CoAuthors}}
{{ctx.RenderUtils.RenderCommitMessageLinkSubject $row.CommitMessage $row.CommitURL $.Repository}} diff --git a/templates/repo/commit_sign_badge.tmpl b/templates/repo/commit_sign_badge.tmpl index f63e4ec899d3c..bf8185fd0b52a 100644 --- a/templates/repo/commit_sign_badge.tmpl +++ b/templates/repo/commit_sign_badge.tmpl @@ -64,10 +64,10 @@ so this template should be kept as small as possible, DO NOT put large component {{- if $verified -}} {{- if and $signingUser $signingUser.ID -}} {{svg "gitea-lock"}} - {{ctx.AvatarUtils.Avatar $signingUser 16}} + {{ctx.AvatarUtils.Avatar $signingUser 20}} {{- else -}} {{svg "gitea-lock-cog"}} - {{ctx.AvatarUtils.AvatarByEmail $signingEmail "" 16}} + {{ctx.AvatarUtils.AvatarByEmail $signingEmail "" 20}} {{- end -}} {{- else -}} {{svg "gitea-unlock"}} diff --git a/templates/repo/commits_list_small.tmpl b/templates/repo/commits_list_small.tmpl index c5f0d5b59001b..c1cadf74ba397 100644 --- a/templates/repo/commits_list_small.tmpl +++ b/templates/repo/commits_list_small.tmpl @@ -5,11 +5,7 @@ {{$index = Eval $index "+" 1}}
{{/*singular-commit*/}} {{svg "octicon-git-commit"}} - {{if .User}} - {{ctx.AvatarUtils.Avatar .User 20}} - {{else}} - {{ctx.AvatarUtils.AvatarByEmail .Author.Email .Author.Name 20}} - {{end}} + {{template "repo/commit_coauthor_avatar_stack" dict "AuthorUser" .User "AuthorSignature" .Author "CoAuthors" .CoAuthors}} {{$commitBaseLink := printf "%s/commit" $.comment.Issue.PullRequest.BaseRepo.Link}} {{$commitLink:= printf "%s/%s" $commitBaseLink (PathEscape .ID.String)}} diff --git a/templates/repo/graph/commits.tmpl b/templates/repo/graph/commits.tmpl index d86f73fe65413..7b834d2be7115 100644 --- a/templates/repo/graph/commits.tmpl +++ b/templates/repo/graph/commits.tmpl @@ -41,14 +41,7 @@ - {{if $commit.User}} - {{ctx.AvatarUtils.Avatar $commit.User 18}} - {{$commit.User.GetShortDisplayNameLinkHTML}} - {{else}} - {{$gitUserName := $commit.Commit.Author.Name}} - {{ctx.AvatarUtils.AvatarByEmail $commit.Commit.Author.Email $gitUserName 18}} - {{$gitUserName}} - {{end}} + {{template "repo/commit_coauthor_avatars" dict "AuthorUser" $commit.User "AuthorSignature" $commit.Commit.Author "CoAuthors" $commit.CoAuthors}} {{DateUtils.FullTime $commit.Date}} diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index baf077863cde9..b3283a8b1461d 100644 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -91,7 +91,7 @@ {{range $pushCommit := $push.Commits}} {{$commitLink := printf "%s/commit/%s" $repoLink .Sha1}}
- + {{template "repo/commit_coauthor_avatar_stack" dict "AuthorSignature" (dict "Email" .AuthorEmail "Name" .AuthorName) "CoAuthorSignatures" .CoAuthors}} {{ShortSha .Sha1}} {{ctx.RenderUtils.RenderCommitMessage $pushCommit.Message $repo}} From 30b1928c068b9ed58668cea85310ae1aefe7972d Mon Sep 17 00:00:00 2001 From: Nicolas Date: Thu, 7 May 2026 22:40:48 +0200 Subject: [PATCH 03/18] more cleanup --- models/user/user.go | 15 ++-- modules/git/commit.go | 79 ++++++++++++++-- modules/git/commit_test.go | 89 +++++++++++++++++++ modules/repository/commits.go | 44 ++++++++- modules/repository/commits_test.go | 5 ++ options/locale/locale_en-US.json | 1 + services/repository/gitgraph/graph_models.go | 20 +++-- .../repo/commit_coauthor_avatar_stack.tmpl | 52 ++++------- templates/repo/commit_coauthor_avatars.tmpl | 3 +- templates/user/dashboard/feeds.tmpl | 2 +- web_src/css/repo.css | 7 +- 11 files changed, 256 insertions(+), 61 deletions(-) diff --git a/models/user/user.go b/models/user/user.go index 7a45d7087889a..956e69edcffef 100644 --- a/models/user/user.go +++ b/models/user/user.go @@ -1209,12 +1209,15 @@ func ValidateCommitsWithEmails(ctx context.Context, oldCommits []*git.Commit) ([ for _, c := range oldCommits { user := emailUserMap.GetByEmail(c.Author.Email) // FIXME: why ValidateCommitsWithEmails uses "Author", but ParseCommitsWithSignature uses "Committer"? coAuthorSigs := c.CoAuthorSignatures() - coAuthors := make([]*CoAuthorUser, 0, len(coAuthorSigs)) - for _, sig := range coAuthorSigs { - coAuthors = append(coAuthors, &CoAuthorUser{ - GiteaUser: emailUserMap.GetByEmail(sig.Email), - TrailerSignature: sig, - }) + var coAuthors []*CoAuthorUser + if len(coAuthorSigs) > 0 { + coAuthors = make([]*CoAuthorUser, 0, len(coAuthorSigs)) + for _, sig := range coAuthorSigs { + coAuthors = append(coAuthors, &CoAuthorUser{ + GiteaUser: emailUserMap.GetByEmail(sig.Email), + TrailerSignature: sig, + }) + } } newCommits = append(newCommits, &UserCommit{ User: user, diff --git a/modules/git/commit.go b/modules/git/commit.go index 34e6d64b8606d..4a23533d2f932 100644 --- a/modules/git/commit.go +++ b/modules/git/commit.go @@ -69,26 +69,64 @@ func (c *CommitMessage) MessageBody() string { return *c.messageBody } +// cutTrailerPrefix matches ":" case-insensitively at the start of line and +// returns the trailing value plus whether a match was found. `git interpret-trailers` +// matches trailer tokens case-insensitively, so e.g. "Co-Authored-By:" is valid. +func cutTrailerPrefix(line, token string) (string, bool) { + if len(line) < len(token)+1 || line[len(token)] != ':' { + return "", false + } + if !strings.EqualFold(line[:len(token)], token) { + return "", false + } + return line[len(token)+1:], true +} + +func isTrailerLine(line string) bool { + token, rest, ok := strings.Cut(line, ":") + if !ok || strings.TrimSpace(rest) == "" { + return false + } + for _, r := range token { + if (r >= 'A' && r <= 'Z') || (r >= 'a' && r <= 'z') || (r >= '0' && r <= '9') || r == '-' { + continue + } + return false + } + return token != "" +} + // CoAuthorSignatures parses "Co-authored-by:" and "Co-committed-by:" trailers // from the trailing block of the commit message and returns deduplicated // Signature values. Only the last paragraph of the body is scanned so that // quoted or in-body occurrences (e.g. inside a revert/cherry-pick description) -// are not misinterpreted as trailers, matching `git interpret-trailers`. +// are not misinterpreted as trailers. The trailing paragraph must contain only +// trailer-shaped lines. +// Token matching is case-insensitive to match git's behaviour. func (c *CommitMessage) CoAuthorSignatures() []*Signature { if c.messageCoAuthors != nil { return *c.messageCoAuthors } var sigs []*Signature seen := make(map[string]struct{}) - body := strings.TrimRight(c.MessageBody(), "\n") - if idx := strings.LastIndex(body, "\n\n"); idx >= 0 { + body := strings.TrimRight(c.MessageBody(), "\r\n") + if idx := strings.LastIndex(body, "\r\n\r\n"); idx >= 0 { + body = body[idx+4:] + } else if idx := strings.LastIndex(body, "\n\n"); idx >= 0 { body = body[idx+2:] } - for line := range strings.SplitSeq(body, "\n") { - var rest string - var ok bool - if rest, ok = strings.CutPrefix(line, "Co-authored-by:"); !ok { - rest, ok = strings.CutPrefix(line, "Co-committed-by:") + lines := strings.Split(body, "\n") + for i, line := range lines { + lines[i] = strings.TrimRight(line, "\r") + if !isTrailerLine(lines[i]) { + c.messageCoAuthors = &sigs + return sigs + } + } + for _, line := range lines { + rest, ok := cutTrailerPrefix(line, "Co-authored-by") + if !ok { + rest, ok = cutTrailerPrefix(line, "Co-committed-by") if !ok { continue } @@ -113,6 +151,31 @@ func (c *CommitMessage) CoAuthorSignatures() []*Signature { return sigs } +// CoAuthorSignatures returns the commit's co-author trailers with the commit's +// own author and committer emails filtered out, so a contributor who copies +// themselves into a Co-authored-by line is not duplicated in the avatar stack. +func (c *Commit) CoAuthorSignatures() []*Signature { + raw := c.CommitMessage.CoAuthorSignatures() + if len(raw) == 0 { + return raw + } + exclude := make(map[string]struct{}, 2) + if c.Author != nil { + exclude[strings.ToLower(strings.TrimSpace(c.Author.Email))] = struct{}{} + } + if c.Committer != nil { + exclude[strings.ToLower(strings.TrimSpace(c.Committer.Email))] = struct{}{} + } + out := make([]*Signature, 0, len(raw)) + for _, sig := range raw { + if _, skip := exclude[sig.Email]; skip { + continue + } + out = append(out, sig) + } + return out +} + // ParentID returns oid of n-th parent (0-based index). // It returns nil if no such parent exists. func (c *Commit) ParentID(n int) (ObjectID, error) { diff --git a/modules/git/commit_test.go b/modules/git/commit_test.go index a7668e4debedd..08116b0199efc 100644 --- a/modules/git/commit_test.go +++ b/modules/git/commit_test.go @@ -208,3 +208,92 @@ func Test_GetCommitBranchStart(t *testing.T) { assert.NotEmpty(t, startCommitID) assert.Equal(t, "95bb4d39648ee7e325106df01a621c530863a653", startCommitID) } + +func TestCoAuthorSignatures(t *testing.T) { + cases := []struct { + name string + body string + want []Signature + }{ + { + name: "empty", + body: "title", + want: nil, + }, + { + name: "single co-author", + body: "title\n\nbody text\n\nCo-authored-by: Jane ", + want: []Signature{{Name: "Jane", Email: "jane@example.com"}}, + }, + { + name: "case insensitive token", + body: "title\n\nCo-Authored-By: Jane \nco-committed-by: Bob ", + want: []Signature{ + {Name: "Jane", Email: "jane@example.com"}, + {Name: "Bob", Email: "bob@example.com"}, + }, + }, + { + name: "dedup by lowercased email", + body: "title\n\nCo-authored-by: Jane \nCo-authored-by: Janey ", + want: []Signature{{Name: "Jane", Email: "jane@example.com"}}, + }, + { + name: "in-body trailer ignored, only last paragraph counts", + body: "title\n\nCo-authored-by: Mallory \n\nactual body explaining revert\n\nCo-authored-by: Jane ", + want: []Signature{{Name: "Jane", Email: "jane@example.com"}}, + }, + { + name: "body text in trailing paragraph rejects co-author line", + body: "title\n\nbody text\nCo-authored-by: Jane ", + want: nil, + }, + { + name: "missing brackets is ignored", + body: "title\n\nCo-authored-by: Jane jane@example.com", + want: nil, + }, + { + name: "CRLF line endings", + body: "title\r\n\r\nCo-authored-by: Jane \r\nCo-committed-by: Bob ", + want: []Signature{ + {Name: "Jane", Email: "jane@example.com"}, + {Name: "Bob", Email: "bob@example.com"}, + }, + }, + { + name: "non-trailer line", + body: "title\n\nSigned-off-by: Jane ", + want: nil, + }, + } + for _, tc := range cases { + t.Run(tc.name, func(t *testing.T) { + cm := CommitMessage{MessageRaw: tc.body} + got := cm.CoAuthorSignatures() + assert.Len(t, got, len(tc.want)) + for i, w := range tc.want { + if i >= len(got) { + break + } + assert.Equal(t, w.Name, got[i].Name, "name[%d]", i) + assert.Equal(t, w.Email, got[i].Email, "email[%d]", i) + } + }) + } +} + +func TestCommitCoAuthorSignaturesFiltersAuthorAndCommitter(t *testing.T) { + c := &Commit{ + Author: &Signature{Name: "Jane", Email: "jane@example.com"}, + Committer: &Signature{Name: "Bob", Email: "bob@example.com"}, + CommitMessage: CommitMessage{MessageRaw: "title\n\n" + + "Co-authored-by: Jane Self \n" + + "Co-authored-by: Bob Self \n" + + "Co-authored-by: Carol "}, + } + got := c.CoAuthorSignatures() + if assert.Len(t, got, 1) { + assert.Equal(t, "carol@example.com", got[0].Email) + } +} diff --git a/modules/repository/commits.go b/modules/repository/commits.go index 546e88109041c..83ae10d8f5f64 100644 --- a/modules/repository/commits.go +++ b/modules/repository/commits.go @@ -29,10 +29,16 @@ type PushCommit struct { AuthorName string CommitterEmail string CommitterName string - CoAuthors []*git.Signature + CoAuthors []*PushCommitCoAuthor `json:",omitempty"` Timestamp time.Time } +// PushCommitCoAuthor represents a co-author in a push commit payload. +type PushCommitCoAuthor struct { + Name string + Email string +} + // PushCommits represents list of commits in a push operation. type PushCommits struct { Commits []*PushCommit @@ -149,6 +155,17 @@ func (pc *PushCommits) AvatarLink(ctx context.Context, email string) string { return v } +func pushCommitCoAuthorsFromSignatures(sigs []*git.Signature) []*PushCommitCoAuthor { + if len(sigs) == 0 { + return nil + } + coAuthors := make([]*PushCommitCoAuthor, len(sigs)) + for i, sig := range sigs { + coAuthors[i] = &PushCommitCoAuthor{Name: sig.Name, Email: sig.Email} + } + return coAuthors +} + // CommitToPushCommit transforms a git.Commit to PushCommit type. func CommitToPushCommit(commit *git.Commit) *PushCommit { return &PushCommit{ @@ -158,11 +175,34 @@ func CommitToPushCommit(commit *git.Commit) *PushCommit { AuthorName: commit.Author.Name, CommitterEmail: commit.Committer.Email, CommitterName: commit.Committer.Name, - CoAuthors: commit.CoAuthorSignatures(), + CoAuthors: pushCommitCoAuthorsFromSignatures(commit.CoAuthorSignatures()), Timestamp: commit.Author.When, } } +// AuthorSignature returns the push commit author as a git signature. +func (pc *PushCommit) AuthorSignature() *git.Signature { + return &git.Signature{ + Email: pc.AuthorEmail, + Name: pc.AuthorName, + } +} + +// CoAuthorUsers returns co-authors in the template view shape. +func (pc *PushCommit) CoAuthorUsers() []*user_model.CoAuthorUser { + if len(pc.CoAuthors) == 0 { + return nil + } + coAuthors := make([]*user_model.CoAuthorUser, len(pc.CoAuthors)) + for i, coAuthor := range pc.CoAuthors { + coAuthors[i] = &user_model.CoAuthorUser{TrailerSignature: &git.Signature{ + Name: coAuthor.Name, + Email: coAuthor.Email, + }} + } + return coAuthors +} + // GitToPushCommits transforms a list of git.Commits to PushCommits type. func GitToPushCommits(gitCommits []*git.Commit) *PushCommits { commits := make([]*PushCommit, 0, len(gitCommits)) diff --git a/modules/repository/commits_test.go b/modules/repository/commits_test.go index a4c0eea8b52d2..6228ae61a77da 100644 --- a/modules/repository/commits_test.go +++ b/modules/repository/commits_test.go @@ -157,6 +157,11 @@ func TestCommitToPushCommit(t *testing.T) { assert.Equal(t, "jane@example.com", pushCommit.CoAuthors[0].Email) assert.Equal(t, "Jane Doe", pushCommit.CoAuthors[0].Name) } + assert.Equal(t, &git.Signature{Email: "example@example.com", Name: "John Doe"}, pushCommit.AuthorSignature()) + if assert.Len(t, pushCommit.CoAuthorUsers(), 1) { + assert.Equal(t, &git.Signature{Email: "jane@example.com", Name: "Jane Doe"}, pushCommit.CoAuthorUsers()[0].TrailerSignature) + assert.Nil(t, pushCommit.CoAuthorUsers()[0].GiteaUser) + } assert.Equal(t, now, pushCommit.Timestamp) } diff --git a/options/locale/locale_en-US.json b/options/locale/locale_en-US.json index 18acdb059c18e..b5ae421266ab5 100644 --- a/options/locale/locale_en-US.json +++ b/options/locale/locale_en-US.json @@ -2591,6 +2591,7 @@ "repo.diff.committed_by": "committed by", "repo.diff.coauthored_by": "co-authored by", "repo.commits.coauthor_and": "and", + "repo.commits.coauthor_people": "%d people", "repo.commits.coauthor_others_1": "%d other", "repo.commits.coauthor_others_n": "%d others", "repo.diff.protected": "Protected", diff --git a/services/repository/gitgraph/graph_models.go b/services/repository/gitgraph/graph_models.go index 96ab2639c50de..fb33d3c0a0451 100644 --- a/services/repository/gitgraph/graph_models.go +++ b/services/repository/gitgraph/graph_models.go @@ -132,16 +132,18 @@ func (graph *Graph) LoadAndProcessCommits(ctx context.Context, repository *repo_ c.User = emailUserMap.GetByEmail(c.Commit.Author.Email) } coAuthorSigs := c.Commit.CoAuthorSignatures() - c.CoAuthors = make([]*user_model.CoAuthorUser, 0, len(coAuthorSigs)) - for _, sig := range coAuthorSigs { - var giteaUser *user_model.User - if emailUserMap != nil { - giteaUser = emailUserMap.GetByEmail(sig.Email) + if len(coAuthorSigs) > 0 { + c.CoAuthors = make([]*user_model.CoAuthorUser, 0, len(coAuthorSigs)) + for _, sig := range coAuthorSigs { + var giteaUser *user_model.User + if emailUserMap != nil { + giteaUser = emailUserMap.GetByEmail(sig.Email) + } + c.CoAuthors = append(c.CoAuthors, &user_model.CoAuthorUser{ + GiteaUser: giteaUser, + TrailerSignature: sig, + }) } - c.CoAuthors = append(c.CoAuthors, &user_model.CoAuthorUser{ - GiteaUser: giteaUser, - TrailerSignature: sig, - }) } c.Verification = asymkey_service.ParseCommitWithSignature(ctx, c.Commit) diff --git a/templates/repo/commit_coauthor_avatar_stack.tmpl b/templates/repo/commit_coauthor_avatar_stack.tmpl index 772e054aaac38..f9bd9e031cfb4 100644 --- a/templates/repo/commit_coauthor_avatar_stack.tmpl +++ b/templates/repo/commit_coauthor_avatar_stack.tmpl @@ -1,19 +1,19 @@ -{{if or .CoAuthors .CoAuthorSignatures}} +{{if .CoAuthors}} {{- $additionalClasses := .AdditionalClasses -}} - - {{- if .AuthorUser -}} - {{- ctx.AvatarUtils.Avatar .AuthorUser 20 -}} - {{- else -}} - {{- ctx.AvatarUtils.AvatarByEmail .AuthorSignature.Email .AuthorSignature.Name 20 -}} - {{- end -}} - {{- if .CoAuthors -}} - {{- $coCount := len .CoAuthors -}} - {{- $maxCo := 9 -}} - {{- $visibleCo := .CoAuthors -}} - {{- $overflow := 0 -}} - {{- if gt $coCount $maxCo -}} - {{- $visibleCo = slice .CoAuthors 0 $maxCo -}} - {{- $overflow = Eval $coCount "-" $maxCo -}} + {{- $coCount := len .CoAuthors -}} + {{- $maxCo := 9 -}} + {{- $visibleCo := .CoAuthors -}} + {{- $overflow := 0 -}} + {{- if gt $coCount $maxCo -}} + {{- $visibleCo = slice .CoAuthors 0 $maxCo -}} + {{- $overflow = Eval $coCount "-" $maxCo -}} + {{- end -}} + + + {{- if .AuthorUser -}} + {{- ctx.AvatarUtils.Avatar .AuthorUser 20 -}} + {{- else -}} + {{- ctx.AvatarUtils.AvatarByEmail .AuthorSignature.Email .AuthorSignature.Name 20 -}} {{- end -}} {{- range $visibleCo -}} {{- if .GiteaUser -}} @@ -22,24 +22,10 @@ {{- ctx.AvatarUtils.AvatarByEmail .TrailerSignature.Email .TrailerSignature.Name 20 -}} {{- end -}} {{- end -}} - {{- if gt $overflow 0 -}} - +{{$overflow}} - {{- end -}} - {{- else -}} - {{- $coCount := len .CoAuthorSignatures -}} - {{- $maxCo := 9 -}} - {{- $visibleCo := .CoAuthorSignatures -}} - {{- $overflow := 0 -}} - {{- if gt $coCount $maxCo -}} - {{- $visibleCo = slice .CoAuthorSignatures 0 $maxCo -}} - {{- $overflow = Eval $coCount "-" $maxCo -}} - {{- end -}} - {{- range $visibleCo -}} - {{- ctx.AvatarUtils.AvatarByEmail .Email .Name 20 -}} - {{- end -}} - {{- if gt $overflow 0 -}} - +{{$overflow}} - {{- end -}} + + {{- if gt $overflow 0 -}} + {{- $overflowLabel := ctx.Locale.TrN $overflow "repo.commits.coauthor_others_1" "repo.commits.coauthor_others_n" $overflow -}} + +{{$overflow}} {{- end -}} {{else if .AuthorUser}} diff --git a/templates/repo/commit_coauthor_avatars.tmpl b/templates/repo/commit_coauthor_avatars.tmpl index 04c04d5186f06..a6b73de79443c 100644 --- a/templates/repo/commit_coauthor_avatars.tmpl +++ b/templates/repo/commit_coauthor_avatars.tmpl @@ -29,7 +29,8 @@ {{- end -}} {{- end -}} {{- else -}} - {{- ctx.Locale.TrN $coCount "repo.commits.coauthor_others_1" "repo.commits.coauthor_others_n" $coCount -}} + {{- $peopleCount := Eval $coCount "+" 1 -}} + {{- ctx.Locale.Tr "repo.commits.coauthor_people" $peopleCount -}} {{- end -}} {{- else -}} {{- if .AuthorUser -}} diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index b3283a8b1461d..0981fea8f108e 100644 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -91,7 +91,7 @@ {{range $pushCommit := $push.Commits}} {{$commitLink := printf "%s/commit/%s" $repoLink .Sha1}}
- {{template "repo/commit_coauthor_avatar_stack" dict "AuthorSignature" (dict "Email" .AuthorEmail "Name" .AuthorName) "CoAuthorSignatures" .CoAuthors}} + {{template "repo/commit_coauthor_avatar_stack" dict "AuthorSignature" .AuthorSignature "CoAuthors" .CoAuthorUsers}} {{ShortSha .Sha1}} {{ctx.RenderUtils.RenderCommitMessage $pushCommit.Message $repo}} diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 135eeec2810e6..0a30cf6ce5067 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -1408,13 +1408,18 @@ tbody.commit-list { white-space: nowrap; } -.coauthor-avatar-stack { +.coauthor-avatar-stack-wrapper { display: inline-flex; align-items: center; vertical-align: middle; margin-right: 0.25rem; } +.coauthor-avatar-stack { + display: inline-flex; + align-items: center; +} + /* each direct child of the stack is either (linked user) or (no account) */ .coauthor-avatar-stack > * { margin-left: -12px; From 724d6b7e0094acd457037dfff4c55c5351341410 Mon Sep 17 00:00:00 2001 From: Nicolas Date: Mon, 11 May 2026 09:01:57 +0200 Subject: [PATCH 04/18] refactor(repo): move co-author avatar rendering to RenderUtils backend functions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Addresses review feedback: wxiaoguang requested a backend render function (like RenderLabels) instead of templates; silverwind requested template consolidation. Moving logic to Go satisfies both — two templates are deleted and replaced by RenderUtils.CoAuthorAvatarStack / CoAuthorAvatars. Also removes vertical-align (no-op in flexbox), redundant z-index:0, and hardcoded font-size:10px from co-author CSS rules. Co-Authored-By: Claude Sonnet 4.6 --- modules/templates/util_render.go | 98 +++++++++++++++++++ templates/repo/blame.tmpl | 2 +- .../repo/commit_coauthor_avatar_stack.tmpl | 35 ------- templates/repo/commit_coauthor_avatars.tmpl | 44 --------- templates/repo/commits_list.tmpl | 2 +- templates/repo/commits_list_small.tmpl | 2 +- templates/repo/graph/commits.tmpl | 2 +- templates/repo/latest_commit.tmpl | 2 +- templates/user/dashboard/feeds.tmpl | 2 +- web_src/css/repo.css | 3 - 10 files changed, 104 insertions(+), 88 deletions(-) delete mode 100644 templates/repo/commit_coauthor_avatar_stack.tmpl delete mode 100644 templates/repo/commit_coauthor_avatars.tmpl diff --git a/modules/templates/util_render.go b/modules/templates/util_render.go index da186f87f2129..7efa1abbd4d58 100644 --- a/modules/templates/util_render.go +++ b/modules/templates/util_render.go @@ -6,6 +6,7 @@ package templates import ( "encoding/hex" "fmt" + "html" "html/template" "math" "net/url" @@ -16,8 +17,10 @@ import ( issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/renderhelper" "code.gitea.io/gitea/models/repo" + user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/charset" "code.gitea.io/gitea/modules/emoji" + "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/htmlutil" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/markup" @@ -324,3 +327,98 @@ func (ut *RenderUtils) RenderUnicodeEscapeToggleTd(combined, escapeStatus *chars } return `
` + ut.RenderUnicodeEscapeToggleButton(escapeStatus) + `
- {{template "repo/commit_coauthor_avatars" dict "AuthorUser" .User "AuthorSignature" .Author "CoAuthors" .CoAuthors}} + {{ctx.RenderUtils.CoAuthorAvatars .User .Author .CoAuthors}} {{$commitBaseLink := ""}} diff --git a/templates/repo/commits_list_small.tmpl b/templates/repo/commits_list_small.tmpl index c1cadf74ba397..76a7cc9eff227 100644 --- a/templates/repo/commits_list_small.tmpl +++ b/templates/repo/commits_list_small.tmpl @@ -5,7 +5,7 @@ {{$index = Eval $index "+" 1}}
{{/*singular-commit*/}} {{svg "octicon-git-commit"}} - {{template "repo/commit_coauthor_avatar_stack" dict "AuthorUser" .User "AuthorSignature" .Author "CoAuthors" .CoAuthors}} + {{ctx.RenderUtils.CoAuthorAvatarStack .User .Author .CoAuthors ""}} {{$commitBaseLink := printf "%s/commit" $.comment.Issue.PullRequest.BaseRepo.Link}} {{$commitLink:= printf "%s/%s" $commitBaseLink (PathEscape .ID.String)}} diff --git a/templates/repo/graph/commits.tmpl b/templates/repo/graph/commits.tmpl index 7b834d2be7115..fb93f0889c516 100644 --- a/templates/repo/graph/commits.tmpl +++ b/templates/repo/graph/commits.tmpl @@ -41,7 +41,7 @@ - {{template "repo/commit_coauthor_avatars" dict "AuthorUser" $commit.User "AuthorSignature" $commit.Commit.Author "CoAuthors" $commit.CoAuthors}} + {{ctx.RenderUtils.CoAuthorAvatars $commit.User $commit.Commit.Author $commit.CoAuthors}} {{DateUtils.FullTime $commit.Date}} diff --git a/templates/repo/latest_commit.tmpl b/templates/repo/latest_commit.tmpl index 3a3b162ba51a9..230d8f88ef15e 100644 --- a/templates/repo/latest_commit.tmpl +++ b/templates/repo/latest_commit.tmpl @@ -2,7 +2,7 @@ {{if not .LatestCommit}} … {{else}} - {{template "repo/commit_coauthor_avatars" dict "AuthorUser" .LatestCommitUser "AuthorSignature" .LatestCommit.Author "CoAuthors" .LatestCommitCoAuthors}} + {{ctx.RenderUtils.CoAuthorAvatars .LatestCommitUser .LatestCommit.Author .LatestCommitCoAuthors}} {{template "repo/commit_sign_badge" dict "Commit" .LatestCommit "CommitBaseLink" (print .RepoLink "/commit") "CommitSignVerification" .LatestCommitVerification}} diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index 0981fea8f108e..67bede6cac469 100644 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -91,7 +91,7 @@ {{range $pushCommit := $push.Commits}} {{$commitLink := printf "%s/commit/%s" $repoLink .Sha1}}
- {{template "repo/commit_coauthor_avatar_stack" dict "AuthorSignature" .AuthorSignature "CoAuthors" .CoAuthorUsers}} + {{ctx.RenderUtils.CoAuthorAvatarStack nil .AuthorSignature .CoAuthorUsers ""}} {{ShortSha .Sha1}} {{ctx.RenderUtils.RenderCommitMessage $pushCommit.Message $repo}} diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 0a30cf6ce5067..dcd9f40f0b938 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -1411,7 +1411,6 @@ tbody.commit-list { .coauthor-avatar-stack-wrapper { display: inline-flex; align-items: center; - vertical-align: middle; margin-right: 0.25rem; } @@ -1425,7 +1424,6 @@ tbody.commit-list { margin-left: -12px; transition: transform 0.15s ease; position: relative; - z-index: 0; display: inline-flex; border-radius: 50%; } @@ -1445,7 +1443,6 @@ tbody.commit-list { justify-content: center; width: 20px; height: 20px; - font-size: 10px; font-weight: var(--font-weight-semibold); border: 2px solid var(--color-body); border-radius: 50%; From 84d5c585c9e49de8311c53e6264d16ff6ce96781 Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 13 May 2026 03:36:16 +0200 Subject: [PATCH 05/18] refactor(repo): polish co-author avatar stack, links, and popup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Simplify trailer parser: use stdlib `net/mail.ParseAddress` plus `strings.Cut`/`strings.EqualFold`, single-pass extraction - Make raw parser `parseCoAuthorSignatures` unexported so only the filtered `Commit.CoAuthorSignatures` is part of the public surface - Drop the parallel `PushCommitCoAuthor` type; `PushCommit.CoAuthors` now stores `[]*git.Signature` directly - Extract `CoAuthorUsersFromSigs` helper, deduplicating three copies of the email→user resolution loop - Rename CSS classes `coauthor-*` → `avatar-stack-*`; spacing tweaked to 6px stride between primary author and first co-author, 4px stride between subsequent; opaque background + 2px ring to keep avatars distinct under overlap; hover-spread via `--n` CSS variable - For 3+ participants, the "N people" label opens an interactive tippy popup listing all participants (initAuthorsPopup) - All author/co-author names link to the repo's commit author search (`/commits//search?q=author:`) when a repo+ref context is available; fall back to profile or mailto otherwise - Add `/devtest/coauthor-avatars` showcase - Rename `renderBlameFillFirstBlameRow` → `fillFirstBlameRow` (no longer renders) Co-Authored-By: Claude (Opus 4.7) --- models/user/user.go | 38 ++--- modules/git/commit.go | 104 ++++++------- modules/git/commit_test.go | 2 +- modules/repository/commits.go | 35 +---- modules/templates/util_render.go | 155 +++++++++++++------ modules/templates/util_render_test.go | 77 +++++++++ routers/web/devtest/devtest.go | 53 +++++++ routers/web/repo/blame.go | 4 +- services/repository/gitgraph/graph_models.go | 15 +- templates/devtest/coauthor-avatars.tmpl | 18 +++ web_src/css/repo.css | 68 ++++---- web_src/js/features/repo-commit.ts | 14 ++ web_src/js/index.ts | 3 +- 13 files changed, 392 insertions(+), 194 deletions(-) create mode 100644 templates/devtest/coauthor-avatars.tmpl diff --git a/models/user/user.go b/models/user/user.go index ffeb92acc8be7..41587a92e5ed2 100644 --- a/models/user/user.go +++ b/models/user/user.go @@ -1172,6 +1172,22 @@ func ValidateCommitWithEmail(ctx context.Context, c *git.Commit) *User { return u } +// CoAuthorUsersFromSigs wraps each signature with the matching Gitea user if any. +func CoAuthorUsersFromSigs(sigs []*git.Signature, emailUserMap *EmailUserMap) []*CoAuthorUser { + if len(sigs) == 0 { + return nil + } + out := make([]*CoAuthorUser, len(sigs)) + for i, sig := range sigs { + var giteaUser *User + if emailUserMap != nil { + giteaUser = emailUserMap.GetByEmail(sig.Email) + } + out[i] = &CoAuthorUser{GiteaUser: giteaUser, TrailerSignature: sig} + } + return out +} + // CoAuthorsFromCommit resolves co-author signatures from a commit into CoAuthorUser values. func CoAuthorsFromCommit(ctx context.Context, c *git.Commit) ([]*CoAuthorUser, error) { sigs := c.CoAuthorSignatures() @@ -1186,11 +1202,7 @@ func CoAuthorsFromCommit(ctx context.Context, c *git.Commit) ([]*CoAuthorUser, e if err != nil { return nil, err } - coAuthors := make([]*CoAuthorUser, len(sigs)) - for i, sig := range sigs { - coAuthors[i] = &CoAuthorUser{GiteaUser: emailUserMap.GetByEmail(sig.Email), TrailerSignature: sig} - } - return coAuthors, nil + return CoAuthorUsersFromSigs(sigs, emailUserMap), nil } // ValidateCommitsWithEmails checks if authors' e-mails of commits are corresponding to users. @@ -1214,21 +1226,9 @@ func ValidateCommitsWithEmails(ctx context.Context, oldCommits []*git.Commit) ([ } for _, c := range oldCommits { - user := emailUserMap.GetByEmail(c.Author.Email) // FIXME: why ValidateCommitsWithEmails uses "Author", but ParseCommitsWithSignature uses "Committer"? - coAuthorSigs := c.CoAuthorSignatures() - var coAuthors []*CoAuthorUser - if len(coAuthorSigs) > 0 { - coAuthors = make([]*CoAuthorUser, 0, len(coAuthorSigs)) - for _, sig := range coAuthorSigs { - coAuthors = append(coAuthors, &CoAuthorUser{ - GiteaUser: emailUserMap.GetByEmail(sig.Email), - TrailerSignature: sig, - }) - } - } newCommits = append(newCommits, &UserCommit{ - User: user, - CoAuthors: coAuthors, + User: emailUserMap.GetByEmail(c.Author.Email), // FIXME: why ValidateCommitsWithEmails uses "Author", but ParseCommitsWithSignature uses "Committer"? + CoAuthors: CoAuthorUsersFromSigs(c.CoAuthorSignatures(), emailUserMap), Commit: c, }) } diff --git a/modules/git/commit.go b/modules/git/commit.go index 4a23533d2f932..801cf5c05dd51 100644 --- a/modules/git/commit.go +++ b/modules/git/commit.go @@ -8,6 +8,7 @@ import ( "context" "errors" "io" + "net/mail" "os/exec" "strings" @@ -69,22 +70,12 @@ func (c *CommitMessage) MessageBody() string { return *c.messageBody } -// cutTrailerPrefix matches ":" case-insensitively at the start of line and -// returns the trailing value plus whether a match was found. `git interpret-trailers` -// matches trailer tokens case-insensitively, so e.g. "Co-Authored-By:" is valid. -func cutTrailerPrefix(line, token string) (string, bool) { - if len(line) < len(token)+1 || line[len(token)] != ':' { - return "", false - } - if !strings.EqualFold(line[:len(token)], token) { - return "", false - } - return line[len(token)+1:], true -} - -func isTrailerLine(line string) bool { +// isTrailerLineShape reports whether the line looks like a `Token: value` trailer +// per `git interpret-trailers`: the token is non-empty, contains only [A-Za-z0-9-], +// and the value (after `:`) is non-empty. +func isTrailerLineShape(line string) bool { token, rest, ok := strings.Cut(line, ":") - if !ok || strings.TrimSpace(rest) == "" { + if !ok || token == "" || strings.TrimSpace(rest) == "" { return false } for _, r := range token { @@ -93,59 +84,60 @@ func isTrailerLine(line string) bool { } return false } - return token != "" + return true } -// CoAuthorSignatures parses "Co-authored-by:" and "Co-committed-by:" trailers -// from the trailing block of the commit message and returns deduplicated -// Signature values. Only the last paragraph of the body is scanned so that -// quoted or in-body occurrences (e.g. inside a revert/cherry-pick description) -// are not misinterpreted as trailers. The trailing paragraph must contain only -// trailer-shaped lines. -// Token matching is case-insensitive to match git's behaviour. -func (c *CommitMessage) CoAuthorSignatures() []*Signature { +// parseCoAuthorTrailer extracts a co-author Signature if the line is a +// `Co-authored-by:`/`Co-committed-by:` trailer. Token matching is case-insensitive +// to match git's behaviour. Email is lowercased; the address is parsed with +// net/mail so a missing `<…>` or malformed address is rejected. +func parseCoAuthorTrailer(line string) (*Signature, bool) { + token, rest, ok := strings.Cut(line, ":") + if !ok { + return nil, false + } + if !strings.EqualFold(token, "Co-authored-by") && !strings.EqualFold(token, "Co-committed-by") { + return nil, false + } + addr, err := mail.ParseAddress(strings.TrimSpace(rest)) + if err != nil { + return nil, false + } + return &Signature{Name: addr.Name, Email: strings.ToLower(addr.Address)}, true +} + +// parseCoAuthorSignatures parses `Co-authored-by:` and `Co-committed-by:` trailers +// from the trailing block of the commit message and returns deduplicated Signature +// values. Only the last paragraph of the body is scanned so quoted or in-body +// occurrences (e.g. inside a revert/cherry-pick description) are not +// misinterpreted; the trailing paragraph must contain only trailer-shaped lines. +func (c *CommitMessage) parseCoAuthorSignatures() []*Signature { if c.messageCoAuthors != nil { return *c.messageCoAuthors } - var sigs []*Signature - seen := make(map[string]struct{}) - body := strings.TrimRight(c.MessageBody(), "\r\n") - if idx := strings.LastIndex(body, "\r\n\r\n"); idx >= 0 { - body = body[idx+4:] - } else if idx := strings.LastIndex(body, "\n\n"); idx >= 0 { + body := strings.ReplaceAll(strings.TrimRight(c.MessageBody(), "\r\n"), "\r\n", "\n") + if idx := strings.LastIndex(body, "\n\n"); idx >= 0 { body = body[idx+2:] } - lines := strings.Split(body, "\n") - for i, line := range lines { - lines[i] = strings.TrimRight(line, "\r") - if !isTrailerLine(lines[i]) { - c.messageCoAuthors = &sigs - return sigs - } - } - for _, line := range lines { - rest, ok := cutTrailerPrefix(line, "Co-authored-by") - if !ok { - rest, ok = cutTrailerPrefix(line, "Co-committed-by") - if !ok { - continue - } + var sigs []*Signature + var seen map[string]struct{} + for line := range strings.SplitSeq(body, "\n") { + if !isTrailerLineShape(line) { + sigs = nil + break } - rest = strings.TrimSpace(rest) - name, emailWithBracket, ok := strings.Cut(rest, " <") + sig, ok := parseCoAuthorTrailer(line) if !ok { continue } - email, _, ok := strings.Cut(emailWithBracket, ">") - if !ok { + if _, dup := seen[sig.Email]; dup { continue } - email = strings.ToLower(strings.TrimSpace(email)) - if _, exists := seen[email]; exists { - continue + if seen == nil { + seen = make(map[string]struct{}) } - seen[email] = struct{}{} - sigs = append(sigs, &Signature{Name: strings.TrimSpace(name), Email: email}) + seen[sig.Email] = struct{}{} + sigs = append(sigs, sig) } c.messageCoAuthors = &sigs return sigs @@ -155,11 +147,11 @@ func (c *CommitMessage) CoAuthorSignatures() []*Signature { // own author and committer emails filtered out, so a contributor who copies // themselves into a Co-authored-by line is not duplicated in the avatar stack. func (c *Commit) CoAuthorSignatures() []*Signature { - raw := c.CommitMessage.CoAuthorSignatures() + raw := c.parseCoAuthorSignatures() if len(raw) == 0 { return raw } - exclude := make(map[string]struct{}, 2) + exclude := make(map[string]struct{}) if c.Author != nil { exclude[strings.ToLower(strings.TrimSpace(c.Author.Email))] = struct{}{} } diff --git a/modules/git/commit_test.go b/modules/git/commit_test.go index 08116b0199efc..90227c816aa00 100644 --- a/modules/git/commit_test.go +++ b/modules/git/commit_test.go @@ -270,7 +270,7 @@ func TestCoAuthorSignatures(t *testing.T) { for _, tc := range cases { t.Run(tc.name, func(t *testing.T) { cm := CommitMessage{MessageRaw: tc.body} - got := cm.CoAuthorSignatures() + got := cm.parseCoAuthorSignatures() assert.Len(t, got, len(tc.want)) for i, w := range tc.want { if i >= len(got) { diff --git a/modules/repository/commits.go b/modules/repository/commits.go index 83ae10d8f5f64..93550b0e22f3f 100644 --- a/modules/repository/commits.go +++ b/modules/repository/commits.go @@ -29,16 +29,10 @@ type PushCommit struct { AuthorName string CommitterEmail string CommitterName string - CoAuthors []*PushCommitCoAuthor `json:",omitempty"` + CoAuthors []*git.Signature `json:",omitempty"` Timestamp time.Time } -// PushCommitCoAuthor represents a co-author in a push commit payload. -type PushCommitCoAuthor struct { - Name string - Email string -} - // PushCommits represents list of commits in a push operation. type PushCommits struct { Commits []*PushCommit @@ -155,17 +149,6 @@ func (pc *PushCommits) AvatarLink(ctx context.Context, email string) string { return v } -func pushCommitCoAuthorsFromSignatures(sigs []*git.Signature) []*PushCommitCoAuthor { - if len(sigs) == 0 { - return nil - } - coAuthors := make([]*PushCommitCoAuthor, len(sigs)) - for i, sig := range sigs { - coAuthors[i] = &PushCommitCoAuthor{Name: sig.Name, Email: sig.Email} - } - return coAuthors -} - // CommitToPushCommit transforms a git.Commit to PushCommit type. func CommitToPushCommit(commit *git.Commit) *PushCommit { return &PushCommit{ @@ -175,30 +158,24 @@ func CommitToPushCommit(commit *git.Commit) *PushCommit { AuthorName: commit.Author.Name, CommitterEmail: commit.Committer.Email, CommitterName: commit.Committer.Name, - CoAuthors: pushCommitCoAuthorsFromSignatures(commit.CoAuthorSignatures()), + CoAuthors: commit.CoAuthorSignatures(), Timestamp: commit.Author.When, } } // AuthorSignature returns the push commit author as a git signature. func (pc *PushCommit) AuthorSignature() *git.Signature { - return &git.Signature{ - Email: pc.AuthorEmail, - Name: pc.AuthorName, - } + return &git.Signature{Email: pc.AuthorEmail, Name: pc.AuthorName} } -// CoAuthorUsers returns co-authors in the template view shape. +// CoAuthorUsers returns co-authors in the template view shape, without resolved Gitea users. func (pc *PushCommit) CoAuthorUsers() []*user_model.CoAuthorUser { if len(pc.CoAuthors) == 0 { return nil } coAuthors := make([]*user_model.CoAuthorUser, len(pc.CoAuthors)) - for i, coAuthor := range pc.CoAuthors { - coAuthors[i] = &user_model.CoAuthorUser{TrailerSignature: &git.Signature{ - Name: coAuthor.Name, - Email: coAuthor.Email, - }} + for i, sig := range pc.CoAuthors { + coAuthors[i] = &user_model.CoAuthorUser{TrailerSignature: sig} } return coAuthors } diff --git a/modules/templates/util_render.go b/modules/templates/util_render.go index 7efa1abbd4d58..8a202da4925ce 100644 --- a/modules/templates/util_render.go +++ b/modules/templates/util_render.go @@ -6,7 +6,6 @@ package templates import ( "encoding/hex" "fmt" - "html" "html/template" "math" "net/url" @@ -328,8 +327,25 @@ func (ut *RenderUtils) RenderUnicodeEscapeToggleTd(combined, escapeStatus *chars return `
` + ut.RenderUnicodeEscapeToggleButton(escapeStatus) + `
+ + + {{range $s := .CoAuthorScenarios}} + + + + + {{end}} + +
ScenarioRendered
{{$s.Label}}{{ctx.RenderUtils.CoAuthorAvatars $s.AuthorUser $s.AuthorSig $s.CoAuthors}}
+ + +{{template "devtest/devtest-footer"}} diff --git a/web_src/css/repo.css b/web_src/css/repo.css index dcd9f40f0b938..4b614a91bf721 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -1406,38 +1406,51 @@ tbody.commit-list { max-width: 240px; align-self: center; white-space: nowrap; + display: inline-flex; + align-items: center; } -.coauthor-avatar-stack-wrapper { +.avatar-stack-wrapper { display: inline-flex; align-items: center; margin-right: 0.25rem; } -.coauthor-avatar-stack { +.avatar-stack { display: inline-flex; align-items: center; } -/* each direct child of the stack is either (linked user) or (no account) */ -.coauthor-avatar-stack > * { - margin-left: -12px; +/* each direct child carries inline --n (0 = leftmost). Higher --n sits lower in the stack + and slides further right on hover so the whole stack fans out from the left anchor. */ +.avatar-stack > * { + margin-left: -16px; transition: transform 0.15s ease; position: relative; display: inline-flex; border-radius: 50%; + z-index: calc(100 - var(--n, 0)); } -.coauthor-avatar-stack > *:first-child { +.avatar-stack > *:first-child { margin-left: 0; } -.coauthor-avatar-stack .avatar { +.avatar-stack > *:nth-child(2) { + margin-left: -14px; +} + +.avatar-stack:hover > * { + transform: translateX(max(0px, calc(14px + (var(--n, 0) - 1) * 16px))); +} + +.avatar-stack .avatar { border: 2px solid var(--color-body); + background: var(--color-body); border-radius: 50%; } -.coauthor-overflow-chip { +.avatar-stack-overflow-chip { display: inline-flex; align-items: center; justify-content: center; @@ -1450,26 +1463,25 @@ tbody.commit-list { color: var(--color-text); } -.coauthor-avatar-stack > *:nth-child(1) { z-index: 20; } -.coauthor-avatar-stack > *:nth-child(2) { z-index: 19; } -.coauthor-avatar-stack > *:nth-child(3) { z-index: 18; } -.coauthor-avatar-stack > *:nth-child(4) { z-index: 17; } -.coauthor-avatar-stack > *:nth-child(5) { z-index: 16; } -.coauthor-avatar-stack > *:nth-child(6) { z-index: 15; } -.coauthor-avatar-stack > *:nth-child(7) { z-index: 14; } -.coauthor-avatar-stack > *:nth-child(8) { z-index: 13; } -.coauthor-avatar-stack > *:nth-child(9) { z-index: 12; } -.coauthor-avatar-stack > *:nth-child(10) { z-index: 11; } - -.coauthor-avatar-stack:hover > *:nth-child(2) { transform: translateX(12px); } -.coauthor-avatar-stack:hover > *:nth-child(3) { transform: translateX(24px); } -.coauthor-avatar-stack:hover > *:nth-child(4) { transform: translateX(36px); } -.coauthor-avatar-stack:hover > *:nth-child(5) { transform: translateX(48px); } -.coauthor-avatar-stack:hover > *:nth-child(6) { transform: translateX(60px); } -.coauthor-avatar-stack:hover > *:nth-child(7) { transform: translateX(72px); } -.coauthor-avatar-stack:hover > *:nth-child(8) { transform: translateX(84px); } -.coauthor-avatar-stack:hover > *:nth-child(9) { transform: translateX(96px); } -.coauthor-avatar-stack:hover > *:nth-child(10) { transform: translateX(108px); } +.authors-popup-trigger { + cursor: pointer; +} + +.authors-popup { + min-width: 200px; + display: flex; + flex-direction: column; + padding: 4px 0; +} + +.authors-popup > a { + padding: 6px 12px; + gap: 8px; +} + +.authors-popup > a:hover { + background: var(--color-hover); +} .latest-commit .message-wrapper { max-width: calc(100% - 2.5rem); diff --git a/web_src/js/features/repo-commit.ts b/web_src/js/features/repo-commit.ts index 16f38993749f3..843586d8fb084 100644 --- a/web_src/js/features/repo-commit.ts +++ b/web_src/js/features/repo-commit.ts @@ -24,3 +24,17 @@ export function initCommitStatuses() { }); }); } + +export function initAuthorsPopup() { + registerGlobalInitFunc('initAuthorsPopup', (el: HTMLElement) => { + const nextEl = el.nextElementSibling!; + if (!nextEl.matches('.tippy-target')) throw new Error('Expected next element to be a tippy target'); + createTippy(el, { + content: nextEl, + placement: 'bottom-start', + interactive: true, + role: 'dialog', + theme: 'menu', + }); + }); +} diff --git a/web_src/js/index.ts b/web_src/js/index.ts index cb2b56a5bd5e3..739fc209cf5b0 100644 --- a/web_src/js/index.ts +++ b/web_src/js/index.ts @@ -20,7 +20,7 @@ import {initMarkupContent} from './markup/content.ts'; import {initRepoFileView} from './features/file-view.ts'; import {initUserExternalLogins, initUserCheckAppUrl} from './features/user-auth.ts'; import {initRepoPullRequestReview, initRepoIssueFilterItemLabel} from './features/repo-issue.ts'; -import {initRepoEllipsisButton, initCommitStatuses} from './features/repo-commit.ts'; +import {initRepoEllipsisButton, initCommitStatuses, initAuthorsPopup} from './features/repo-commit.ts'; import {initRepoTopicBar} from './features/repo-home.ts'; import {initAdminCommon} from './features/admin/common.ts'; import {initRepoCodeView} from './features/repo-code.ts'; @@ -145,6 +145,7 @@ const initPerformanceTracer = callInitFunctions([ initRepoRecentCommits, initCommitStatuses, + initAuthorsPopup, initCaptcha, initUserCheckAppUrl, From 680a50e375d47e6480906060469c152a066cf76f Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 13 May 2026 03:39:43 +0200 Subject: [PATCH 06/18] fix(repo): rename AvatarStack and handle nil author in blame rows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Rename `CoAuthorAvatarStack` → `AvatarStack`; update all template callers (`blame.tmpl`, `commits_list_small.tmpl`, `feeds.tmpl`) plus the internal call from `CoAuthorAvatars` and the unit tests. - Return empty HTML when both `authorUser` and `authorSig` are nil. Blame rows that are not the first line of a blame chunk have no author info populated; the previous pre-rendered-per-row pattern resulted in an empty `template.HTML` field for these, but the direct-call refactor was dereferencing `authorSig.Email` and crashing the blame view. Co-Authored-By: Claude (Opus 4.7) --- modules/templates/util_render.go | 11 +++++++---- modules/templates/util_render_test.go | 4 ++-- templates/repo/blame.tmpl | 2 +- templates/repo/commits_list_small.tmpl | 2 +- templates/user/dashboard/feeds.tmpl | 2 +- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/modules/templates/util_render.go b/modules/templates/util_render.go index 8a202da4925ce..6bf9b6650c0c3 100644 --- a/modules/templates/util_render.go +++ b/modules/templates/util_render.go @@ -342,11 +342,14 @@ func (ut *RenderUtils) commitAuthorSearchURL(authorName string) template.URL { return template.URL(repoLink + "/commits/" + refSubURL + "/search?q=" + url.QueryEscape("author:"+authorName)) } -// CoAuthorAvatarStack renders an avatar stack for the commit author and co-authors. -// authorUser may be nil when no Gitea account is linked; authorSig must always be set. +// AvatarStack renders an avatar stack for the commit author and co-authors. +// Returns empty when neither a Gitea user nor a git signature is available. // Each stack child carries an inline `--n` custom property so the CSS can apply // z-index and the :hover translate without hardcoding nth-child rules. -func (ut *RenderUtils) CoAuthorAvatarStack(authorUser *user_model.User, authorSig *git.Signature, coAuthors []*user_model.CoAuthorUser, additionalClasses string) template.HTML { +func (ut *RenderUtils) AvatarStack(authorUser *user_model.User, authorSig *git.Signature, coAuthors []*user_model.CoAuthorUser, additionalClasses string) template.HTML { + if authorUser == nil && authorSig == nil { + return "" + } au := NewAvatarUtils(ut.ctx) if len(coAuthors) == 0 { if authorUser != nil { @@ -424,7 +427,7 @@ func (ut *RenderUtils) CoAuthorAvatars(authorUser *user_model.User, authorSig *g var b strings.Builder b.WriteString(``) - b.WriteString(string(ut.CoAuthorAvatarStack(authorUser, authorSig, coAuthors, stackClass))) + b.WriteString(string(ut.AvatarStack(authorUser, authorSig, coAuthors, stackClass))) switch len(coAuthors) { case 0: diff --git a/modules/templates/util_render_test.go b/modules/templates/util_render_test.go index 2ec7c0f6a74b1..b4b6863d7dceb 100644 --- a/modules/templates/util_render_test.go +++ b/modules/templates/util_render_test.go @@ -288,13 +288,13 @@ func TestCoAuthorAvatars(t *testing.T) { for i := range cos { cos[i] = mkCo("X", "x@example.com") } - got := string(ut.CoAuthorAvatarStack(nil, authorSig, cos, "")) + got := string(ut.AvatarStack(nil, authorSig, cos, "")) assert.Contains(t, got, `class="avatar-stack-overflow-chip`) assert.Contains(t, got, "+1") }) t.Run("each stack child carries inline --n", func(t *testing.T) { - got := string(ut.CoAuthorAvatarStack(nil, authorSig, + got := string(ut.AvatarStack(nil, authorSig, []*user_model.CoAuthorUser{mkCo("Bob", "bob@example.com")}, "")) assert.Contains(t, got, `style="--n:0"`) assert.Contains(t, got, `style="--n:1"`) diff --git a/templates/repo/blame.tmpl b/templates/repo/blame.tmpl index eb2ab68ddf5a2..67585a27f5130 100644 --- a/templates/repo/blame.tmpl +++ b/templates/repo/blame.tmpl @@ -43,7 +43,7 @@
- {{ctx.RenderUtils.CoAuthorAvatarStack $row.AuthorUser $row.Author $row.CoAuthors ""}} + {{ctx.RenderUtils.AvatarStack $row.AuthorUser $row.Author $row.CoAuthors ""}}
{{ctx.RenderUtils.RenderCommitMessageLinkSubject $row.CommitMessage $row.CommitURL $.Repository}} diff --git a/templates/repo/commits_list_small.tmpl b/templates/repo/commits_list_small.tmpl index 76a7cc9eff227..bf174070b1168 100644 --- a/templates/repo/commits_list_small.tmpl +++ b/templates/repo/commits_list_small.tmpl @@ -5,7 +5,7 @@ {{$index = Eval $index "+" 1}}
{{/*singular-commit*/}} {{svg "octicon-git-commit"}} - {{ctx.RenderUtils.CoAuthorAvatarStack .User .Author .CoAuthors ""}} + {{ctx.RenderUtils.AvatarStack .User .Author .CoAuthors ""}} {{$commitBaseLink := printf "%s/commit" $.comment.Issue.PullRequest.BaseRepo.Link}} {{$commitLink:= printf "%s/%s" $commitBaseLink (PathEscape .ID.String)}} diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index 67bede6cac469..35467fdbd7653 100644 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -91,7 +91,7 @@ {{range $pushCommit := $push.Commits}} {{$commitLink := printf "%s/commit/%s" $repoLink .Sha1}}
- {{ctx.RenderUtils.CoAuthorAvatarStack nil .AuthorSignature .CoAuthorUsers ""}} + {{ctx.RenderUtils.AvatarStack nil .AuthorSignature .CoAuthorUsers ""}} {{ShortSha .Sha1}} {{ctx.RenderUtils.RenderCommitMessage $pushCommit.Message $repo}} From 72e2810d9d99188abac2c03cad061fca034b9ec1 Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 13 May 2026 03:46:14 +0200 Subject: [PATCH 07/18] refactor(repo): drop avatar-stack-wrapper element The outer wrapper no longer has a unique role: it had `display: inline-flex; align-items: center` (matching the inner `.avatar-stack`) and was originally there to keep the `+N` overflow chip outside the hover-spread, but the chip lives inside `.avatar-stack` now. Render a single `` and let optional caller classes (e.g. `tw-mr-1`) merge into the same class attribute. Spacing around the stack is left to the parent layout (flexbox gap on `.flex-text-block`, etc.) rather than a margin on the wrapper. Co-Authored-By: Claude (Opus 4.7) --- modules/templates/util_render.go | 8 ++++---- web_src/css/repo.css | 6 ------ 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/modules/templates/util_render.go b/modules/templates/util_render.go index 6bf9b6650c0c3..2b84160a6719c 100644 --- a/modules/templates/util_render.go +++ b/modules/templates/util_render.go @@ -366,13 +366,13 @@ func (ut *RenderUtils) AvatarStack(authorUser *user_model.User, authorSig *git.S overflow = len(coAuthors) - maxCo } - wrapperClass := "avatar-stack-wrapper" + stackClass := "avatar-stack" if additionalClasses != "" { - wrapperClass += " " + additionalClasses + stackClass += " " + additionalClasses } var b strings.Builder - b.WriteString(string(htmlutil.HTMLFormat(``, wrapperClass))) + b.WriteString(string(htmlutil.HTMLFormat(``, stackClass))) appendLinked := func(idx int, u *user_model.User) { href := ut.commitAuthorSearchURL(u.Name) @@ -411,7 +411,7 @@ func (ut *RenderUtils) AvatarStack(authorUser *user_model.User, authorSig *git.S len(visibleCo)+1, overflow, overflow))) } - b.WriteString(``) + b.WriteString(``) return template.HTML(b.String()) } diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 4b614a91bf721..f40604f4993b2 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -1410,12 +1410,6 @@ tbody.commit-list { align-items: center; } -.avatar-stack-wrapper { - display: inline-flex; - align-items: center; - margin-right: 0.25rem; -} - .avatar-stack { display: inline-flex; align-items: center; From 1c4d6b4ca97eb4b201f199fe658eb04247f9c540 Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 13 May 2026 03:56:43 +0200 Subject: [PATCH 08/18] refactor(repo): simplify co-author render helpers - Extract `authorHref`, `authorAvatar`, `authorDisplayName` so the four anchor-builders (`appendLinked`/`appendUnlinked` closures in `AvatarStack`, `authorNameLinkHTML`, `participantRowHTML`) share the href + avatar + name resolution. - Collapse the stack's two closures into one `appendChild`. - Replace the `*[]*Signature` tri-state cache on `CommitMessage` with a plain slice + `coAuthorsParsed bool`; the prior shape conflated "unparsed" with "parsed empty" via a pointer-to-slice. - Drop unused locale keys `coauthor_others_1` / `coauthor_others_n` (the overflow chip popup that used them was removed earlier). - Trim verbose doc comments around the trailer parser. Co-Authored-By: Claude (Opus 4.7) --- modules/git/commit.go | 41 +++++----- modules/templates/util_render.go | 131 ++++++++++++++----------------- options/locale/locale_en-US.json | 2 - web_src/css/repo.css | 3 +- 4 files changed, 81 insertions(+), 96 deletions(-) diff --git a/modules/git/commit.go b/modules/git/commit.go index 801cf5c05dd51..f22cacd4086f1 100644 --- a/modules/git/commit.go +++ b/modules/git/commit.go @@ -18,11 +18,12 @@ import ( ) type CommitMessage struct { - MessageRaw string - messageUTF8 *string - messageTitle *string - messageBody *string - messageCoAuthors *[]*Signature + MessageRaw string + messageUTF8 *string + messageTitle *string + messageBody *string + coAuthors []*Signature + coAuthorsParsed bool } // Commit represents a git commit. @@ -70,9 +71,8 @@ func (c *CommitMessage) MessageBody() string { return *c.messageBody } -// isTrailerLineShape reports whether the line looks like a `Token: value` trailer -// per `git interpret-trailers`: the token is non-empty, contains only [A-Za-z0-9-], -// and the value (after `:`) is non-empty. +// isTrailerLineShape reports whether the line matches `[A-Za-z0-9-]+:` +// per `git interpret-trailers`. func isTrailerLineShape(line string) bool { token, rest, ok := strings.Cut(line, ":") if !ok || token == "" || strings.TrimSpace(rest) == "" { @@ -87,10 +87,8 @@ func isTrailerLineShape(line string) bool { return true } -// parseCoAuthorTrailer extracts a co-author Signature if the line is a -// `Co-authored-by:`/`Co-committed-by:` trailer. Token matching is case-insensitive -// to match git's behaviour. Email is lowercased; the address is parsed with -// net/mail so a missing `<…>` or malformed address is rejected. +// parseCoAuthorTrailer extracts a co-author from a `Co-authored-by:` or +// `Co-committed-by:` trailer (case-insensitive). Returns false on a malformed address. func parseCoAuthorTrailer(line string) (*Signature, bool) { token, rest, ok := strings.Cut(line, ":") if !ok { @@ -107,13 +105,12 @@ func parseCoAuthorTrailer(line string) (*Signature, bool) { } // parseCoAuthorSignatures parses `Co-authored-by:` and `Co-committed-by:` trailers -// from the trailing block of the commit message and returns deduplicated Signature -// values. Only the last paragraph of the body is scanned so quoted or in-body -// occurrences (e.g. inside a revert/cherry-pick description) are not -// misinterpreted; the trailing paragraph must contain only trailer-shaped lines. +// from the trailing block of the commit message. Only the last paragraph is scanned +// (and it must contain only trailer-shaped lines) so in-body occurrences inside a +// revert or cherry-pick description are not misinterpreted as trailers. func (c *CommitMessage) parseCoAuthorSignatures() []*Signature { - if c.messageCoAuthors != nil { - return *c.messageCoAuthors + if c.coAuthorsParsed { + return c.coAuthors } body := strings.ReplaceAll(strings.TrimRight(c.MessageBody(), "\r\n"), "\r\n", "\n") if idx := strings.LastIndex(body, "\n\n"); idx >= 0 { @@ -139,13 +136,13 @@ func (c *CommitMessage) parseCoAuthorSignatures() []*Signature { seen[sig.Email] = struct{}{} sigs = append(sigs, sig) } - c.messageCoAuthors = &sigs + c.coAuthors = sigs + c.coAuthorsParsed = true return sigs } -// CoAuthorSignatures returns the commit's co-author trailers with the commit's -// own author and committer emails filtered out, so a contributor who copies -// themselves into a Co-authored-by line is not duplicated in the avatar stack. +// CoAuthorSignatures returns the parsed co-author trailers with the commit's own +// author and committer emails filtered out (so self-copying isn't counted). func (c *Commit) CoAuthorSignatures() []*Signature { raw := c.parseCoAuthorSignatures() if len(raw) == 0 { diff --git a/modules/templates/util_render.go b/modules/templates/util_render.go index 2b84160a6719c..12f44b81fbd76 100644 --- a/modules/templates/util_render.go +++ b/modules/templates/util_render.go @@ -327,8 +327,7 @@ func (ut *RenderUtils) RenderUnicodeEscapeToggleTd(combined, escapeStatus *chars return `` + ut.RenderUnicodeEscapeToggleButton(escapeStatus) + `` } -// commitAuthorSearchURL returns the repo's commits-by-author search URL for the current -// ref, or an empty URL when no repo/ref context is available (e.g. dashboard feed). +// commitAuthorSearchURL builds the repo's commits-by-author search URL, or empty when no repo/ref context. func (ut *RenderUtils) commitAuthorSearchURL(authorName string) template.URL { if authorName == "" { return "" @@ -342,16 +341,52 @@ func (ut *RenderUtils) commitAuthorSearchURL(authorName string) template.URL { return template.URL(repoLink + "/commits/" + refSubURL + "/search?q=" + url.QueryEscape("author:"+authorName)) } -// AvatarStack renders an avatar stack for the commit author and co-authors. -// Returns empty when neither a Gitea user nor a git signature is available. -// Each stack child carries an inline `--n` custom property so the CSS can apply -// z-index and the :hover translate without hardcoding nth-child rules. +// authorHref picks the most-relevant link target for an author: the repo's +// commits-by-author search when available, otherwise the user profile or mailto. +func (ut *RenderUtils) authorHref(u *user_model.User, sig *git.Signature) template.URL { + var name, fallback string + switch { + case u != nil: + name, fallback = u.Name, u.HomeLink() + case sig != nil: + name = sig.Name + if sig.Email != "" { + fallback = "mailto:" + sig.Email + } + default: + return "" + } + if href := ut.commitAuthorSearchURL(name); href != "" { + return href + } + return template.URL(fallback) +} + +// authorAvatar returns the 20px avatar HTML for a matched user or git signature. +func (ut *RenderUtils) authorAvatar(u *user_model.User, sig *git.Signature) template.HTML { + au := NewAvatarUtils(ut.ctx) + if u != nil { + return au.Avatar(u, 20) + } + return au.AvatarByEmail(sig.Email, sig.Name, 20) +} + +// authorDisplayName returns the display name for a matched user or git signature. +func authorDisplayName(u *user_model.User, sig *git.Signature) string { + if u != nil { + return u.GetDisplayName() + } + return sig.Name +} + +// AvatarStack renders an avatar stack. Returns empty when no author is provided. +// Each stack child carries inline `--n` so the CSS can drive z-index and the hover spread. func (ut *RenderUtils) AvatarStack(authorUser *user_model.User, authorSig *git.Signature, coAuthors []*user_model.CoAuthorUser, additionalClasses string) template.HTML { if authorUser == nil && authorSig == nil { return "" } - au := NewAvatarUtils(ut.ctx) if len(coAuthors) == 0 { + au := NewAvatarUtils(ut.ctx) if authorUser != nil { return au.Avatar(authorUser, 20, additionalClasses) } @@ -374,35 +409,18 @@ func (ut *RenderUtils) AvatarStack(authorUser *user_model.User, authorSig *git.S var b strings.Builder b.WriteString(string(htmlutil.HTMLFormat(``, stackClass))) - appendLinked := func(idx int, u *user_model.User) { - href := ut.commitAuthorSearchURL(u.Name) - if href == "" { - href = template.URL(u.HomeLink()) - } - b.WriteString(string(htmlutil.HTMLFormat(`%s`, - href, idx, au.Avatar(u, 20)))) - } - appendUnlinked := func(idx int, sig *git.Signature) { - if href := ut.commitAuthorSearchURL(sig.Name); href != "" { - b.WriteString(string(htmlutil.HTMLFormat(`%s`, - href, idx, au.AvatarByEmail(sig.Email, sig.Name, 20)))) - return + appendChild := func(idx int, u *user_model.User, sig *git.Signature) { + avatar := ut.authorAvatar(u, sig) + if href := ut.authorHref(u, sig); href != "" { + b.WriteString(string(htmlutil.HTMLFormat(`%s`, href, idx, avatar))) + } else { + b.WriteString(string(htmlutil.HTMLFormat(`%s`, idx, avatar))) } - b.WriteString(string(htmlutil.HTMLFormat(`%s`, - idx, au.AvatarByEmail(sig.Email, sig.Name, 20)))) } - if authorUser != nil { - appendLinked(0, authorUser) - } else { - appendUnlinked(0, authorSig) - } + appendChild(0, authorUser, authorSig) for i, co := range visibleCo { - if co.GiteaUser != nil { - appendLinked(i+1, co.GiteaUser) - } else { - appendUnlinked(i+1, co.TrailerSignature) - } + appendChild(i+1, co.GiteaUser, co.TrailerSignature) } if overflow > 0 { @@ -415,9 +433,8 @@ func (ut *RenderUtils) AvatarStack(authorUser *user_model.User, authorSig *git.S return template.HTML(b.String()) } -// CoAuthorAvatars renders the author/co-author avatar stack with descriptive name text. -// Label rules follow GitHub: 2 total = ` and `; 3+ total opens -// a popup listing all participants on click. +// CoAuthorAvatars renders the avatar stack plus descriptive label. +// 1 author: name; 2 total: ` and `; 3+ total: ` people` opens a tippy popup. func (ut *RenderUtils) CoAuthorAvatars(authorUser *user_model.User, authorSig *git.Signature, coAuthors []*user_model.CoAuthorUser) template.HTML { locale := ut.ctx.Value(translation.ContextKey).(translation.Locale) stackClass := "" @@ -437,10 +454,9 @@ func (ut *RenderUtils) CoAuthorAvatars(authorUser *user_model.User, authorSig *g b.WriteString(string(htmlutil.HTMLFormat(`%s`, locale.Tr("repo.commits.coauthor_and")))) b.WriteString(string(ut.authorNameLinkHTML(coAuthors[0].GiteaUser, coAuthors[0].TrailerSignature))) default: - total := len(coAuthors) + 1 b.WriteString(string(htmlutil.HTMLFormat( `%s`, - locale.Tr("repo.commits.coauthor_people", total)))) + locale.Tr("repo.commits.coauthor_people", len(coAuthors)+1)))) b.WriteString(`
`) b.WriteString(string(ut.participantRowHTML(authorUser, authorSig))) for _, co := range coAuthors { @@ -453,42 +469,17 @@ func (ut *RenderUtils) CoAuthorAvatars(authorUser *user_model.User, authorSig *g return template.HTML(b.String()) } -// authorNameLinkHTML renders a muted link for an author. In a repo context the -// link targets the repo's commit search filtered by author; otherwise it falls -// back to the user's profile (or a mailto link when no Gitea account matches). +// authorNameLinkHTML renders a muted text link for an author. func (ut *RenderUtils) authorNameLinkHTML(u *user_model.User, sig *git.Signature) template.HTML { - if u != nil { - if href := ut.commitAuthorSearchURL(u.Name); href != "" { - return htmlutil.HTMLFormat(`%s`, href, u.GetDisplayName()) - } - return u.GetShortDisplayNameLinkHTML() - } - if href := ut.commitAuthorSearchURL(sig.Name); href != "" { - return htmlutil.HTMLFormat(`%s`, href, sig.Name) + href := ut.authorHref(u, sig) + if href == "" { + return "" } - return htmlutil.HTMLFormat(`%s`, sig.Email, sig.Name) + return htmlutil.HTMLFormat(`%s`, href, authorDisplayName(u, sig)) } -// participantRowHTML renders one row of the authors popup: avatar + linked name. +// participantRowHTML renders one row of the authors popup: avatar + name. func (ut *RenderUtils) participantRowHTML(u *user_model.User, sig *git.Signature) template.HTML { - au := NewAvatarUtils(ut.ctx) - var href template.URL - var avatar template.HTML - var name string - if u != nil { - href = ut.commitAuthorSearchURL(u.Name) - if href == "" { - href = template.URL(u.HomeLink()) - } - avatar = au.Avatar(u, 20) - name = u.GetDisplayName() - } else { - href = ut.commitAuthorSearchURL(sig.Name) - if href == "" { - href = template.URL("mailto:" + sig.Email) - } - avatar = au.AvatarByEmail(sig.Email, sig.Name, 20) - name = sig.Name - } - return htmlutil.HTMLFormat(`%s%s`, href, avatar, name) + return htmlutil.HTMLFormat(`%s%s`, + ut.authorHref(u, sig), ut.authorAvatar(u, sig), authorDisplayName(u, sig)) } diff --git a/options/locale/locale_en-US.json b/options/locale/locale_en-US.json index 540f09361e3fb..45494d4a7aeeb 100644 --- a/options/locale/locale_en-US.json +++ b/options/locale/locale_en-US.json @@ -2592,8 +2592,6 @@ "repo.diff.coauthored_by": "co-authored by", "repo.commits.coauthor_and": "and", "repo.commits.coauthor_people": "%d people", - "repo.commits.coauthor_others_1": "%d other", - "repo.commits.coauthor_others_n": "%d others", "repo.diff.protected": "Protected", "repo.diff.image.side_by_side": "Side by Side", "repo.diff.image.swipe": "Swipe", diff --git a/web_src/css/repo.css b/web_src/css/repo.css index f40604f4993b2..90ab7fe286599 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -1415,8 +1415,7 @@ tbody.commit-list { align-items: center; } -/* each direct child carries inline --n (0 = leftmost). Higher --n sits lower in the stack - and slides further right on hover so the whole stack fans out from the left anchor. */ +/* inline --n on each child drives z-index and the hover spread */ .avatar-stack > * { margin-left: -16px; transition: transform 0.15s ease; From 67072373b83218cff36137785e3827fac38af045 Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 13 May 2026 04:02:41 +0200 Subject: [PATCH 09/18] refactor: drop Co-committed-by trailer `Co-committed-by:` was a non-standard, Gitea-only convention emitted (but never parsed) by two paths: - `services/pull/merge_squash.go` paired it with `Co-authored-by:` on squash merges when the trailer-author differed from the committer. An existing FIXME asked for its removal. - `services/repository/files/temp_repo.go` paired it with `Co-authored-by:` on web-edit commits under the Committer / CollaboratorCommitter trust model. In both sites the two trailers carried the same signature value, so dropping `Co-committed-by:` loses no information. Gitea itself never read the trailer, and GitHub / GitLab / `git interpret-trailers` do not treat it specially. Also stop accepting `Co-committed-by:` in `parseCoAuthorTrailer`, update the trust-model locale descriptions in en-US to mention only `Co-authored-by:`, and adjust the affected unit tests. The `AddCoCommitterTrailers` setting and `ADD_CO_COMMITTER_TRAILERS` INI key are unchanged; they now control just the `Co-authored-by:` emission. Co-Authored-By: Claude (Opus 4.7) --- modules/git/commit.go | 14 +++++++------- modules/git/commit_test.go | 4 ++-- options/locale/locale_en-US.json | 4 ++-- services/pull/merge_squash.go | 2 -- services/repository/files/temp_repo.go | 7 +------ 5 files changed, 12 insertions(+), 19 deletions(-) diff --git a/modules/git/commit.go b/modules/git/commit.go index f22cacd4086f1..cbb9b9358ee0e 100644 --- a/modules/git/commit.go +++ b/modules/git/commit.go @@ -87,14 +87,14 @@ func isTrailerLineShape(line string) bool { return true } -// parseCoAuthorTrailer extracts a co-author from a `Co-authored-by:` or -// `Co-committed-by:` trailer (case-insensitive). Returns false on a malformed address. +// parseCoAuthorTrailer extracts a co-author from a `Co-authored-by:` trailer +// (case-insensitive). Returns false on a malformed address. func parseCoAuthorTrailer(line string) (*Signature, bool) { token, rest, ok := strings.Cut(line, ":") if !ok { return nil, false } - if !strings.EqualFold(token, "Co-authored-by") && !strings.EqualFold(token, "Co-committed-by") { + if !strings.EqualFold(token, "Co-authored-by") { return nil, false } addr, err := mail.ParseAddress(strings.TrimSpace(rest)) @@ -104,10 +104,10 @@ func parseCoAuthorTrailer(line string) (*Signature, bool) { return &Signature{Name: addr.Name, Email: strings.ToLower(addr.Address)}, true } -// parseCoAuthorSignatures parses `Co-authored-by:` and `Co-committed-by:` trailers -// from the trailing block of the commit message. Only the last paragraph is scanned -// (and it must contain only trailer-shaped lines) so in-body occurrences inside a -// revert or cherry-pick description are not misinterpreted as trailers. +// parseCoAuthorSignatures parses `Co-authored-by:` trailers from the trailing +// block of the commit message. Only the last paragraph is scanned (and it must +// contain only trailer-shaped lines) so in-body occurrences inside a revert or +// cherry-pick description are not misinterpreted as trailers. func (c *CommitMessage) parseCoAuthorSignatures() []*Signature { if c.coAuthorsParsed { return c.coAuthors diff --git a/modules/git/commit_test.go b/modules/git/commit_test.go index 90227c816aa00..85df3f07d7f98 100644 --- a/modules/git/commit_test.go +++ b/modules/git/commit_test.go @@ -227,7 +227,7 @@ func TestCoAuthorSignatures(t *testing.T) { }, { name: "case insensitive token", - body: "title\n\nCo-Authored-By: Jane \nco-committed-by: Bob ", + body: "title\n\nCo-Authored-By: Jane \nco-authored-by: Bob ", want: []Signature{ {Name: "Jane", Email: "jane@example.com"}, {Name: "Bob", Email: "bob@example.com"}, @@ -255,7 +255,7 @@ func TestCoAuthorSignatures(t *testing.T) { }, { name: "CRLF line endings", - body: "title\r\n\r\nCo-authored-by: Jane \r\nCo-committed-by: Bob ", + body: "title\r\n\r\nCo-authored-by: Jane \r\nCo-authored-by: Bob ", want: []Signature{ {Name: "Jane", Email: "jane@example.com"}, {Name: "Bob", Email: "bob@example.com"}, diff --git a/options/locale/locale_en-US.json b/options/locale/locale_en-US.json index 45494d4a7aeeb..7fe73d3ff1ec0 100644 --- a/options/locale/locale_en-US.json +++ b/options/locale/locale_en-US.json @@ -2200,10 +2200,10 @@ "repo.settings.trust_model.collaborator.desc": "Valid signatures by collaborators of this repository will be marked \"trusted\", whether they match the committer or not. Otherwise, valid signatures will be marked \"untrusted\" if the signature matches the committer and \"unmatched\" if not.", "repo.settings.trust_model.committer": "Committer", "repo.settings.trust_model.committer.long": "Committer: Trust signatures that match committers. This matches GitHub's behavior and will force commits signed by Gitea to have Gitea as the committer.", - "repo.settings.trust_model.committer.desc": "Valid signatures will only be marked \"trusted\" if they match the committer, otherwise they will be marked \"unmatched\". This forces Gitea to be the committer on signed commits, with the actual committer marked as Co-authored-by: and Co-committed-by: trailer in the commit. The default Gitea key must match a user in the database.", + "repo.settings.trust_model.committer.desc": "Valid signatures will only be marked \"trusted\" if they match the committer, otherwise they will be marked \"unmatched\". This forces Gitea to be the committer on signed commits, with the actual committer marked as a Co-authored-by: trailer in the commit. The default Gitea key must match a user in the database.", "repo.settings.trust_model.collaboratorcommitter": "Collaborator+Committer", "repo.settings.trust_model.collaboratorcommitter.long": "Collaborator+Committer: Trust signatures by collaborators which match the committer", - "repo.settings.trust_model.collaboratorcommitter.desc": "Valid signatures by collaborators of this repository will be marked \"trusted\" if they match the committer. Otherwise, valid signatures will be marked \"untrusted\" if the signature matches the committer and \"unmatched\" otherwise. This will force Gitea to be marked as the committer on signed commits, with the actual committer marked as Co-Authored-By: and Co-Committed-By: trailer in the commit. The default Gitea key must match a user in the database.", + "repo.settings.trust_model.collaboratorcommitter.desc": "Valid signatures by collaborators of this repository will be marked \"trusted\" if they match the committer. Otherwise, valid signatures will be marked \"untrusted\" if the signature matches the committer and \"unmatched\" otherwise. This will force Gitea to be marked as the committer on signed commits, with the actual committer marked as a Co-Authored-By: trailer in the commit. The default Gitea key must match a user in the database.", "repo.settings.wiki_delete": "Delete Wiki Data", "repo.settings.wiki_delete_desc": "Deleting repository wiki data is permanent and cannot be undone.", "repo.settings.wiki_delete_notices_1": "- This will permanently delete and disable the repository wiki for %s.", diff --git a/services/pull/merge_squash.go b/services/pull/merge_squash.go index 0f716f4d77113..093b80f1e36c6 100644 --- a/services/pull/merge_squash.go +++ b/services/pull/merge_squash.go @@ -65,9 +65,7 @@ func doMergeStyleSquash(ctx *mergeContext, message string) error { } if setting.Repository.PullRequest.AddCoCommitterTrailers && ctx.committer.String() != sig.String() { - // add trailer message = AddCommitMessageTailer(message, "Co-authored-by", sig.String()) - message = AddCommitMessageTailer(message, "Co-committed-by", sig.String()) // FIXME: this one should be removed, it is not really used or widely used } cmdCommit := gitcmd.NewCommand("commit"). AddOptionFormat("--author='%s <%s>'", sig.Name, sig.Email). diff --git a/services/repository/files/temp_repo.go b/services/repository/files/temp_repo.go index 5d5cc22513b42..60f3ee469cba1 100644 --- a/services/repository/files/temp_repo.go +++ b/services/repository/files/temp_repo.go @@ -300,12 +300,7 @@ func (t *TemporaryUploadRepository) CommitTree(ctx context.Context, opts *Commit cmdCommitTree.AddOptionFormat("-S%s", key.KeyID) if t.repo.GetTrustModel() == repo_model.CommitterTrustModel || t.repo.GetTrustModel() == repo_model.CollaboratorCommitterTrustModel { if committerSig.Name != authorSig.Name || committerSig.Email != authorSig.Email { - // Add trailers - _, _ = messageBytes.WriteString("\n") - _, _ = messageBytes.WriteString("Co-authored-by: ") - _, _ = messageBytes.WriteString(committerSig.String()) - _, _ = messageBytes.WriteString("\n") - _, _ = messageBytes.WriteString("Co-committed-by: ") + _, _ = messageBytes.WriteString("\nCo-authored-by: ") _, _ = messageBytes.WriteString(committerSig.String()) _, _ = messageBytes.WriteString("\n") } From 977f311027424d020dd2bb67c1559509cce0e97c Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 13 May 2026 04:30:33 +0200 Subject: [PATCH 10/18] refactor(repo): polish co-author surfaces per review - Search URL uses the commit-signature email (no spaces, matches `git log --author` substring on email) instead of name/username. `commitAuthorSearchURL` also rejects whitespace-containing values. - Authors popup tippy uses `trigger: 'click'` + `hideOnClick: true` to match the click-to-open menu pattern elsewhere. - Popup trigger is ``, locale.Tr("repo.commits.coauthor_people", len(coAuthors)+1)))) b.WriteString(`
`) b.WriteString(string(ut.participantRowHTML(authorUser, authorSig))) @@ -469,13 +475,33 @@ func (ut *RenderUtils) CoAuthorAvatars(authorUser *user_model.User, authorSig *g return template.HTML(b.String()) } -// authorNameLinkHTML renders a muted text link for an author. +// authorNameLinkHTML renders a muted text link for an author. In a repo+ref +// context it points at the commits-by-author search (keyed by signature email); +// otherwise it falls back to `GetShortDisplayNameLinkHTML` for matched users +// (preserving the alternate-name tooltip) or a `mailto:` link for unmatched. func (ut *RenderUtils) authorNameLinkHTML(u *user_model.User, sig *git.Signature) template.HTML { - href := ut.authorHref(u, sig) - if href == "" { + var email string + if sig != nil { + email = sig.Email + } else if u != nil { + email = u.Email + } + if href := ut.commitAuthorSearchURL(email); href != "" { + if u != nil { + return htmlutil.HTMLFormat(`%s`, href, u.GetDisplayName()) + } + return htmlutil.HTMLFormat(`%s`, href, sig.Name) + } + if u != nil { + return u.GetShortDisplayNameLinkHTML() + } + if sig == nil { return "" } - return htmlutil.HTMLFormat(`%s`, href, authorDisplayName(u, sig)) + if sig.Email != "" { + return htmlutil.HTMLFormat(`%s`, sig.Email, sig.Name) + } + return template.HTML(template.HTMLEscapeString(sig.Name)) } // participantRowHTML renders one row of the authors popup: avatar + name. diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl index cda0d297237e9..2d0cf640b9f45 100644 --- a/templates/repo/commit_page.tmpl +++ b/templates/repo/commit_page.tmpl @@ -161,10 +161,14 @@ {{range .CoAuthors}} {{if .GiteaUser}} {{ctx.AvatarUtils.Avatar .GiteaUser 20}} - {{.GiteaUser.GetDisplayName}} + {{.GiteaUser.GetDisplayName}} {{else}} {{ctx.AvatarUtils.AvatarByEmail .TrailerSignature.Email .TrailerSignature.Name 20}} - {{.TrailerSignature.Name}} + {{if .TrailerSignature.Email}} + {{.TrailerSignature.Name}} + {{else}} + {{.TrailerSignature.Name}} + {{end}} {{end}} {{end}}
diff --git a/tests/integration/repo_commits_test.go b/tests/integration/repo_commits_test.go index 3bcea83f43829..560a904480b84 100644 --- a/tests/integration/repo_commits_test.go +++ b/tests/integration/repo_commits_test.go @@ -42,7 +42,11 @@ func TestRepoCommits(t *testing.T) { userHrefs = append(userHrefs, s.AttrOr("href", "")) }) assert.Equal(t, []string{"69554a64c1e6030f051e5c3f94bfbd773cd6a324", "27566bd5738fc8b4e3fef3c5e72cce608537bd95", "5099b81332712fe655e34e8dd63574f503f61811"}, commits) - assert.Equal(t, []string{"/user2", "/user21", "/user2"}, userHrefs) + assert.Equal(t, []string{ + "/user2/repo16/commits/branch/master/search?q=author%3Auser2%40example.com", + "/user2/repo16/commits/branch/master/search?q=author%3Auser21%40example.com", + "/user2/repo16/commits/branch/master/search?q=author%3Auser2%40example.com", + }, userHrefs) }) t.Run("LastCommit", func(t *testing.T) { @@ -52,7 +56,7 @@ func TestRepoCommits(t *testing.T) { commitHref := doc.doc.Find(".latest-commit .commit-id-short").AttrOr("href", "") authorHref := doc.doc.Find(".latest-commit .author-wrapper a").AttrOr("href", "") assert.Equal(t, "/user2/repo16/commit/69554a64c1e6030f051e5c3f94bfbd773cd6a324", commitHref) - assert.Equal(t, "/user2", authorHref) + assert.Equal(t, "/user2/repo16/commits/branch/master/search?q=author%3Auser2%40example.com", authorHref) }) t.Run("CommitListNonExistingCommiter", func(t *testing.T) { diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 90ab7fe286599..89e3a3a40bb67 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -153,6 +153,12 @@ td .commit-summary { gap: 0.5em; } +/* use semibold for latest commit author */ +.latest-commit .author-wrapper > a, +.latest-commit .author-wrapper > .authors-popup-trigger { + font-weight: var(--font-weight-semibold); +} + @media (max-width: 767.98px) { .latest-commit .commit-id-short { display: none; @@ -1458,6 +1464,15 @@ tbody.commit-list { .authors-popup-trigger { cursor: pointer; + background: none; + border: none; + padding: 0; + font: inherit; + color: inherit; +} + +.authors-popup-trigger:hover { + color: var(--color-primary); } .authors-popup { diff --git a/web_src/js/features/repo-commit.ts b/web_src/js/features/repo-commit.ts index 843586d8fb084..44510bee25611 100644 --- a/web_src/js/features/repo-commit.ts +++ b/web_src/js/features/repo-commit.ts @@ -35,6 +35,8 @@ export function initAuthorsPopup() { interactive: true, role: 'dialog', theme: 'menu', + trigger: 'click', + hideOnClick: true, }); }); } From d6c2e4efe54264bd0859a1dc8c3f9bff058f71f6 Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 14 May 2026 05:42:30 +0200 Subject: [PATCH 11/18] refactor(repo): simplify avatar stack rendering Address review on 977f311027 and clean up several leftover rough edges: - Use util.NormalizeStringEOL and container.Set in the trailer parser - Switch util_render to htmlutil.HTMLBuilder - Move avatar/avatar-stack CSS to its own avatar.css - Drop the inline `--n` CSS-var trick and the 11 explicit z-index rules: emit children reversed and use flex-direction: row-reverse so the author lands leftmost AND last-painted (on top) - Drop dead additionalClasses param from AvatarStack; let .author-wrapper gap carry inter-item spacing - Collapse coAuthorsParsed+coAuthors cache pair into *[]*Signature - Extract git.CoAuthoredByTrailer, reuse in merge_squash, pull, temp_repo - Cache RepoLink/RefTypeNameSubURL on RenderUtils once instead of reading ctx.Data per call - Restore matched-user avatars on dashboard feed via PushCommit.AuthorUser (was a regression of the original AvatarStack switch) - Guard empty-href case in participantRowHTML; align authorNameLinkHTML email precedence with authorHref Co-Authored-By: Claude (Opus 4.7) --- modules/git/commit.go | 42 +++---- modules/repository/commits.go | 14 +++ modules/templates/util_render.go | 162 ++++++++++--------------- modules/templates/util_render_test.go | 9 +- services/pull/merge_squash.go | 2 +- services/pull/pull.go | 2 +- services/repository/files/temp_repo.go | 2 +- templates/repo/blame.tmpl | 2 +- templates/repo/commits_list_small.tmpl | 2 +- templates/user/dashboard/feeds.tmpl | 2 +- web_src/css/avatar.css | 109 +++++++++++++++++ web_src/css/base.css | 8 -- web_src/css/index.css | 1 + web_src/css/repo.css | 95 +-------------- 14 files changed, 219 insertions(+), 233 deletions(-) create mode 100644 web_src/css/avatar.css diff --git a/modules/git/commit.go b/modules/git/commit.go index cbb9b9358ee0e..c1039a62f5e69 100644 --- a/modules/git/commit.go +++ b/modules/git/commit.go @@ -13,17 +13,20 @@ import ( "strings" "code.gitea.io/gitea/modules/charset" + "code.gitea.io/gitea/modules/container" "code.gitea.io/gitea/modules/git/gitcmd" "code.gitea.io/gitea/modules/util" ) +// CoAuthoredByTrailer is the canonical token for the `Co-authored-by:` git trailer. +const CoAuthoredByTrailer = "Co-authored-by" + type CommitMessage struct { - MessageRaw string - messageUTF8 *string - messageTitle *string - messageBody *string - coAuthors []*Signature - coAuthorsParsed bool + MessageRaw string + messageUTF8 *string + messageTitle *string + messageBody *string + coAuthors *[]*Signature } // Commit represents a git commit. @@ -94,7 +97,7 @@ func parseCoAuthorTrailer(line string) (*Signature, bool) { if !ok { return nil, false } - if !strings.EqualFold(token, "Co-authored-by") { + if !strings.EqualFold(token, CoAuthoredByTrailer) { return nil, false } addr, err := mail.ParseAddress(strings.TrimSpace(rest)) @@ -109,15 +112,15 @@ func parseCoAuthorTrailer(line string) (*Signature, bool) { // contain only trailer-shaped lines) so in-body occurrences inside a revert or // cherry-pick description are not misinterpreted as trailers. func (c *CommitMessage) parseCoAuthorSignatures() []*Signature { - if c.coAuthorsParsed { - return c.coAuthors + if c.coAuthors != nil { + return *c.coAuthors } - body := strings.ReplaceAll(strings.TrimRight(c.MessageBody(), "\r\n"), "\r\n", "\n") + body := strings.TrimRight(util.NormalizeStringEOL(c.MessageBody()), "\n") if idx := strings.LastIndex(body, "\n\n"); idx >= 0 { body = body[idx+2:] } var sigs []*Signature - var seen map[string]struct{} + seen := container.Set[string]{} for line := range strings.SplitSeq(body, "\n") { if !isTrailerLineShape(line) { sigs = nil @@ -127,17 +130,12 @@ func (c *CommitMessage) parseCoAuthorSignatures() []*Signature { if !ok { continue } - if _, dup := seen[sig.Email]; dup { + if !seen.Add(sig.Email) { continue } - if seen == nil { - seen = make(map[string]struct{}) - } - seen[sig.Email] = struct{}{} sigs = append(sigs, sig) } - c.coAuthors = sigs - c.coAuthorsParsed = true + c.coAuthors = &sigs return sigs } @@ -148,16 +146,16 @@ func (c *Commit) CoAuthorSignatures() []*Signature { if len(raw) == 0 { return raw } - exclude := make(map[string]struct{}) + exclude := container.Set[string]{} if c.Author != nil { - exclude[strings.ToLower(strings.TrimSpace(c.Author.Email))] = struct{}{} + exclude.Add(strings.ToLower(strings.TrimSpace(c.Author.Email))) } if c.Committer != nil { - exclude[strings.ToLower(strings.TrimSpace(c.Committer.Email))] = struct{}{} + exclude.Add(strings.ToLower(strings.TrimSpace(c.Committer.Email))) } out := make([]*Signature, 0, len(raw)) for _, sig := range raw { - if _, skip := exclude[sig.Email]; skip { + if exclude.Contains(sig.Email) { continue } out = append(out, sig) diff --git a/modules/repository/commits.go b/modules/repository/commits.go index 93550b0e22f3f..e5e3ef45f7303 100644 --- a/modules/repository/commits.go +++ b/modules/repository/commits.go @@ -168,6 +168,20 @@ func (pc *PushCommit) AuthorSignature() *git.Signature { return &git.Signature{Email: pc.AuthorEmail, Name: pc.AuthorName} } +// AuthorUser resolves the author email to a Gitea user via per-request cache, nil if no match. +func (pc *PushCommit) AuthorUser(ctx context.Context) *user_model.User { + u, err := cache.GetWithContextCache(ctx, cachegroup.User, "email:"+pc.AuthorEmail, func(ctx context.Context, _ string) (*user_model.User, error) { + return user_model.GetUserByEmail(ctx, pc.AuthorEmail) + }) + if err != nil { + if !user_model.IsErrUserNotExist(err) { + log.Error("GetUserByEmail: %v", err) + } + return nil + } + return u +} + // CoAuthorUsers returns co-authors in the template view shape, without resolved Gitea users. func (pc *PushCommit) CoAuthorUsers() []*user_model.CoAuthorUser { if len(pc.CoAuthors) == 0 { diff --git a/modules/templates/util_render.go b/modules/templates/util_render.go index 2627d1d859182..5736d977db019 100644 --- a/modules/templates/util_render.go +++ b/modules/templates/util_render.go @@ -10,6 +10,7 @@ import ( "math" "net/url" "regexp" + "slices" "strings" "unicode" @@ -33,11 +34,16 @@ import ( ) type RenderUtils struct { - ctx reqctx.RequestContext + ctx reqctx.RequestContext + repoLink string + refSubURL string } func NewRenderUtils(ctx reqctx.RequestContext) *RenderUtils { - return &RenderUtils{ctx: ctx} + data := ctx.GetData() + repoLink, _ := data["RepoLink"].(string) + refSubURL, _ := data["RefTypeNameSubURL"].(string) + return &RenderUtils{ctx: ctx, repoLink: repoLink, refSubURL: refSubURL} } // RenderCommitMessage renders commit message with XSS-safe and special links. @@ -327,33 +333,29 @@ func (ut *RenderUtils) RenderUnicodeEscapeToggleTd(combined, escapeStatus *chars return `` + ut.RenderUnicodeEscapeToggleButton(escapeStatus) + `` } -// commitAuthorSearchURL builds the repo's commits-by-author search URL. Returns -// empty when no repo/ref context is present or when the value would not survive -// the search parser (it splits on whitespace via strings.FieldsSeq). +// commitAuthorSearchURL rejects whitespace because the search parser splits on it. func (ut *RenderUtils) commitAuthorSearchURL(value string) template.URL { if value == "" || strings.ContainsAny(value, " \t\r\n") { return "" } - data := ut.ctx.GetData() - repoLink, _ := data["RepoLink"].(string) - refSubURL, _ := data["RefTypeNameSubURL"].(string) - if repoLink == "" || refSubURL == "" { + if ut.repoLink == "" || ut.refSubURL == "" { return "" } - return template.URL(repoLink + "/commits/" + refSubURL + "/search?q=" + url.QueryEscape("author:"+value)) + return template.URL(ut.repoLink + "/commits/" + ut.refSubURL + "/search?q=" + url.QueryEscape("author:"+value)) } -// authorHref picks the most-relevant link target for an author. The search -// query uses the commit's signature email (no spaces, matches `git log -// --author` substring on email) over username/display name. Falls back to the -// user profile (matched) or mailto (unmatched). -func (ut *RenderUtils) authorHref(u *user_model.User, sig *git.Signature) template.URL { - var searchValue, fallback string +func authorSearchEmail(u *user_model.User, sig *git.Signature) string { if sig != nil && sig.Email != "" { - searchValue = sig.Email - } else if u != nil { - searchValue = u.Email + return sig.Email + } + if u != nil { + return u.Email } + return "" +} + +func (ut *RenderUtils) authorHref(u *user_model.User, sig *git.Signature) template.URL { + var fallback string switch { case u != nil: fallback = u.HomeLink() @@ -362,13 +364,12 @@ func (ut *RenderUtils) authorHref(u *user_model.User, sig *git.Signature) templa default: return "" } - if href := ut.commitAuthorSearchURL(searchValue); href != "" { + if href := ut.commitAuthorSearchURL(authorSearchEmail(u, sig)); href != "" { return href } return template.URL(fallback) } -// authorAvatar returns the 20px avatar HTML for a matched user or git signature. func (ut *RenderUtils) authorAvatar(u *user_model.User, sig *git.Signature) template.HTML { au := NewAvatarUtils(ut.ctx) if u != nil { @@ -377,7 +378,6 @@ func (ut *RenderUtils) authorAvatar(u *user_model.User, sig *git.Signature) temp return au.AvatarByEmail(sig.Email, sig.Name, 20) } -// authorDisplayName returns the display name for a matched user or git signature. func authorDisplayName(u *user_model.User, sig *git.Signature) string { if u != nil { return u.GetDisplayName() @@ -385,18 +385,13 @@ func authorDisplayName(u *user_model.User, sig *git.Signature) string { return sig.Name } -// AvatarStack renders an avatar stack. Returns empty when no author is provided. -// Each stack child carries inline `--n` so the CSS can drive z-index and the hover spread. -func (ut *RenderUtils) AvatarStack(authorUser *user_model.User, authorSig *git.Signature, coAuthors []*user_model.CoAuthorUser, additionalClasses string) template.HTML { +// AvatarStack emits children in reverse paint order so CSS `flex-direction: row-reverse` places the author leftmost and last-painted (on top). +func (ut *RenderUtils) AvatarStack(authorUser *user_model.User, authorSig *git.Signature, coAuthors []*user_model.CoAuthorUser) template.HTML { if authorUser == nil && authorSig == nil { return "" } if len(coAuthors) == 0 { - au := NewAvatarUtils(ut.ctx) - if authorUser != nil { - return au.Avatar(authorUser, 20, additionalClasses) - } - return au.AvatarByEmail(authorSig.Email, authorSig.Name, 20, additionalClasses) + return ut.authorAvatar(authorUser, authorSig) } const maxCo = 9 @@ -407,90 +402,64 @@ func (ut *RenderUtils) AvatarStack(authorUser *user_model.User, authorSig *git.S overflow = len(coAuthors) - maxCo } - stackClass := "avatar-stack" - if additionalClasses != "" { - stackClass += " " + additionalClasses - } - - var b strings.Builder - b.WriteString(string(htmlutil.HTMLFormat(``, stackClass))) + var b htmlutil.HTMLBuilder + b.WriteHTML(``) - appendChild := func(idx int, u *user_model.User, sig *git.Signature) { - avatar := ut.authorAvatar(u, sig) - if href := ut.authorHref(u, sig); href != "" { - b.WriteString(string(htmlutil.HTMLFormat(`%s`, href, idx, avatar))) - } else { - b.WriteString(string(htmlutil.HTMLFormat(`%s`, idx, avatar))) - } + if overflow > 0 { + b.WriteFormat(`+%d`, overflow, overflow) } - - appendChild(0, authorUser, authorSig) - for i, co := range visibleCo { - appendChild(i+1, co.GiteaUser, co.TrailerSignature) + for _, co := range slices.Backward(visibleCo) { + ut.appendAvatarStackChild(&b, co.GiteaUser, co.TrailerSignature) } + ut.appendAvatarStackChild(&b, authorUser, authorSig) - if overflow > 0 { - b.WriteString(string(htmlutil.HTMLFormat( - `+%d`, - len(visibleCo)+1, overflow, overflow))) - } + b.WriteHTML(``) + return b.HTMLString() +} - b.WriteString(``) - return template.HTML(b.String()) +func (ut *RenderUtils) appendAvatarStackChild(b *htmlutil.HTMLBuilder, u *user_model.User, sig *git.Signature) { + avatar := ut.authorAvatar(u, sig) + if href := ut.authorHref(u, sig); href != "" { + b.WriteFormat(`%s`, href, avatar) + } else { + b.WriteFormat(`%s`, avatar) + } } -// CoAuthorAvatars renders the avatar stack plus descriptive label. -// 1 author: name; 2 total: ` and `; 3+ total: ` people` opens a tippy popup. +// CoAuthorAvatars renders the avatar stack plus a label: `name` / `a and b` / `N people` (opens popup). func (ut *RenderUtils) CoAuthorAvatars(authorUser *user_model.User, authorSig *git.Signature, coAuthors []*user_model.CoAuthorUser) template.HTML { locale := ut.ctx.Value(translation.ContextKey).(translation.Locale) - stackClass := "" - if len(coAuthors) == 0 { - stackClass = "tw-mr-1" - } - var b strings.Builder - b.WriteString(``) - b.WriteString(string(ut.AvatarStack(authorUser, authorSig, coAuthors, stackClass))) + var b htmlutil.HTMLBuilder + b.WriteHTML(``) + b.WriteHTML(ut.AvatarStack(authorUser, authorSig, coAuthors)) switch len(coAuthors) { case 0: - b.WriteString(string(ut.authorNameLinkHTML(authorUser, authorSig))) + b.WriteHTML(ut.authorNameLinkHTML(authorUser, authorSig)) case 1: - b.WriteString(string(ut.authorNameLinkHTML(authorUser, authorSig))) - b.WriteString(string(htmlutil.HTMLFormat(`%s`, locale.Tr("repo.commits.coauthor_and")))) - b.WriteString(string(ut.authorNameLinkHTML(coAuthors[0].GiteaUser, coAuthors[0].TrailerSignature))) + b.WriteHTML(ut.authorNameLinkHTML(authorUser, authorSig)) + b.WriteFormat(`%s`, locale.Tr("repo.commits.coauthor_and")) + b.WriteHTML(ut.authorNameLinkHTML(coAuthors[0].GiteaUser, coAuthors[0].TrailerSignature)) default: - b.WriteString(string(htmlutil.HTMLFormat( - ``, - locale.Tr("repo.commits.coauthor_people", len(coAuthors)+1)))) - b.WriteString(`
`) - b.WriteString(string(ut.participantRowHTML(authorUser, authorSig))) + b.WriteFormat(``, + locale.Tr("repo.commits.coauthor_people", len(coAuthors)+1)) + b.WriteHTML(`
`) + b.WriteHTML(ut.participantRowHTML(authorUser, authorSig)) for _, co := range coAuthors { - b.WriteString(string(ut.participantRowHTML(co.GiteaUser, co.TrailerSignature))) + b.WriteHTML(ut.participantRowHTML(co.GiteaUser, co.TrailerSignature)) } - b.WriteString(`
`) + b.WriteHTML(`
`) } - b.WriteString(``) - return template.HTML(b.String()) + b.WriteHTML(``) + return b.HTMLString() } -// authorNameLinkHTML renders a muted text link for an author. In a repo+ref -// context it points at the commits-by-author search (keyed by signature email); -// otherwise it falls back to `GetShortDisplayNameLinkHTML` for matched users -// (preserving the alternate-name tooltip) or a `mailto:` link for unmatched. +// authorNameLinkHTML prefers (in order): commits-by-author search, `GetShortDisplayNameLinkHTML` (keeps alt-name tooltip), `mailto:`, bare name. func (ut *RenderUtils) authorNameLinkHTML(u *user_model.User, sig *git.Signature) template.HTML { - var email string - if sig != nil { - email = sig.Email - } else if u != nil { - email = u.Email - } - if href := ut.commitAuthorSearchURL(email); href != "" { - if u != nil { - return htmlutil.HTMLFormat(`%s`, href, u.GetDisplayName()) - } - return htmlutil.HTMLFormat(`%s`, href, sig.Name) + if href := ut.commitAuthorSearchURL(authorSearchEmail(u, sig)); href != "" { + return htmlutil.HTMLFormat(`%s`, href, authorDisplayName(u, sig)) } if u != nil { return u.GetShortDisplayNameLinkHTML() @@ -504,8 +473,11 @@ func (ut *RenderUtils) authorNameLinkHTML(u *user_model.User, sig *git.Signature return template.HTML(template.HTMLEscapeString(sig.Name)) } -// participantRowHTML renders one row of the authors popup: avatar + name. func (ut *RenderUtils) participantRowHTML(u *user_model.User, sig *git.Signature) template.HTML { - return htmlutil.HTMLFormat(`%s%s`, - ut.authorHref(u, sig), ut.authorAvatar(u, sig), authorDisplayName(u, sig)) + avatar := ut.authorAvatar(u, sig) + name := authorDisplayName(u, sig) + if href := ut.authorHref(u, sig); href != "" { + return htmlutil.HTMLFormat(`%s%s`, href, avatar, name) + } + return htmlutil.HTMLFormat(`%s%s`, avatar, name) } diff --git a/modules/templates/util_render_test.go b/modules/templates/util_render_test.go index b4b6863d7dceb..23bb7e179b73c 100644 --- a/modules/templates/util_render_test.go +++ b/modules/templates/util_render_test.go @@ -288,15 +288,8 @@ func TestCoAuthorAvatars(t *testing.T) { for i := range cos { cos[i] = mkCo("X", "x@example.com") } - got := string(ut.AvatarStack(nil, authorSig, cos, "")) + got := string(ut.AvatarStack(nil, authorSig, cos)) assert.Contains(t, got, `class="avatar-stack-overflow-chip`) assert.Contains(t, got, "+1") }) - - t.Run("each stack child carries inline --n", func(t *testing.T) { - got := string(ut.AvatarStack(nil, authorSig, - []*user_model.CoAuthorUser{mkCo("Bob", "bob@example.com")}, "")) - assert.Contains(t, got, `style="--n:0"`) - assert.Contains(t, got, `style="--n:1"`) - }) } diff --git a/services/pull/merge_squash.go b/services/pull/merge_squash.go index 093b80f1e36c6..25b23f7709b5c 100644 --- a/services/pull/merge_squash.go +++ b/services/pull/merge_squash.go @@ -65,7 +65,7 @@ func doMergeStyleSquash(ctx *mergeContext, message string) error { } if setting.Repository.PullRequest.AddCoCommitterTrailers && ctx.committer.String() != sig.String() { - message = AddCommitMessageTailer(message, "Co-authored-by", sig.String()) + message = AddCommitMessageTailer(message, git.CoAuthoredByTrailer, sig.String()) } cmdCommit := gitcmd.NewCommand("commit"). AddOptionFormat("--author='%s <%s>'", sig.Name, sig.Email). diff --git a/services/pull/pull.go b/services/pull/pull.go index 4f76df31daca6..a86d17c538b48 100644 --- a/services/pull/pull.go +++ b/services/pull/pull.go @@ -917,7 +917,7 @@ func GetSquashMergeCommitMessages(ctx context.Context, pr *issues_model.PullRequ } for _, author := range authors { - stringBuilder.WriteString("Co-authored-by: ") + stringBuilder.WriteString(git.CoAuthoredByTrailer + ": ") stringBuilder.WriteString(author) stringBuilder.WriteRune('\n') } diff --git a/services/repository/files/temp_repo.go b/services/repository/files/temp_repo.go index 60f3ee469cba1..7f5cbe9bae376 100644 --- a/services/repository/files/temp_repo.go +++ b/services/repository/files/temp_repo.go @@ -300,7 +300,7 @@ func (t *TemporaryUploadRepository) CommitTree(ctx context.Context, opts *Commit cmdCommitTree.AddOptionFormat("-S%s", key.KeyID) if t.repo.GetTrustModel() == repo_model.CommitterTrustModel || t.repo.GetTrustModel() == repo_model.CollaboratorCommitterTrustModel { if committerSig.Name != authorSig.Name || committerSig.Email != authorSig.Email { - _, _ = messageBytes.WriteString("\nCo-authored-by: ") + _, _ = messageBytes.WriteString("\n" + git.CoAuthoredByTrailer + ": ") _, _ = messageBytes.WriteString(committerSig.String()) _, _ = messageBytes.WriteString("\n") } diff --git a/templates/repo/blame.tmpl b/templates/repo/blame.tmpl index 67585a27f5130..06caaafc747fb 100644 --- a/templates/repo/blame.tmpl +++ b/templates/repo/blame.tmpl @@ -43,7 +43,7 @@
- {{ctx.RenderUtils.AvatarStack $row.AuthorUser $row.Author $row.CoAuthors ""}} + {{ctx.RenderUtils.AvatarStack $row.AuthorUser $row.Author $row.CoAuthors}}
{{ctx.RenderUtils.RenderCommitMessageLinkSubject $row.CommitMessage $row.CommitURL $.Repository}} diff --git a/templates/repo/commits_list_small.tmpl b/templates/repo/commits_list_small.tmpl index bf174070b1168..df00f5415f2e8 100644 --- a/templates/repo/commits_list_small.tmpl +++ b/templates/repo/commits_list_small.tmpl @@ -5,7 +5,7 @@ {{$index = Eval $index "+" 1}}
{{/*singular-commit*/}} {{svg "octicon-git-commit"}} - {{ctx.RenderUtils.AvatarStack .User .Author .CoAuthors ""}} + {{ctx.RenderUtils.AvatarStack .User .Author .CoAuthors}} {{$commitBaseLink := printf "%s/commit" $.comment.Issue.PullRequest.BaseRepo.Link}} {{$commitLink:= printf "%s/%s" $commitBaseLink (PathEscape .ID.String)}} diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index 35467fdbd7653..fbf47fb53f54f 100644 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -91,7 +91,7 @@ {{range $pushCommit := $push.Commits}} {{$commitLink := printf "%s/commit/%s" $repoLink .Sha1}}
- {{ctx.RenderUtils.AvatarStack nil .AuthorSignature .CoAuthorUsers ""}} + {{ctx.RenderUtils.AvatarStack (.AuthorUser ctx) .AuthorSignature .CoAuthorUsers}} {{ShortSha .Sha1}} {{ctx.RenderUtils.RenderCommitMessage $pushCommit.Message $repo}} diff --git a/web_src/css/avatar.css b/web_src/css/avatar.css new file mode 100644 index 0000000000000..2e84870a8db56 --- /dev/null +++ b/web_src/css/avatar.css @@ -0,0 +1,109 @@ +img.ui.avatar, +.ui.avatar img, +.ui.avatar svg { + border-radius: var(--border-radius); + object-fit: contain; + aspect-ratio: 1; +} + +.author-wrapper { + display: inline-flex; + align-items: center; + align-self: center; + gap: 4px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + max-width: 240px; + vertical-align: middle; +} + +/* use semibold for latest commit author */ +.latest-commit .author-wrapper > a, +.latest-commit .author-wrapper > .authors-popup-trigger { + font-weight: var(--font-weight-semibold); +} + +/* template emits children reversed; row-reverse re-orders visually and keeps the author last-painted (on top) */ +.avatar-stack { + display: inline-flex; + align-items: center; + flex-direction: row-reverse; +} + +.avatar-stack > * { + margin-left: -16px; + transition: transform 0.15s ease; + position: relative; + display: inline-flex; + border-radius: 50%; +} + +.avatar-stack > *:last-child { margin-left: 0; } +.avatar-stack > *:nth-last-child(2) { margin-left: -14px; } + +/* hover spreads via transform (no layout shift); positions count from visual-left = last DOM child = :nth-last-child */ +.avatar-stack:hover > *:nth-last-child(2) { transform: translateX(14px); } +.avatar-stack:hover > *:nth-last-child(3) { transform: translateX(30px); } +.avatar-stack:hover > *:nth-last-child(4) { transform: translateX(46px); } +.avatar-stack:hover > *:nth-last-child(5) { transform: translateX(62px); } +.avatar-stack:hover > *:nth-last-child(6) { transform: translateX(78px); } +.avatar-stack:hover > *:nth-last-child(7) { transform: translateX(94px); } +.avatar-stack:hover > *:nth-last-child(8) { transform: translateX(110px); } +.avatar-stack:hover > *:nth-last-child(9) { transform: translateX(126px); } +.avatar-stack:hover > *:nth-last-child(10) { transform: translateX(142px); } +.avatar-stack:hover > *:nth-last-child(11) { transform: translateX(158px); } + +.avatar-stack .avatar { + border: 2px solid var(--color-body); + background: var(--color-body); + border-radius: 50%; +} + +.avatar-stack-overflow-chip { + display: inline-flex; + align-items: center; + justify-content: center; + width: 20px; + height: 20px; + font-weight: var(--font-weight-semibold); + border: 2px solid var(--color-body); + border-radius: 50%; + background: var(--color-secondary); + color: var(--color-text); +} + +.authors-popup-trigger { + cursor: pointer; + background: none; + border: none; + padding: 0; + font: inherit; + color: inherit; +} + +.authors-popup-trigger:hover { + color: var(--color-primary); +} + +.authors-popup { + min-width: 200px; + display: flex; + flex-direction: column; + padding: 4px 0; +} + +.authors-popup > a { + padding: 6px 12px; + gap: 8px; +} + +.authors-popup > a:hover { + background: var(--color-hover); +} + +@media (max-width: 767.98px) { + .author-wrapper { + max-width: 80px; + } +} diff --git a/web_src/css/base.css b/web_src/css/base.css index 6724fced7b36c..e406e10542b70 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -389,14 +389,6 @@ a.label, color: var(--color-text-light-2); } -img.ui.avatar, -.ui.avatar img, -.ui.avatar svg { - border-radius: var(--border-radius); - object-fit: contain; - aspect-ratio: 1; -} - .full.height { flex-grow: 1; padding-bottom: var(--page-space-bottom); diff --git a/web_src/css/index.css b/web_src/css/index.css index 06f7101af95a4..988ae5d1efcfe 100644 --- a/web_src/css/index.css +++ b/web_src/css/index.css @@ -56,6 +56,7 @@ @import "./font_i18n.css"; @import "./base.css"; +@import "./avatar.css"; @import "./home.css"; @import "./install.css"; diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 89e3a3a40bb67..c42b227b4a328 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -153,12 +153,6 @@ td .commit-summary { gap: 0.5em; } -/* use semibold for latest commit author */ -.latest-commit .author-wrapper > a, -.latest-commit .author-wrapper > .authors-popup-trigger { - font-weight: var(--font-weight-semibold); -} - @media (max-width: 767.98px) { .latest-commit .commit-id-short { display: none; @@ -1399,8 +1393,7 @@ tbody.commit-list { vertical-align: baseline; } -.message-wrapper, -.author-wrapper { +.message-wrapper { overflow: hidden; text-overflow: ellipsis; max-width: 100%; @@ -1408,89 +1401,6 @@ tbody.commit-list { vertical-align: middle; } -.author-wrapper { - max-width: 240px; - align-self: center; - white-space: nowrap; - display: inline-flex; - align-items: center; -} - -.avatar-stack { - display: inline-flex; - align-items: center; -} - -/* inline --n on each child drives z-index and the hover spread */ -.avatar-stack > * { - margin-left: -16px; - transition: transform 0.15s ease; - position: relative; - display: inline-flex; - border-radius: 50%; - z-index: calc(100 - var(--n, 0)); -} - -.avatar-stack > *:first-child { - margin-left: 0; -} - -.avatar-stack > *:nth-child(2) { - margin-left: -14px; -} - -.avatar-stack:hover > * { - transform: translateX(max(0px, calc(14px + (var(--n, 0) - 1) * 16px))); -} - -.avatar-stack .avatar { - border: 2px solid var(--color-body); - background: var(--color-body); - border-radius: 50%; -} - -.avatar-stack-overflow-chip { - display: inline-flex; - align-items: center; - justify-content: center; - width: 20px; - height: 20px; - font-weight: var(--font-weight-semibold); - border: 2px solid var(--color-body); - border-radius: 50%; - background: var(--color-secondary); - color: var(--color-text); -} - -.authors-popup-trigger { - cursor: pointer; - background: none; - border: none; - padding: 0; - font: inherit; - color: inherit; -} - -.authors-popup-trigger:hover { - color: var(--color-primary); -} - -.authors-popup { - min-width: 200px; - display: flex; - flex-direction: column; - padding: 4px 0; -} - -.authors-popup > a { - padding: 6px 12px; - gap: 8px; -} - -.authors-popup > a:hover { - background: var(--color-hover); -} - .latest-commit .message-wrapper { max-width: calc(100% - 2.5rem); } @@ -1505,9 +1415,6 @@ tbody.commit-list { tr.commit-list { width: 100%; } - .author-wrapper { - max-width: 80px; - } } @media (min-width: 768px) and (max-width: 991.98px) { From dcbb05147ef0ec803a0d368978a6b9bb8d35eb85 Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 14 May 2026 05:57:57 +0200 Subject: [PATCH 12/18] perf(repo): cache no-match result in PushCommit.AuthorUser GetWithContextCache only stores on success, so unmatched author emails re-queried the DB on every PushCommit render across a feed. Drop the helper and use the ephemeral cache directly so the nil result is cached for the rest of the request. Co-Authored-By: Claude (Opus 4.7) --- modules/repository/commits.go | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/modules/repository/commits.go b/modules/repository/commits.go index e5e3ef45f7303..a91cec34a6c36 100644 --- a/modules/repository/commits.go +++ b/modules/repository/commits.go @@ -170,14 +170,23 @@ func (pc *PushCommit) AuthorSignature() *git.Signature { // AuthorUser resolves the author email to a Gitea user via per-request cache, nil if no match. func (pc *PushCommit) AuthorUser(ctx context.Context) *user_model.User { - u, err := cache.GetWithContextCache(ctx, cachegroup.User, "email:"+pc.AuthorEmail, func(ctx context.Context, _ string) (*user_model.User, error) { - return user_model.GetUserByEmail(ctx, pc.AuthorEmail) - }) + c := cache.GetContextCache(ctx) + key := "email:" + pc.AuthorEmail + if c != nil { + if v, has := c.Get(cachegroup.User, key); has { + u, _ := v.(*user_model.User) + return u + } + } + u, err := user_model.GetUserByEmail(ctx, pc.AuthorEmail) if err != nil { if !user_model.IsErrUserNotExist(err) { log.Error("GetUserByEmail: %v", err) } - return nil + u = nil + } + if c != nil { + c.Put(cachegroup.User, key, u) } return u } From 241b801d6764c8a5b5f9aa5ac140f964641a3930 Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 14 May 2026 06:26:03 +0200 Subject: [PATCH 13/18] fix(repo): address copilot review on dcbb05147e - RenderUtils is constructed before the repo middleware runs, so caching RepoLink/RefTypeNameSubURL in the constructor snapshotted empty values and commitAuthorSearchURL never produced a search link on repo pages. Read them lazily from ctx.Data inside the helper. - AvatarStack short-circuited the single-author case to a bare , regressing click-through on call sites that use it directly (commits_list_small, blame, dashboard feeds). Drop the short-circuit so the avatar is always wrapped via appendAvatarStackChild. - Narrow integration selector to a.muted now that .author-wrapper holds both the avatar link and the name link. - Drop a redundant u = nil reset in PushCommit.AuthorUser: GetUserByEmail already returns (nil, err) on every error path. Co-Authored-By: Claude (Opus 4.7) --- modules/repository/commits.go | 7 ++----- modules/templates/util_render.go | 19 +++++++------------ modules/templates/util_render_test.go | 1 - tests/integration/repo_commits_test.go | 2 +- 4 files changed, 10 insertions(+), 19 deletions(-) diff --git a/modules/repository/commits.go b/modules/repository/commits.go index a91cec34a6c36..3a0253ccb1802 100644 --- a/modules/repository/commits.go +++ b/modules/repository/commits.go @@ -179,11 +179,8 @@ func (pc *PushCommit) AuthorUser(ctx context.Context) *user_model.User { } } u, err := user_model.GetUserByEmail(ctx, pc.AuthorEmail) - if err != nil { - if !user_model.IsErrUserNotExist(err) { - log.Error("GetUserByEmail: %v", err) - } - u = nil + if err != nil && !user_model.IsErrUserNotExist(err) { + log.Error("GetUserByEmail: %v", err) } if c != nil { c.Put(cachegroup.User, key, u) diff --git a/modules/templates/util_render.go b/modules/templates/util_render.go index 5736d977db019..bf465b0ef9fed 100644 --- a/modules/templates/util_render.go +++ b/modules/templates/util_render.go @@ -34,16 +34,11 @@ import ( ) type RenderUtils struct { - ctx reqctx.RequestContext - repoLink string - refSubURL string + ctx reqctx.RequestContext } func NewRenderUtils(ctx reqctx.RequestContext) *RenderUtils { - data := ctx.GetData() - repoLink, _ := data["RepoLink"].(string) - refSubURL, _ := data["RefTypeNameSubURL"].(string) - return &RenderUtils{ctx: ctx, repoLink: repoLink, refSubURL: refSubURL} + return &RenderUtils{ctx: ctx} } // RenderCommitMessage renders commit message with XSS-safe and special links. @@ -338,10 +333,13 @@ func (ut *RenderUtils) commitAuthorSearchURL(value string) template.URL { if value == "" || strings.ContainsAny(value, " \t\r\n") { return "" } - if ut.repoLink == "" || ut.refSubURL == "" { + data := ut.ctx.GetData() + repoLink, _ := data["RepoLink"].(string) + refSubURL, _ := data["RefTypeNameSubURL"].(string) + if repoLink == "" || refSubURL == "" { return "" } - return template.URL(ut.repoLink + "/commits/" + ut.refSubURL + "/search?q=" + url.QueryEscape("author:"+value)) + return template.URL(repoLink + "/commits/" + refSubURL + "/search?q=" + url.QueryEscape("author:"+value)) } func authorSearchEmail(u *user_model.User, sig *git.Signature) string { @@ -390,9 +388,6 @@ func (ut *RenderUtils) AvatarStack(authorUser *user_model.User, authorSig *git.S if authorUser == nil && authorSig == nil { return "" } - if len(coAuthors) == 0 { - return ut.authorAvatar(authorUser, authorSig) - } const maxCo = 9 visibleCo := coAuthors diff --git a/modules/templates/util_render_test.go b/modules/templates/util_render_test.go index 23bb7e179b73c..4211123848beb 100644 --- a/modules/templates/util_render_test.go +++ b/modules/templates/util_render_test.go @@ -250,7 +250,6 @@ func TestCoAuthorAvatars(t *testing.T) { assert.Contains(t, got, "Alice") assert.NotContains(t, got, "coauthor_and") assert.NotContains(t, got, "coauthor_people") - assert.NotContains(t, got, "avatar-stack") }) t.Run("single co-author uses and label", func(t *testing.T) { diff --git a/tests/integration/repo_commits_test.go b/tests/integration/repo_commits_test.go index 560a904480b84..6f58244774ab4 100644 --- a/tests/integration/repo_commits_test.go +++ b/tests/integration/repo_commits_test.go @@ -38,7 +38,7 @@ func TestRepoCommits(t *testing.T) { doc.doc.Find("#commits-table .commit-id-short").Each(func(i int, s *goquery.Selection) { commits = append(commits, path.Base(s.AttrOr("href", ""))) }) - doc.doc.Find("#commits-table .author-wrapper a").Each(func(i int, s *goquery.Selection) { + doc.doc.Find("#commits-table .author-wrapper a.muted").Each(func(i int, s *goquery.Selection) { userHrefs = append(userHrefs, s.AttrOr("href", "")) }) assert.Equal(t, []string{"69554a64c1e6030f051e5c3f94bfbd773cd6a324", "27566bd5738fc8b4e3fef3c5e72cce608537bd95", "5099b81332712fe655e34e8dd63574f503f61811"}, commits) From aae73c9cbe603202f4ff86f82e9ac8313200abc3 Mon Sep 17 00:00:00 2001 From: silverwind Date: Sun, 17 May 2026 07:49:49 +0200 Subject: [PATCH 14/18] fix(repo): refine avatar stack hover and dark-mode appearance - 1px masking border (was 2px); drop forced circular `border-radius: 50%` so avatars keep their natural shape - on hover, transition border-color and background-color of `.avatar` to transparent since stacked avatars no longer overlap when spread - chip uses `var(--border-radius)`, hidden idle via `opacity: 0`, fades in on `.avatar-stack:hover` - move overflow/ellipsis from `.author-wrapper` onto its name children so the hover-spread is no longer clipped with 10+ authors - vary devtest scenarios so the author avatar isn't always u0/first Co-Authored-By: Claude (Opus 4.7) --- routers/web/devtest/devtest.go | 6 +++--- web_src/css/avatar.css | 29 ++++++++++++++++++++--------- 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/routers/web/devtest/devtest.go b/routers/web/devtest/devtest.go index b412c6fdf2d29..87201f28801de 100644 --- a/routers/web/devtest/devtest.go +++ b/routers/web/devtest/devtest.go @@ -201,11 +201,11 @@ func prepareMockDataCoAuthorAvatars(ctx *context.Context) { {Label: "unlinked author, no co-authors", AuthorSig: &git.Signature{Name: "External Contributor", Email: "external@example.com"}}, {Label: "1 linked co-author", AuthorUser: u0, AuthorSig: authorSig(u0), CoAuthors: []*user_model.CoAuthorUser{coLinked(u1)}}, {Label: "1 unlinked co-author", AuthorUser: u0, AuthorSig: authorSig(u0), CoAuthors: []*user_model.CoAuthorUser{coUnlinked("Bob Smith", "bob@example.com")}}, - {Label: "2 co-authors (3 people)", AuthorUser: u0, AuthorSig: authorSig(u0), CoAuthors: []*user_model.CoAuthorUser{coLinked(u1), coUnlinked("Bob Smith", "bob@example.com")}}, + {Label: "2 co-authors (3 people), u1 author", AuthorUser: u1, AuthorSig: authorSig(u1), CoAuthors: []*user_model.CoAuthorUser{coLinked(u0), coUnlinked("Bob Smith", "bob@example.com")}}, {Label: "3 co-authors mixed (4 people)", AuthorUser: u0, AuthorSig: authorSig(u0), CoAuthors: []*user_model.CoAuthorUser{coLinked(u1), coLinked(u2), coUnlinked("Bob Smith", "bob@example.com")}}, - {Label: "9 co-authors (max visible, no overflow)", AuthorUser: u0, AuthorSig: authorSig(u0), CoAuthors: nUnlinked(9)}, + {Label: "9 co-authors (max visible, no overflow), u2 author", AuthorUser: u2, AuthorSig: authorSig(u2), CoAuthors: nUnlinked(9)}, {Label: "10 co-authors (overflow +1)", AuthorUser: u0, AuthorSig: authorSig(u0), CoAuthors: nUnlinked(10)}, - {Label: "15 co-authors (overflow +6)", AuthorUser: u0, AuthorSig: authorSig(u0), CoAuthors: nUnlinked(15)}, + {Label: "15 co-authors (overflow +6), unlinked author", AuthorSig: &git.Signature{Name: "External Contributor", Email: "external@example.com"}, CoAuthors: nUnlinked(15)}, {Label: "30 co-authors (overflow +21)", AuthorUser: u0, AuthorSig: authorSig(u0), CoAuthors: nUnlinked(30)}, } } diff --git a/web_src/css/avatar.css b/web_src/css/avatar.css index 2e84870a8db56..871ba4e52916c 100644 --- a/web_src/css/avatar.css +++ b/web_src/css/avatar.css @@ -12,10 +12,14 @@ img.ui.avatar, align-self: center; gap: 4px; white-space: nowrap; + vertical-align: middle; +} + +.author-wrapper > a.muted, +.author-wrapper > .authors-popup-trigger { overflow: hidden; text-overflow: ellipsis; max-width: 240px; - vertical-align: middle; } /* use semibold for latest commit author */ @@ -33,10 +37,9 @@ img.ui.avatar, .avatar-stack > * { margin-left: -16px; - transition: transform 0.15s ease; + transition: transform 0.15s ease, opacity 0.15s ease; position: relative; display: inline-flex; - border-radius: 50%; } .avatar-stack > *:last-child { margin-left: 0; } @@ -55,22 +58,30 @@ img.ui.avatar, .avatar-stack:hover > *:nth-last-child(11) { transform: translateX(158px); } .avatar-stack .avatar { - border: 2px solid var(--color-body); + border: 1px solid var(--color-body); background: var(--color-body); - border-radius: 50%; + transition: border-color 0.15s ease, background-color 0.15s ease; +} + +.avatar-stack:hover .avatar { + border-color: transparent; + background-color: transparent; } .avatar-stack-overflow-chip { - display: inline-flex; align-items: center; justify-content: center; width: 20px; height: 20px; font-weight: var(--font-weight-semibold); - border: 2px solid var(--color-body); - border-radius: 50%; - background: var(--color-secondary); + border: 1px solid var(--color-body); + border-radius: var(--border-radius); color: var(--color-text); + opacity: 0; +} + +.avatar-stack:hover .avatar-stack-overflow-chip { + opacity: 1; } .authors-popup-trigger { From e7a83f4ce607a39d083d2f27ee9af4f7fc0b5bc0 Mon Sep 17 00:00:00 2001 From: silverwind Date: Sun, 17 May 2026 07:59:35 +0200 Subject: [PATCH 15/18] fix(repo): fall back to address as name on bare-email co-author trailer `Co-authored-by: ` is a valid trailer that `mail.ParseAddress` accepts with `Name == ""`, which downstream renders an empty `` with no visible text. Use the address as the display name when no name is given. Co-Authored-By: Claude (Opus 4.7) --- modules/git/commit.go | 6 +++++- modules/git/commit_test.go | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/modules/git/commit.go b/modules/git/commit.go index c1039a62f5e69..f3a017a52191b 100644 --- a/modules/git/commit.go +++ b/modules/git/commit.go @@ -104,7 +104,11 @@ func parseCoAuthorTrailer(line string) (*Signature, bool) { if err != nil { return nil, false } - return &Signature{Name: addr.Name, Email: strings.ToLower(addr.Address)}, true + name := addr.Name + if name == "" { + name = addr.Address + } + return &Signature{Name: name, Email: strings.ToLower(addr.Address)}, true } // parseCoAuthorSignatures parses `Co-authored-by:` trailers from the trailing diff --git a/modules/git/commit_test.go b/modules/git/commit_test.go index 85df3f07d7f98..02caf2ed18b3f 100644 --- a/modules/git/commit_test.go +++ b/modules/git/commit_test.go @@ -266,6 +266,11 @@ func TestCoAuthorSignatures(t *testing.T) { body: "title\n\nSigned-off-by: Jane ", want: nil, }, + { + name: "bare-address trailer falls back to address as name", + body: "title\n\nCo-authored-by: ", + want: []Signature{{Name: "jane@example.com", Email: "jane@example.com"}}, + }, } for _, tc := range cases { t.Run(tc.name, func(t *testing.T) { From c0d36d2d304b79152b0b5d3108e17581bab24f05 Mon Sep 17 00:00:00 2001 From: silverwind Date: Sun, 17 May 2026 08:22:20 +0200 Subject: [PATCH 16/18] fix(repo): collapse overflow chip width when avatar stack is unhovered `opacity: 0` left the chip's 20px flex slot in the layout, widening the collapsed stack by ~4px. Collapse width, margin and border in the unhovered state and transition them alongside opacity so the chip materializes on hover without affecting baseline layout. Co-Authored-By: Claude (Opus 4.7) --- web_src/css/avatar.css | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/web_src/css/avatar.css b/web_src/css/avatar.css index 871ba4e52916c..6000d65d40773 100644 --- a/web_src/css/avatar.css +++ b/web_src/css/avatar.css @@ -71,16 +71,22 @@ img.ui.avatar, .avatar-stack-overflow-chip { align-items: center; justify-content: center; - width: 20px; + width: 0; height: 20px; - font-weight: var(--font-weight-semibold); - border: 1px solid var(--color-body); + margin-left: 0; + border: 0 solid var(--color-body); border-radius: var(--border-radius); color: var(--color-text); + font-weight: var(--font-weight-semibold); + overflow: hidden; opacity: 0; + transition: all 0.15s ease; } .avatar-stack:hover .avatar-stack-overflow-chip { + width: 20px; + margin-left: -16px; + border-width: 1px; opacity: 1; } From 9583c8faabb5ed795426cf9480d113e69d082b4e Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 18 May 2026 01:30:40 +0200 Subject: [PATCH 17/18] refactor(repo): use container.Set for graph commit email gather Co-Authored-By: Claude (Opus 4.7) --- services/repository/gitgraph/graph_models.go | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/services/repository/gitgraph/graph_models.go b/services/repository/gitgraph/graph_models.go index 7168e4403478d..fc093ec291fa4 100644 --- a/services/repository/gitgraph/graph_models.go +++ b/services/repository/gitgraph/graph_models.go @@ -15,6 +15,7 @@ import ( git_model "code.gitea.io/gitea/models/git" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/container" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" asymkey_service "code.gitea.io/gitea/services/asymkey" @@ -93,7 +94,7 @@ func (graph *Graph) AddCommit(row, column int, flowID int64, data []byte) error // before finally retrieving the latest status func (graph *Graph) LoadAndProcessCommits(ctx context.Context, repository *repo_model.Repository, gitRepo *git.Repository) error { var err error - emailSet := map[string]struct{}{} + emailSet := make(container.Set[string]) keyMap := map[string]bool{} for _, c := range graph.Commits { @@ -105,20 +106,16 @@ func (graph *Graph) LoadAndProcessCommits(ctx context.Context, repository *repo_ return fmt.Errorf("GetCommit: %s Error: %w", c.Rev, err) } if c.Commit.Author != nil { - emailSet[c.Commit.Author.Email] = struct{}{} + emailSet.Add(c.Commit.Author.Email) } for _, sig := range c.Commit.CoAuthorSignatures() { - emailSet[sig.Email] = struct{}{} + emailSet.Add(sig.Email) } } - allEmails := make([]string, 0, len(emailSet)) - for email := range emailSet { - allEmails = append(allEmails, email) - } var emailUserMap *user_model.EmailUserMap - if len(allEmails) > 0 { - emailUserMap, err = user_model.GetUsersByEmails(ctx, allEmails) + if len(emailSet) > 0 { + emailUserMap, err = user_model.GetUsersByEmails(ctx, emailSet.Values()) if err != nil { log.Error("GetUsersByEmails: %v", err) } From d88cd4ac037e84315d92684224885efe7bd45f72 Mon Sep 17 00:00:00 2001 From: Nicolas Date: Wed, 20 May 2026 18:56:30 +0200 Subject: [PATCH 18/18] refactor(templates): pass single view struct to CoAuthorAvatars Introduces user_model.CoAuthorAvatarData and helper methods on UserCommit and gitgraph.Commit so templates pass a single backend-prepared value instead of three loose fields. Also drops the unused json tag from PushCommit.CoAuthors. Co-Authored-By: Claude Opus 4.7 --- models/user/user.go | 19 +++++++++++++ modules/repository/commits.go | 2 +- modules/templates/util_render.go | 6 +++- modules/templates/util_render_test.go | 14 +++++---- routers/web/devtest/devtest.go | 30 +++++++++++--------- routers/web/repo/view.go | 10 +++++-- services/repository/gitgraph/graph_models.go | 12 ++++++++ templates/devtest/coauthor-avatars.tmpl | 2 +- templates/repo/commits_list.tmpl | 2 +- templates/repo/graph/commits.tmpl | 2 +- templates/repo/latest_commit.tmpl | 2 +- 11 files changed, 74 insertions(+), 27 deletions(-) diff --git a/models/user/user.go b/models/user/user.go index 538e302177944..da01ba0ef2af0 100644 --- a/models/user/user.go +++ b/models/user/user.go @@ -1160,6 +1160,25 @@ type UserCommit struct { //revive:disable-line:exported *git.Commit } +// CoAuthorAvatarData is the view-model for the CoAuthorAvatars template helper. +type CoAuthorAvatarData struct { + AuthorUser *User + AuthorSig *git.Signature + CoAuthors []*CoAuthorUser +} + +// CoAuthorAvatarData returns the view-model for rendering this commit's author + co-authors. +func (uc *UserCommit) CoAuthorAvatarData() *CoAuthorAvatarData { + if uc == nil { + return nil + } + var sig *git.Signature + if uc.Commit != nil { + sig = uc.Commit.Author + } + return &CoAuthorAvatarData{AuthorUser: uc.User, AuthorSig: sig, CoAuthors: uc.CoAuthors} +} + // ValidateCommitWithEmail check if author's e-mail of commit is corresponding to a user. func ValidateCommitWithEmail(ctx context.Context, c *git.Commit) *User { if c.Author == nil { diff --git a/modules/repository/commits.go b/modules/repository/commits.go index 3a0253ccb1802..6619363019051 100644 --- a/modules/repository/commits.go +++ b/modules/repository/commits.go @@ -29,7 +29,7 @@ type PushCommit struct { AuthorName string CommitterEmail string CommitterName string - CoAuthors []*git.Signature `json:",omitempty"` + CoAuthors []*git.Signature Timestamp time.Time } diff --git a/modules/templates/util_render.go b/modules/templates/util_render.go index bf465b0ef9fed..b45d6d88876a4 100644 --- a/modules/templates/util_render.go +++ b/modules/templates/util_render.go @@ -422,7 +422,11 @@ func (ut *RenderUtils) appendAvatarStackChild(b *htmlutil.HTMLBuilder, u *user_m } // CoAuthorAvatars renders the avatar stack plus a label: `name` / `a and b` / `N people` (opens popup). -func (ut *RenderUtils) CoAuthorAvatars(authorUser *user_model.User, authorSig *git.Signature, coAuthors []*user_model.CoAuthorUser) template.HTML { +func (ut *RenderUtils) CoAuthorAvatars(data *user_model.CoAuthorAvatarData) template.HTML { + if data == nil { + return "" + } + authorUser, authorSig, coAuthors := data.AuthorUser, data.AuthorSig, data.CoAuthors locale := ut.ctx.Value(translation.ContextKey).(translation.Locale) var b htmlutil.HTMLBuilder diff --git a/modules/templates/util_render_test.go b/modules/templates/util_render_test.go index 4211123848beb..71d6bebabc188 100644 --- a/modules/templates/util_render_test.go +++ b/modules/templates/util_render_test.go @@ -244,8 +244,12 @@ func TestCoAuthorAvatars(t *testing.T) { return &user_model.CoAuthorUser{TrailerSignature: &git.Signature{Name: name, Email: email}} } + mkData := func(co []*user_model.CoAuthorUser) *user_model.CoAuthorAvatarData { + return &user_model.CoAuthorAvatarData{AuthorSig: authorSig, CoAuthors: co} + } + t.Run("zero co-authors renders bare author, no label", func(t *testing.T) { - got := string(ut.CoAuthorAvatars(nil, authorSig, nil)) + got := string(ut.CoAuthorAvatars(mkData(nil))) assert.Contains(t, got, ``) assert.Contains(t, got, "Alice") assert.NotContains(t, got, "coauthor_and") @@ -253,7 +257,7 @@ func TestCoAuthorAvatars(t *testing.T) { }) t.Run("single co-author uses and label", func(t *testing.T) { - got := string(ut.CoAuthorAvatars(nil, authorSig, []*user_model.CoAuthorUser{mkCo("Bob", "bob@example.com")})) + got := string(ut.CoAuthorAvatars(mkData([]*user_model.CoAuthorUser{mkCo("Bob", "bob@example.com")}))) assert.Contains(t, got, "repo.commits.coauthor_and") assert.Contains(t, got, "Bob") assert.NotContains(t, got, "coauthor_people") @@ -261,8 +265,8 @@ func TestCoAuthorAvatars(t *testing.T) { }) t.Run("two co-authors switches to N people label with tippy popup", func(t *testing.T) { - got := string(ut.CoAuthorAvatars(nil, authorSig, - []*user_model.CoAuthorUser{mkCo("Bob", "bob@example.com"), mkCo("Carol", "carol@example.com")})) + got := string(ut.CoAuthorAvatars(mkData( + []*user_model.CoAuthorUser{mkCo("Bob", "bob@example.com"), mkCo("Carol", "carol@example.com")}))) assert.Contains(t, got, "repo.commits.coauthor_people:3") assert.NotContains(t, got, "repo.commits.coauthor_and") assert.Contains(t, got, `data-global-init="initAuthorsPopup"`) @@ -275,7 +279,7 @@ func TestCoAuthorAvatars(t *testing.T) { for i := range cos { cos[i] = mkCo("X", "x@example.com") } - got := string(ut.CoAuthorAvatars(nil, authorSig, cos)) + got := string(ut.CoAuthorAvatars(mkData(cos))) assert.Contains(t, got, `class="avatar-stack-overflow-chip`) assert.Contains(t, got, "+2") assert.Contains(t, got, "repo.commits.coauthor_people:12") diff --git a/routers/web/devtest/devtest.go b/routers/web/devtest/devtest.go index 87201f28801de..e2c218d40ad8d 100644 --- a/routers/web/devtest/devtest.go +++ b/routers/web/devtest/devtest.go @@ -191,22 +191,24 @@ func prepareMockDataCoAuthorAvatars(ctx *context.Context) { } type scenario struct { - Label string - AuthorUser *user_model.User - AuthorSig *git.Signature - CoAuthors []*user_model.CoAuthorUser + Label string + Data *user_model.CoAuthorAvatarData } + mk := func(author *user_model.User, sig *git.Signature, co []*user_model.CoAuthorUser) *user_model.CoAuthorAvatarData { + return &user_model.CoAuthorAvatarData{AuthorUser: author, AuthorSig: sig, CoAuthors: co} + } + extSig := &git.Signature{Name: "External Contributor", Email: "external@example.com"} ctx.Data["CoAuthorScenarios"] = []scenario{ - {Label: "linked author, no co-authors", AuthorUser: u0, AuthorSig: authorSig(u0)}, - {Label: "unlinked author, no co-authors", AuthorSig: &git.Signature{Name: "External Contributor", Email: "external@example.com"}}, - {Label: "1 linked co-author", AuthorUser: u0, AuthorSig: authorSig(u0), CoAuthors: []*user_model.CoAuthorUser{coLinked(u1)}}, - {Label: "1 unlinked co-author", AuthorUser: u0, AuthorSig: authorSig(u0), CoAuthors: []*user_model.CoAuthorUser{coUnlinked("Bob Smith", "bob@example.com")}}, - {Label: "2 co-authors (3 people), u1 author", AuthorUser: u1, AuthorSig: authorSig(u1), CoAuthors: []*user_model.CoAuthorUser{coLinked(u0), coUnlinked("Bob Smith", "bob@example.com")}}, - {Label: "3 co-authors mixed (4 people)", AuthorUser: u0, AuthorSig: authorSig(u0), CoAuthors: []*user_model.CoAuthorUser{coLinked(u1), coLinked(u2), coUnlinked("Bob Smith", "bob@example.com")}}, - {Label: "9 co-authors (max visible, no overflow), u2 author", AuthorUser: u2, AuthorSig: authorSig(u2), CoAuthors: nUnlinked(9)}, - {Label: "10 co-authors (overflow +1)", AuthorUser: u0, AuthorSig: authorSig(u0), CoAuthors: nUnlinked(10)}, - {Label: "15 co-authors (overflow +6), unlinked author", AuthorSig: &git.Signature{Name: "External Contributor", Email: "external@example.com"}, CoAuthors: nUnlinked(15)}, - {Label: "30 co-authors (overflow +21)", AuthorUser: u0, AuthorSig: authorSig(u0), CoAuthors: nUnlinked(30)}, + {Label: "linked author, no co-authors", Data: mk(u0, authorSig(u0), nil)}, + {Label: "unlinked author, no co-authors", Data: mk(nil, extSig, nil)}, + {Label: "1 linked co-author", Data: mk(u0, authorSig(u0), []*user_model.CoAuthorUser{coLinked(u1)})}, + {Label: "1 unlinked co-author", Data: mk(u0, authorSig(u0), []*user_model.CoAuthorUser{coUnlinked("Bob Smith", "bob@example.com")})}, + {Label: "2 co-authors (3 people), u1 author", Data: mk(u1, authorSig(u1), []*user_model.CoAuthorUser{coLinked(u0), coUnlinked("Bob Smith", "bob@example.com")})}, + {Label: "3 co-authors mixed (4 people)", Data: mk(u0, authorSig(u0), []*user_model.CoAuthorUser{coLinked(u1), coLinked(u2), coUnlinked("Bob Smith", "bob@example.com")})}, + {Label: "9 co-authors (max visible, no overflow), u2 author", Data: mk(u2, authorSig(u2), nUnlinked(9))}, + {Label: "10 co-authors (overflow +1)", Data: mk(u0, authorSig(u0), nUnlinked(10))}, + {Label: "15 co-authors (overflow +6), unlinked author", Data: mk(nil, extSig, nUnlinked(15))}, + {Label: "30 co-authors (overflow +21)", Data: mk(u0, authorSig(u0), nUnlinked(30))}, } } diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go index d0cf7d6f6fbfa..180ac96ffd576 100644 --- a/routers/web/repo/view.go +++ b/routers/web/repo/view.go @@ -133,12 +133,18 @@ func loadLatestCommitData(ctx *context.Context, latestCommit *git.Commit) bool { return false } ctx.Data["LatestCommitVerification"] = verification - ctx.Data["LatestCommitUser"] = user_model.ValidateCommitWithEmail(ctx, latestCommit) + latestCommitUser := user_model.ValidateCommitWithEmail(ctx, latestCommit) + var latestCommitCoAuthors []*user_model.CoAuthorUser if coAuthors, err := user_model.CoAuthorsFromCommit(ctx, latestCommit); err != nil { log.Error("CoAuthorsFromCommit: %v", err) } else { - ctx.Data["LatestCommitCoAuthors"] = coAuthors + latestCommitCoAuthors = coAuthors + } + ctx.Data["LatestCommitCoAuthorData"] = &user_model.CoAuthorAvatarData{ + AuthorUser: latestCommitUser, + AuthorSig: latestCommit.Author, + CoAuthors: latestCommitCoAuthors, } statuses, err := git_model.GetLatestCommitStatus(ctx, ctx.Repo.Repository.ID, latestCommit.ID.String(), db.ListOptionsAll) diff --git a/services/repository/gitgraph/graph_models.go b/services/repository/gitgraph/graph_models.go index fc093ec291fa4..ec8e8f468bb05 100644 --- a/services/repository/gitgraph/graph_models.go +++ b/services/repository/gitgraph/graph_models.go @@ -280,3 +280,15 @@ type Commit struct { func (c *Commit) OnlyRelation() bool { return c.Row == -1 } + +// CoAuthorAvatarData returns the view-model for rendering this commit's author + co-authors. +func (c *Commit) CoAuthorAvatarData() *user_model.CoAuthorAvatarData { + if c == nil { + return nil + } + var sig *git.Signature + if c.Commit != nil { + sig = c.Commit.Author + } + return &user_model.CoAuthorAvatarData{AuthorUser: c.User, AuthorSig: sig, CoAuthors: c.CoAuthors} +} diff --git a/templates/devtest/coauthor-avatars.tmpl b/templates/devtest/coauthor-avatars.tmpl index 9cc81866d7f70..84dac2c832f67 100644 --- a/templates/devtest/coauthor-avatars.tmpl +++ b/templates/devtest/coauthor-avatars.tmpl @@ -8,7 +8,7 @@ {{range $s := .CoAuthorScenarios}} {{$s.Label}} - {{ctx.RenderUtils.CoAuthorAvatars $s.AuthorUser $s.AuthorSig $s.CoAuthors}} + {{ctx.RenderUtils.CoAuthorAvatars $s.Data}} {{end}} diff --git a/templates/repo/commits_list.tmpl b/templates/repo/commits_list.tmpl index 18680c18a9443..8266d5940c55d 100644 --- a/templates/repo/commits_list.tmpl +++ b/templates/repo/commits_list.tmpl @@ -14,7 +14,7 @@ {{range $commit := .Commits}} - {{ctx.RenderUtils.CoAuthorAvatars .User .Author .CoAuthors}} + {{ctx.RenderUtils.CoAuthorAvatars .CoAuthorAvatarData}} {{$commitBaseLink := ""}} diff --git a/templates/repo/graph/commits.tmpl b/templates/repo/graph/commits.tmpl index fb93f0889c516..6543503247f41 100644 --- a/templates/repo/graph/commits.tmpl +++ b/templates/repo/graph/commits.tmpl @@ -41,7 +41,7 @@ - {{ctx.RenderUtils.CoAuthorAvatars $commit.User $commit.Commit.Author $commit.CoAuthors}} + {{ctx.RenderUtils.CoAuthorAvatars $commit.CoAuthorAvatarData}} {{DateUtils.FullTime $commit.Date}} diff --git a/templates/repo/latest_commit.tmpl b/templates/repo/latest_commit.tmpl index 230d8f88ef15e..e2de3aa07b228 100644 --- a/templates/repo/latest_commit.tmpl +++ b/templates/repo/latest_commit.tmpl @@ -2,7 +2,7 @@ {{if not .LatestCommit}} … {{else}} - {{ctx.RenderUtils.CoAuthorAvatars .LatestCommitUser .LatestCommit.Author .LatestCommitCoAuthors}} + {{ctx.RenderUtils.CoAuthorAvatars .LatestCommitCoAuthorData}} {{template "repo/commit_sign_badge" dict "Commit" .LatestCommit "CommitBaseLink" (print .RepoLink "/commit") "CommitSignVerification" .LatestCommitVerification}}