mirror of
https://gitea.com/gitea/tea.git
synced 2024-11-03 04:27:21 -05:00
d2295828d0
Path-only URLs need an absolute reference to be resolved against for printing in markdown Previously we resolved against the URL to the resource we were operating on (eg comment or issue URL). The markdown renderer in the web UI resolves all such URLs relative to the repo base URL. This PR adopts this behaviour in tea, by trimming the URL to a repo base URL via regex. This makes a custom patch to our markdown renderer `glamour` obsolete, which turned out to be an incorrect patch, meaning we can make use of upstream glamour again. Co-authored-by: Norwin <git@nroo.de> Reviewed-on: https://gitea.com/gitea/tea/pulls/401 Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com> Reviewed-by: 6543 <6543@obermui.de> Co-authored-by: Norwin <noerw@noreply.gitea.io> Co-committed-by: Norwin <noerw@noreply.gitea.io>
51 lines
1.1 KiB
Go
51 lines
1.1 KiB
Go
// Copyright 2020 The Gitea Authors. All rights reserved.
|
|
// Use of this source code is governed by a MIT-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package print
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
|
|
"code.gitea.io/sdk/gitea"
|
|
)
|
|
|
|
// Comments renders a list of comments to stdout
|
|
func Comments(comments []*gitea.Comment) {
|
|
var baseURL string
|
|
if len(comments) != 0 {
|
|
baseURL = getRepoURL(comments[0].HTMLURL)
|
|
}
|
|
|
|
var out = make([]string, len(comments))
|
|
for i, c := range comments {
|
|
out[i] = formatComment(c)
|
|
}
|
|
|
|
outputMarkdown(fmt.Sprintf(
|
|
// this will become a heading by means of the first --- from a comment
|
|
"Comments\n%s",
|
|
strings.Join(out, "\n"),
|
|
), baseURL)
|
|
}
|
|
|
|
// Comment renders a comment to stdout
|
|
func Comment(c *gitea.Comment) {
|
|
outputMarkdown(formatComment(c), getRepoURL(c.HTMLURL))
|
|
}
|
|
|
|
func formatComment(c *gitea.Comment) string {
|
|
edited := ""
|
|
if c.Updated.After(c.Created) {
|
|
edited = fmt.Sprintf(" *(edited on %s)*", FormatTime(c.Updated))
|
|
}
|
|
return fmt.Sprintf(
|
|
"---\n\n**@%s** wrote on %s%s:\n\n%s\n",
|
|
c.Poster.UserName,
|
|
FormatTime(c.Created),
|
|
edited,
|
|
c.Body,
|
|
)
|
|
}
|