Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-23 01:50:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2022-10-27 22:56:05 +08:00
commit b017c4c356
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
kernel/model/import.go
View file

@ -584,6 +584,7 @@ func ImportFromLocalPath(boxID, localPath string, toPath string) (err error) {
tree.Box = boxID tree.Box = boxID
tree.Path = targetPath tree.Path = targetPath
tree.HPath = path.Join(baseHPath, title) tree.HPath = path.Join(baseHPath, title)
tree.Root.Spec = "1"
luteEngine.NestedInlines2FlattedSpans(tree) luteEngine.NestedInlines2FlattedSpans(tree)
docDirLocalPath := filepath.Dir(filepath.Join(boxLocalPath, targetPath)) docDirLocalPath := filepath.Dir(filepath.Join(boxLocalPath, targetPath))

2
kernel/model/liandi.go
View file

@ -180,7 +180,7 @@ func refreshSubscriptionExpirationRemind() {
remains := int((expired - time.Now().UnixMilli()) / 1000 / 60 / 60 / 24) remains := int((expired - time.Now().UnixMilli()) / 1000 / 60 / 60 / 24)
expireDay := 15 // 付费订阅提前 15 天提醒 expireDay := 15 // 付费订阅提前 15 天提醒
if 2 == Conf.User.UserSiYuanSubscriptionPlan { if 2 == Conf.User.UserSiYuanSubscriptionPlan {
expireDay = 2 // 试用订阅提前 2 天提醒 expireDay = 3 // 试用订阅提前 3 天提醒
} }
if 0 < remains && expireDay > remains { if 0 < remains && expireDay > remains {