diff options
| author | KN4CK3R <admin@oldschoolhack.me> | 2024-01-15 09:49:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-15 08:49:24 +0000 |
| commit | 637451a45ecbc3d127ff2adf27437ce1357493ea (patch) | |
| tree | d1f554b8bfe17bc51a48aacbd4b830906049dae0 /models | |
| parent | c7e4629c0245cf6731ea34c2aa6ba4b968ea184a (diff) | |
| download | gitea-637451a45ecbc3d127ff2adf27437ce1357493ea.tar.gz gitea-637451a45ecbc3d127ff2adf27437ce1357493ea.zip | |
Rework markup link rendering (#26745)
Fixes #26548
This PR refactors the rendering of markup links. The old code uses
`strings.Replace` to change some urls while the new code uses more
context to decide which link should be generated.
The added tests should ensure the same output for the old and new
behaviour (besides the bug).
We may need to refactor the rendering a bit more to make it clear how
the different helper methods render the input string. There are lots of
options (resolve links / images / mentions / git hashes / emojis / ...)
but you don't really know what helper uses which options. For example,
we currently support images in the user description which should not be
allowed I think:
<details>
<summary>Profile</summary>
https://try.gitea.io/KN4CK3R
</details>
---------
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Diffstat (limited to 'models')
| -rw-r--r-- | models/issues/comment_code.go | 8 | ||||
| -rw-r--r-- | models/repo/repo.go | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/models/issues/comment_code.go b/models/issues/comment_code.go index 25e606f092..384a595dd9 100644 --- a/models/issues/comment_code.go +++ b/models/issues/comment_code.go @@ -109,9 +109,11 @@ func findCodeComments(ctx context.Context, opts FindCommentsOptions, issue *Issu var err error if comment.RenderedContent, err = markdown.RenderString(&markup.RenderContext{ - Ctx: ctx, - URLPrefix: issue.Repo.Link(), - Metas: issue.Repo.ComposeMetas(ctx), + Ctx: ctx, + Links: markup.Links{ + Base: issue.Repo.Link(), + }, + Metas: issue.Repo.ComposeMetas(ctx), }, comment.Content); err != nil { return nil, err } diff --git a/models/repo/repo.go b/models/repo/repo.go index fb1849a4bb..3695e1f78b 100644 --- a/models/repo/repo.go +++ b/models/repo/repo.go @@ -584,8 +584,7 @@ func (repo *Repository) CanEnableEditor() bool { // DescriptionHTML does special handles to description and return HTML string. func (repo *Repository) DescriptionHTML(ctx context.Context) template.HTML { desc, err := markup.RenderDescriptionHTML(&markup.RenderContext{ - Ctx: ctx, - URLPrefix: repo.HTMLURL(), + Ctx: ctx, // Don't use Metas to speedup requests }, repo.Description) if err != nil { |