Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-06 08:48:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🐛 The hyperlink in the changelog fails to jump to the browser to open https://github.com/siyuan-note/siyuan/issues/8458

Browse source
This commit is contained in:
Daniel 2023-06-06 11:19:24 +08:00
parent 8c9d947ff2
commit b24c06fbce
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
4 changed files with 45 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

5
kernel/api/system.go
View file

@ -66,10 +66,11 @@ func getChangelog(c *gin.Context) {
model.Conf.ShowChangelog = false
luteEngine := lute.New()
htmlContent := luteEngine.Markdown("", contentData)
htmlContent := luteEngine.MarkdownStr("", string(contentData))
htmlContent = util.LinkTarget(htmlContent, "")
data["show"] = true
data["html"] = gulu.Str.FromBytes(htmlContent)
data["html"] = htmlContent
ret.Data = data
}

20
kernel/bazaar/package.go
View file

@ -28,7 +28,6 @@ import (
"github.com/88250/gulu"
"github.com/88250/lute"
"github.com/PuerkitoBio/goquery"
"github.com/araddon/dateparse"
"github.com/imroc/req/v3"
"github.com/siyuan-note/filelock"
@ -517,24 +516,7 @@ func renderREADME(repoURL string, mdData []byte) (ret string, err error) {
linkBase := "https://cdn.jsdelivr.net/gh/" + strings.TrimPrefix(repoURL, "https://github.com/")
luteEngine.SetLinkBase(linkBase)
ret = luteEngine.Md2HTML(string(mdData))
doc, err := goquery.NewDocumentFromReader(strings.NewReader(ret))
if nil != err {
logging.LogErrorf("parse HTML failed: %s", err)
return
}
doc.Find("a").Each(func(i int, selection *goquery.Selection) {
if href, ok := selection.Attr("href"); ok {
if util.IsRelativePath(href) {
selection.SetAttr("href", linkBase+href)
}
// The hyperlink in the marketplace package README fails to jump to the browser to open https://github.com/siyuan-note/siyuan/issues/8452
selection.SetAttr("target", "_blank")
}
})
ret, _ = doc.Find("body").Html()
ret = util.LinkTarget(ret, linkBase)
return
}

30
kernel/util/lute.go
View file

@ -16,7 +16,13 @@
package util
import "github.com/88250/lute"
import (
"strings"
"github.com/88250/lute"
"github.com/PuerkitoBio/goquery"
"github.com/siyuan-note/logging"
)
func NewLute() (ret *lute.Lute) {
ret = lute.New()
@ -62,3 +68,25 @@ func NewStdLute() (ret *lute.Lute) {
ret.SetInlineMathAllowDigitAfterOpenMarker(true) // Formula parsing supports $ followed by numbers when importing Markdown https://github.com/siyuan-note/siyuan/issues/8362
return
}
func LinkTarget(htmlStr, linkBase string) (ret string) {
doc, err := goquery.NewDocumentFromReader(strings.NewReader(htmlStr))
if nil != err {
logging.LogErrorf("parse HTML failed: %s", err)
return
}
doc.Find("a").Each(func(i int, selection *goquery.Selection) {
if href, ok := selection.Attr("href"); ok {
if IsRelativePath(href) {
selection.SetAttr("href", linkBase+href)
}
// The hyperlink in the marketplace package README fails to jump to the browser to open https://github.com/siyuan-note/siyuan/issues/8452
selection.SetAttr("target", "_blank")
}
})
ret, _ = doc.Find("body").Html()
return
}