From 48b36d929f04a736ae9cea402520ae5a95d7622a Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Sat, 17 Dec 2022 17:35:15 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E6=94=AF=E6=8C=81=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BF=AB=E7=85=A7=E5=AF=B9=E6=AF=94=20https://github.com/siyua?= =?UTF-8?q?n-note/siyuan/issues/6858?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/api/repo.go | 5 ++++- kernel/model/repository.go | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/kernel/api/repo.go b/kernel/api/repo.go index 256908ad8..84bf860bb 100644 --- a/kernel/api/repo.go +++ b/kernel/api/repo.go @@ -70,7 +70,10 @@ func diffRepoSnapshots(c *gin.Context) { } ret.Data = map[string]interface{}{ - "diff": diff, + "addsLeft": diff.AddsLeft, + "updatesLeft": diff.UpdatesLeft, + "updatesRight": diff.UpdatesRight, + "removesRight": diff.RemovesRight, } } diff --git a/kernel/model/repository.go b/kernel/model/repository.go index 3620edad4..ff2f8b77c 100644 --- a/kernel/model/repository.go +++ b/kernel/model/repository.go @@ -128,10 +128,10 @@ func OpenRepoSnapshotDoc(fileID string) (id, rootID, content string, isLargeDoc } type LeftRightDiff struct { - AddsLeft []*DiffFile - UpdatesLeft []*DiffFile - UpdatesRight []*DiffFile - RemovesRight []*DiffFile + AddsLeft []*DiffFile `json:"addsLeft"` + UpdatesLeft []*DiffFile `json:"updatesLeft"` + UpdatesRight []*DiffFile `json:"updatesRight"` + RemovesRight []*DiffFile `json:"removesRight"` } type DiffFile struct {