diff options
| author | KN4CK3R <admin@oldschoolhack.me> | 2024-01-16 03:13:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-16 02:13:29 +0000 |
| commit | 022552d5b6adc792d3cd16df7de6e52cb7b41a72 (patch) | |
| tree | 4c709003d9d529475f563ff3997b7be874448052 /services/mailer/mail.go | |
| parent | 376fa0d8c49ca8a290ebb328281a56af346f5785 (diff) | |
| download | gitea-022552d5b6adc792d3cd16df7de6e52cb7b41a72.tar.gz gitea-022552d5b6adc792d3cd16df7de6e52cb7b41a72.zip | |
Rework markup link rendering (#26745) (#28803)
Backport #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>
Diffstat (limited to 'services/mailer/mail.go')
| -rw-r--r-- | services/mailer/mail.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/services/mailer/mail.go b/services/mailer/mail.go index 83f58bad0d..08b52687d1 100644 --- a/services/mailer/mail.go +++ b/services/mailer/mail.go @@ -220,9 +220,11 @@ func composeIssueCommentMessages(ctx *mailCommentContext, lang string, recipient // This is the body of the new issue or comment, not the mail body body, err := markdown.RenderString(&markup.RenderContext{ - Ctx: ctx, - URLPrefix: ctx.Issue.Repo.HTMLURL(), - Metas: ctx.Issue.Repo.ComposeMetas(), + Ctx: ctx, + Links: markup.Links{ + Base: ctx.Issue.Repo.HTMLURL(), + }, + Metas: ctx.Issue.Repo.ComposeMetas(), }, ctx.Content) if err != nil { return nil, err |