From 9073ca81281dc1ebedbe19fae89b7e5a81b4eb8b Mon Sep 17 00:00:00 2001 From: Gusted Date: Sun, 9 Mar 2025 15:06:16 +0000 Subject: [PATCH] fix: revert issue rendering for `` element (#7171) - Issue title rendering can lead to nested `` which is incorrect. So revert a portion of forgejo/forgejo#6715. - Integration test adjusted - Resolves forgejo/forgejo#7076 Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7171 Reviewed-by: 0ko <0ko@noreply.codeberg.org> Co-authored-by: Gusted Co-committed-by: Gusted --- templates/user/dashboard/feeds.tmpl | 2 +- tests/integration/user_dashboard_test.go | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index 8ae50bf385..e9fbb7a5b9 100644 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -107,7 +107,7 @@ {{else if .GetOpType.InActions "create_pull_request"}} {{RenderIssueTitle ctx (index .GetIssueInfos 1) (.Repo.ComposeMetas ctx)}} {{else if .GetOpType.InActions "comment_issue" "approve_pull_request" "reject_pull_request" "comment_pull"}} - {{RenderIssueTitle ctx (.GetIssueTitle ctx) (.Repo.ComposeMetas ctx)}} + {{(.GetIssueTitle ctx) | RenderEmoji $.Context | RenderCodeBlock}} {{$comment := index .GetIssueInfos 1}} {{if $comment}}
{{RenderMarkdownToHtml ctx $comment}}
diff --git a/tests/integration/user_dashboard_test.go b/tests/integration/user_dashboard_test.go index 6621caca9b..20f3f858f9 100644 --- a/tests/integration/user_dashboard_test.go +++ b/tests/integration/user_dashboard_test.go @@ -92,7 +92,11 @@ func TestDashboardTitleRendering(t *testing.T) { count := 0 htmlDoc.doc.Find("#activity-feed .flex-item-main .title").Each(func(i int, s *goquery.Selection) { count++ - assert.EqualValues(t, ":exclamation: not rendered", s.Text()) + if s.IsMatcher(goquery.Single("a")) { + assert.EqualValues(t, "❗ not rendered", s.Text()) + } else { + assert.EqualValues(t, ":exclamation: not rendered", s.Text()) + } }) assert.EqualValues(t, 6, count)