Skip to content

Commit 36156b3

Browse files
wxiaoguangwxiaoguang
committed
fix
1 parent 44aadc3 commit 36156b3

File tree

14 files changed

+37
-40
lines changed

14 files changed

+37
-40
lines changed

‎modules/templates/util_render.go‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
package templates
55

66
import (
7+
"code.gitea.io/gitea/models/renderhelper"
8+
"code.gitea.io/gitea/models/repo"
79
"encoding/hex"
810
"fmt"
911
"html/template"
@@ -34,11 +36,11 @@ func NewRenderUtils(ctx reqctx.RequestContext) *RenderUtils {
3436
}
3537

3638
// RenderCommitMessage renders commit message with XSS-safe and special links.
37-
func (ut *RenderUtils) RenderCommitMessage(msg string, metas map[string]string) template.HTML {
39+
func (ut *RenderUtils) RenderCommitMessage(msg string, repo *repo.Repository) template.HTML {
3840
cleanMsg := template.HTMLEscapeString(msg)
3941
// we can safely assume that it will not return any error, since there
4042
// shouldn't be any special HTML.
41-
fullMessage, err := markup.PostProcessCommitMessage(markup.NewRenderContext(ut.ctx).WithMetas(metas), cleanMsg)
43+
fullMessage, err := markup.PostProcessCommitMessage(renderhelper.NewRenderContextRepoComment(ut.ctx, repo), cleanMsg)
4244
if err != nil {
4345
log.Error("PostProcessCommitMessage: %v", err)
4446
return ""
@@ -52,7 +54,7 @@ func (ut *RenderUtils) RenderCommitMessage(msg string, metas map[string]string)
5254

5355
// RenderCommitMessageLinkSubject renders commit message as a XSS-safe link to
5456
// the provided default url, handling for special links without email to links.
55-
func (ut *RenderUtils) RenderCommitMessageLinkSubject(msg, urlDefault string, metas map[string]string) template.HTML {
57+
func (ut *RenderUtils) RenderCommitMessageLinkSubject(msg, urlDefault string, repo *repo.Repository) template.HTML {
5658
msgLine := strings.TrimLeftFunc(msg, unicode.IsSpace)
5759
lineEnd := strings.IndexByte(msgLine, '\n')
5860
if lineEnd > 0 {
@@ -63,9 +65,8 @@ func (ut *RenderUtils) RenderCommitMessageLinkSubject(msg, urlDefault string, me
6365
return ""
6466
}
6567

66-
// we can safely assume that it will not return any error, since there
67-
// shouldn't be any special HTML.
68-
renderedMessage, err := markup.PostProcessCommitMessageSubject(markup.NewRenderContext(ut.ctx).WithMetas(metas), urlDefault, template.HTMLEscapeString(msgLine))
68+
// we can safely assume that it will not return any error, since there shouldn't be any special HTML.
69+
renderedMessage, err := markup.PostProcessCommitMessageSubject(renderhelper.NewRenderContextRepoComment(ut.ctx, repo), urlDefault, template.HTMLEscapeString(msgLine))
6970
if err != nil {
7071
log.Error("PostProcessCommitMessageSubject: %v", err)
7172
return ""
@@ -74,7 +75,7 @@ func (ut *RenderUtils) RenderCommitMessageLinkSubject(msg, urlDefault string, me
7475
}
7576

7677
// RenderCommitBody extracts the body of a commit message without its title.
77-
func (ut *RenderUtils) RenderCommitBody(msg string, metas map[string]string) template.HTML {
78+
func (ut *RenderUtils) RenderCommitBody(msg string, repo *repo.Repository) template.HTML {
7879
msgLine := strings.TrimSpace(msg)
7980
lineEnd := strings.IndexByte(msgLine, '\n')
8081
if lineEnd > 0 {
@@ -87,7 +88,7 @@ func (ut *RenderUtils) RenderCommitBody(msg string, metas map[string]string) tem
8788
return ""
8889
}
8990

90-
renderedMessage, err := markup.PostProcessCommitMessage(markup.NewRenderContext(ut.ctx).WithMetas(metas), template.HTMLEscapeString(msgLine))
91+
renderedMessage, err := markup.PostProcessCommitMessage(renderhelper.NewRenderContextRepoComment(ut.ctx, repo), template.HTMLEscapeString(msgLine))
9192
if err != nil {
9293
log.Error("PostProcessCommitMessage: %v", err)
9394
return ""
@@ -105,8 +106,8 @@ func renderCodeBlock(htmlEscapedTextToRender template.HTML) template.HTML {
105106
}
106107

107108
// RenderIssueTitle renders issue/pull title with defined post processors
108-
func (ut *RenderUtils) RenderIssueTitle(text string, metas map[string]string) template.HTML {
109-
renderedText, err := markup.PostProcessIssueTitle(markup.NewRenderContext(ut.ctx).WithMetas(metas), template.HTMLEscapeString(text))
109+
func (ut *RenderUtils) RenderIssueTitle(text string, repo *repo.Repository) template.HTML {
110+
renderedText, err := markup.PostProcessIssueTitle(renderhelper.NewRenderContextRepoComment(ut.ctx, repo), template.HTMLEscapeString(text))
110111
if err != nil {
111112
log.Error("PostProcessIssueTitle: %v", err)
112113
return ""

‎modules/templates/util_render_legacy.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,22 +32,22 @@ func renderMarkdownToHtmlLegacy(ctx context.Context, input string) template.HTML
3232
return NewRenderUtils(reqctx.FromContext(ctx)).MarkdownToHtml(input)
3333
}
3434

35-
func renderCommitMessageLegacy(ctx context.Context, msg string, metas map[string]string) template.HTML {
35+
func renderCommitMessageLegacy(ctx context.Context, msg string, _ map[string]string) template.HTML {
3636
panicIfDevOrTesting()
37-
return NewRenderUtils(reqctx.FromContext(ctx)).RenderCommitMessage(msg, metas)
37+
return NewRenderUtils(reqctx.FromContext(ctx)).RenderCommitMessage(msg, nil)
3838
}
3939

40-
func renderCommitMessageLinkSubjectLegacy(ctx context.Context, msg, urlDefault string, metas map[string]string) template.HTML {
40+
func renderCommitMessageLinkSubjectLegacy(ctx context.Context, msg, urlDefault string, _ map[string]string) template.HTML {
4141
panicIfDevOrTesting()
42-
return NewRenderUtils(reqctx.FromContext(ctx)).RenderCommitMessageLinkSubject(msg, urlDefault, metas)
42+
return NewRenderUtils(reqctx.FromContext(ctx)).RenderCommitMessageLinkSubject(msg, urlDefault, nil)
4343
}
4444

45-
func renderIssueTitleLegacy(ctx context.Context, text string, metas map[string]string) template.HTML {
45+
func renderIssueTitleLegacy(ctx context.Context, text string, _ map[string]string) template.HTML {
4646
panicIfDevOrTesting()
47-
return NewRenderUtils(reqctx.FromContext(ctx)).RenderIssueTitle(text, metas)
47+
return NewRenderUtils(reqctx.FromContext(ctx)).RenderIssueTitle(text, nil)
4848
}
4949

50-
func renderCommitBodyLegacy(ctx context.Context, msg string, metas map[string]string) template.HTML {
50+
func renderCommitBodyLegacy(ctx context.Context, msg string, _ map[string]string) template.HTML {
5151
panicIfDevOrTesting()
52-
return NewRenderUtils(reqctx.FromContext(ctx)).RenderCommitBody(msg, metas)
52+
return NewRenderUtils(reqctx.FromContext(ctx)).RenderCommitBody(msg, nil)
5353
}

‎routers/web/feed/convert.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,15 +201,15 @@ func feedActionsToFeedItems(ctx *context.Context, actions activities_model.Actio
201201
switch act.OpType {
202202
case activities_model.ActionCommitRepo, activities_model.ActionMirrorSyncPush:
203203
push := templates.ActionContent2Commits(act)
204-
204+
_ = act.LoadRepo(ctx)
205205
for _, commit := range push.Commits {
206206
if len(desc) != 0 {
207207
desc += "\n\n"
208208
}
209209
desc += fmt.Sprintf("<a href=\"%s\">%s</a>\n%s",
210210
html.EscapeString(fmt.Sprintf("%s/commit/%s", act.GetRepoAbsoluteLink(ctx), commit.Sha1)),
211211
commit.Sha1,
212-
renderUtils.RenderCommitMessage(commit.Message, nil),
212+
renderUtils.RenderCommitMessage(commit.Message, act.Repo),
213213
)
214214
}
215215

‎routers/web/repo/actions/view.go‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -200,13 +200,9 @@ func ViewPost(ctx *context_module.Context) {
200200
}
201201
}
202202

203-
// TODO: "ComposeCommentMetas" (usually for comment) is not quite right, but it is still the same as what template "RenderCommitMessage" does.
204-
// need to be refactored together in the future
205-
metas := ctx.Repo.Repository.ComposeCommentMetas(ctx)
206-
207203
// the title for the "run" is from the commit message
208204
resp.State.Run.Title = run.Title
209-
resp.State.Run.TitleHTML = templates.NewRenderUtils(ctx).RenderCommitMessage(run.Title, metas)
205+
resp.State.Run.TitleHTML = templates.NewRenderUtils(ctx).RenderCommitMessage(run.Title, ctx.Repo.Repository)
210206
resp.State.Run.Link = run.Link()
211207
resp.State.Run.CanCancel = !run.Status.IsDone() && ctx.Repo.CanWrite(unit.TypeActions)
212208
resp.State.Run.CanApprove = run.NeedApproval && ctx.Repo.CanWrite(unit.TypeActions)

‎templates/repo/branch/list.tmpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<button class="btn interact-fg tw-px-1" data-clipboard-text="{{.DefaultBranchBranch.DBBranch.Name}}" data-tooltip-content="{{ctx.Locale.Tr "copy_branch"}}">{{svg "octicon-copy" 14}}</button>
2828
{{template "repo/commit_statuses" dict "Status" (index $.CommitStatus .DefaultBranchBranch.DBBranch.CommitID) "Statuses" (index $.CommitStatuses .DefaultBranchBranch.DBBranch.CommitID)}}
2929
</div>
30-
<p class="info tw-flex tw-items-center tw-my-1">{{svg "octicon-git-commit" 16 "tw-mr-1"}}<a href="{{.RepoLink}}/commit/{{PathEscape .DefaultBranchBranch.DBBranch.CommitID}}">{{ShortSha .DefaultBranchBranch.DBBranch.CommitID}}</a> · <span class="commit-message">{{ctx.RenderUtils.RenderCommitMessage .DefaultBranchBranch.DBBranch.CommitMessage (.Repository.ComposeCommentMetas ctx)}}</span> · {{ctx.Locale.Tr "org.repo_updated"}} {{DateUtils.TimeSince .DefaultBranchBranch.DBBranch.CommitTime}}{{if .DefaultBranchBranch.DBBranch.Pusher}} &nbsp;{{template "shared/user/avatarlink" dict "user" .DefaultBranchBranch.DBBranch.Pusher}}{{template "shared/user/namelink" .DefaultBranchBranch.DBBranch.Pusher}}{{end}}</p>
30+
<p class="info tw-flex tw-items-center tw-my-1">{{svg "octicon-git-commit" 16 "tw-mr-1"}}<a href="{{.RepoLink}}/commit/{{PathEscape .DefaultBranchBranch.DBBranch.CommitID}}">{{ShortSha .DefaultBranchBranch.DBBranch.CommitID}}</a> · <span class="commit-message">{{ctx.RenderUtils.RenderCommitMessage .DefaultBranchBranch.DBBranch.CommitMessage .Repository}}</span> · {{ctx.Locale.Tr "org.repo_updated"}} {{DateUtils.TimeSince .DefaultBranchBranch.DBBranch.CommitTime}}{{if .DefaultBranchBranch.DBBranch.Pusher}} &nbsp;{{template "shared/user/avatarlink" dict "user" .DefaultBranchBranch.DBBranch.Pusher}}{{template "shared/user/namelink" .DefaultBranchBranch.DBBranch.Pusher}}{{end}}</p>
3131
</td>
3232
{{/* FIXME: here and below, the tw-overflow-visible is not quite right but it is still needed the moment: to show the important buttons when the width is narrow */}}
3333
<td class="tw-text-right tw-overflow-visible">
@@ -103,7 +103,7 @@
103103
<button class="btn interact-fg tw-px-1" data-clipboard-text="{{.DBBranch.Name}}" data-tooltip-content="{{ctx.Locale.Tr "copy_branch"}}">{{svg "octicon-copy" 14}}</button>
104104
{{template "repo/commit_statuses" dict "Status" (index $.CommitStatus .DBBranch.CommitID) "Statuses" (index $.CommitStatuses .DBBranch.CommitID)}}
105105
</div>
106-
<p class="info tw-flex tw-items-center tw-my-1">{{svg "octicon-git-commit" 16 "tw-mr-1"}}<a href="{{$.RepoLink}}/commit/{{PathEscape .DBBranch.CommitID}}">{{ShortSha .DBBranch.CommitID}}</a> · <span class="commit-message">{{ctx.RenderUtils.RenderCommitMessage .DBBranch.CommitMessage ($.Repository.ComposeCommentMetas ctx)}}</span> · {{ctx.Locale.Tr "org.repo_updated"}} {{DateUtils.TimeSince .DBBranch.CommitTime}}{{if .DBBranch.Pusher}} &nbsp;{{template "shared/user/avatarlink" dict "user" .DBBranch.Pusher}} &nbsp;{{template "shared/user/namelink" .DBBranch.Pusher}}{{end}}</p>
106+
<p class="info tw-flex tw-items-center tw-my-1">{{svg "octicon-git-commit" 16 "tw-mr-1"}}<a href="{{$.RepoLink}}/commit/{{PathEscape .DBBranch.CommitID}}">{{ShortSha .DBBranch.CommitID}}</a> · <span class="commit-message">{{ctx.RenderUtils.RenderCommitMessage .DBBranch.CommitMessage $.Repository}}</span> · {{ctx.Locale.Tr "org.repo_updated"}} {{DateUtils.TimeSince .DBBranch.CommitTime}}{{if .DBBranch.Pusher}} &nbsp;{{template "shared/user/avatarlink" dict "user" .DBBranch.Pusher}} &nbsp;{{template "shared/user/namelink" .DBBranch.Pusher}}{{end}}</p>
107107
{{end}}
108108
</td>
109109
<td class="two wide ui">

‎templates/repo/commit_page.tmpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<div class="ui container fluid padded">
66
<div class="ui top attached header clearing segment tw-relative commit-header">
77
<div class="tw-flex tw-mb-4 tw-gap-1">
8-
<h3 class="tw-mb-0 tw-flex-1"><span class="commit-summary" title="{{.Commit.Summary}}">{{ctx.RenderUtils.RenderCommitMessage .Commit.Message ($.Repository.ComposeCommentMetas ctx)}}</span>{{template "repo/commit_statuses" dict "Status" .CommitStatus "Statuses" .CommitStatuses}}</h3>
8+
<h3 class="tw-mb-0 tw-flex-1"><span class="commit-summary" title="{{.Commit.Summary}}">{{ctx.RenderUtils.RenderCommitMessage .Commit.Message $.Repository}}</span>{{template "repo/commit_statuses" dict "Status" .CommitStatus "Statuses" .CommitStatuses}}</h3>
99
{{if not $.PageIsWiki}}
1010
<div class="commit-header-buttons">
1111
<a class="ui primary tiny button" href="{{.SourcePath}}">
@@ -122,7 +122,7 @@
122122
{{end}}
123123
</div>
124124
{{if IsMultilineCommitMessage .Commit.Message}}
125-
<pre class="commit-body">{{ctx.RenderUtils.RenderCommitBody .Commit.Message ($.Repository.ComposeCommentMetas ctx)}}</pre>
125+
<pre class="commit-body">{{ctx.RenderUtils.RenderCommitBody .Commit.Message $.Repository}}</pre>
126126
{{end}}
127127
{{template "repo/commit_load_branches_and_tags" .}}
128128
</div>

‎templates/repo/commits_list.tmpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@
4444
<span class="commit-summary {{if gt .ParentCount 1}} grey text{{end}}" title="{{.Summary}}">{{.Summary | ctx.RenderUtils.RenderEmoji}}</span>
4545
{{else}}
4646
{{$commitLink:= printf "%s/commit/%s" $commitRepoLink (PathEscape .ID.String)}}
47-
<span class="commit-summary {{if gt .ParentCount 1}} grey text{{end}}" title="{{.Summary}}">{{ctx.RenderUtils.RenderCommitMessageLinkSubject .Message $commitLink ($.Repository.ComposeCommentMetas ctx)}}</span>
47+
<span class="commit-summary {{if gt .ParentCount 1}} grey text{{end}}" title="{{.Summary}}">{{ctx.RenderUtils.RenderCommitMessageLinkSubject .Message $commitLink $.Repository}}</span>
4848
{{end}}
4949
</span>
5050
{{if IsMultilineCommitMessage .Message}}
5151
<button class="ui button ellipsis-button" aria-expanded="false" data-global-click="onRepoEllipsisButtonClick">...</button>
5252
{{end}}
5353
{{template "repo/commit_statuses" dict "Status" .Status "Statuses" .Statuses}}
5454
{{if IsMultilineCommitMessage .Message}}
55-
<pre class="commit-body tw-hidden">{{ctx.RenderUtils.RenderCommitBody .Message ($.Repository.ComposeCommentMetas ctx)}}</pre>
55+
<pre class="commit-body tw-hidden">{{ctx.RenderUtils.RenderCommitBody .Message $.Repository}}</pre>
5656
{{end}}
5757
{{if $.CommitsTagsMap}}
5858
{{range (index $.CommitsTagsMap .ID.String)}}

‎templates/repo/commits_list_small.tmpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
{{$commitLink:= printf "%s/%s" $commitBaseLink (PathEscape .ID.String)}}
1616

1717
<span class="tw-flex-1 tw-font-mono gt-ellipsis" title="{{.Summary}}">
18-
{{- ctx.RenderUtils.RenderCommitMessageLinkSubject .Message $commitLink ($.comment.Issue.PullRequest.BaseRepo.ComposeCommentMetas ctx) -}}
18+
{{- ctx.RenderUtils.RenderCommitMessageLinkSubject .Message $commitLink $.comment.Issue.PullRequest.BaseRepo -}}
1919
</span>
2020

2121
{{if IsMultilineCommitMessage .Message}}
@@ -29,7 +29,7 @@
2929
</div>
3030
{{if IsMultilineCommitMessage .Message}}
3131
<pre class="commit-body tw-ml-[33px] tw-hidden" data-singular-commit-body-for="{{$tag}}">
32-
{{- ctx.RenderUtils.RenderCommitBody .Message ($.comment.Issue.PullRequest.BaseRepo.ComposeCommentMetas ctx) -}}
32+
{{- ctx.RenderUtils.RenderCommitBody .Message $.comment.Issue.PullRequest.BaseRepo -}}
3333
</pre>
3434
{{end}}
3535
{{end}}

‎templates/repo/diff/compare.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@
189189
<div class="ui segment flex-text-block tw-gap-4">
190190
{{template "shared/issueicon" .}}
191191
<div class="issue-title tw-break-anywhere">
192-
{{ctx.RenderUtils.RenderIssueTitle .PullRequest.Issue.Title ($.Repository.ComposeCommentMetas ctx)}}
192+
{{ctx.RenderUtils.RenderIssueTitle .PullRequest.Issue.Title $.Repository.ComposeCommentMetas}}
193193
<span class="index">#{{.PullRequest.Issue.Index}}</span>
194194
</div>
195195
<a href="{{$.RepoLink}}/pulls/{{.PullRequest.Issue.Index}}" class="ui compact button primary">

‎templates/repo/graph/commits.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
{{template "repo/commit_sign_badge" dict "Commit" $commit.Commit "CommitBaseLink" (print $.RepoLink "/commit") "CommitSignVerification" $commit.Verification}}
99

1010
<span class="message tw-inline-block gt-ellipsis">
11-
<span>{{ctx.RenderUtils.RenderCommitMessage $commit.Subject ($.Repository.ComposeCommentMetas ctx)}}</span>
11+
<span>{{ctx.RenderUtils.RenderCommitMessage $commit.Subject $.Repository}}</span>
1212
</span>
1313

1414
<span class="commit-refs flex-text-inline">

0 commit comments

Comments
 (0)