From 609401f3d75194b0db2d3702fe8c2af5837ae447 Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Wed, 1 Feb 2023 22:42:57 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E6=94=B9=E8=BF=9B=E6=B5=8F=E8=A7=88?=
 =?UTF-8?q?=E5=99=A8=E5=89=AA=E8=97=8F=E6=89=A9=E5=B1=95=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E5=B8=A6=20`title`=20=E7=9A=84=E5=9B=BE=E7=89=87=20Fix=20https?=
 =?UTF-8?q?://github.com/siyuan-note/siyuan/issues/7223?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kernel/api/extension.go | 62 ++++++++++++++++-------------------------
 1 file changed, 24 insertions(+), 38 deletions(-)

diff --git a/kernel/api/extension.go b/kernel/api/extension.go
index 3315687af..9a3d3bd06 100644
--- a/kernel/api/extension.go
+++ b/kernel/api/extension.go
@@ -57,34 +57,6 @@ func extensionCopy(c *gin.Context) {
 		return
 	}
 
-	luteEngine := model.NewLute()
-	md := luteEngine.HTML2Md(dom)
-	md = strings.TrimSpace(md)
-
-	var unlinks []*ast.Node
-	tree := parse.Parse("", []byte(md), luteEngine.ParseOptions)
-	ast.Walk(tree.Root, func(n *ast.Node, entering bool) ast.WalkStatus {
-		if !entering {
-			return ast.WalkContinue
-		}
-
-		if ast.NodeText == n.Type {
-			// 剔除行首空白
-			if ast.NodeParagraph == n.Parent.Type && n.Parent.FirstChild == n {
-				n.Tokens = bytes.TrimLeft(n.Tokens, " \t\n")
-			}
-		}
-		return ast.WalkContinue
-	})
-	for _, unlink := range unlinks {
-		unlink.Unlink()
-	}
-
-	md, _ = lute.FormatNodeSync(tree.Root, luteEngine.ParseOptions, luteEngine.RenderOptions)
-	ret.Data = map[string]interface{}{
-		"md": md,
-	}
-
 	uploaded := map[string]string{}
 	for originalName, file := range form.File {
 		oName, err := url.PathUnescape(originalName)
@@ -139,20 +111,34 @@ func extensionCopy(c *gin.Context) {
 		uploaded[oName] = "assets/" + fName
 	}
 
-	for k, v := range uploaded {
-		if "" == md {
-			// 复制单个图片的情况
-			md = "![](" + v + ")"
-			break
+	luteEngine := lute.New()
+	md := luteEngine.HTML2Md(dom)
+	md = strings.TrimSpace(md)
+
+	var unlinks []*ast.Node
+	tree := parse.Parse("", []byte(md), luteEngine.ParseOptions)
+	ast.Walk(tree.Root, func(n *ast.Node, entering bool) ast.WalkStatus {
+		if !entering {
+			return ast.WalkContinue
 		}
-		md = strings.ReplaceAll(md, "]("+k+")", "]("+v+")")
-		p, err := url.Parse(k)
-		if nil != err {
-			continue
+
+		if ast.NodeText == n.Type {
+			// 剔除行首空白
+			if ast.NodeParagraph == n.Parent.Type && n.Parent.FirstChild == n {
+				n.Tokens = bytes.TrimLeft(n.Tokens, " \t\n")
+			}
+		} else if ast.NodeImage == n.Type {
+			if dest := n.ChildByType(ast.NodeLinkDest); nil != dest {
+				dest.Tokens = []byte(uploaded[string(dest.Tokens)])
+			}
 		}
-		md = strings.ReplaceAll(md, "]("+p.Path+")", "]("+v+")")
+		return ast.WalkContinue
+	})
+	for _, unlink := range unlinks {
+		unlink.Unlink()
 	}
 
+	md, _ = lute.FormatNodeSync(tree.Root, luteEngine.ParseOptions, luteEngine.RenderOptions)
 	ret.Data = map[string]interface{}{
 		"md": md,
 	}