Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-22 15:04:07 +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 2026-02-22 11:42:18 +08:00
commit 81ac84427e
7 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/stage/protyle/js/lute/lute.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
kernel/go.mod
View file

@ -8,7 +8,7 @@ require (
github.com/88250/epub v0.0.0-20230830085737-c19055cd1f48
github.com/88250/go-humanize v0.0.0-20240424102817-4f78fac47ea7
github.com/88250/gulu v1.2.3-0.20260124101918-98654a7ca98a
github.com/88250/lute v1.7.7-0.20260220070116-090e8bfb500f
github.com/88250/lute v1.7.7-0.20260221053616-f34f36aaa036
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1
github.com/ClarkThan/ahocorasick v0.0.0-20231011042242-30d1ef1347f4
github.com/ConradIrwin/font v0.2.1

4
kernel/go.sum
View file

@ -14,8 +14,8 @@ github.com/88250/go-sqlite3 v1.14.13-0.20231214121541-e7f54c482950 h1:Pa5hMiBceT
github.com/88250/go-sqlite3 v1.14.13-0.20231214121541-e7f54c482950/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
github.com/88250/gulu v1.2.3-0.20260124101918-98654a7ca98a h1:s86WMolaqommXG1k2vXg9Gf1iXvgtHSdeD0eeJTQVR8=
github.com/88250/gulu v1.2.3-0.20260124101918-98654a7ca98a/go.mod h1:D+Db16m0N7r9MLZCMcj1a0ZsEGQAxDZkadOn79Gh0vI=
github.com/88250/lute v1.7.7-0.20260220070116-090e8bfb500f h1://yv35NPuqrtQH0Qw+zfG0bYLtma0/2DGebrFU7K4cA=
github.com/88250/lute v1.7.7-0.20260220070116-090e8bfb500f/go.mod h1:WYyUw//5yVw9BJnoVjx7rI/3szsISxNZCYGOqTIrV0o=
github.com/88250/lute v1.7.7-0.20260221053616-f34f36aaa036 h1:G7LzY0ro7SvKkSP/Hc9k2PaYClknNk5O571bsNacI94=
github.com/88250/lute v1.7.7-0.20260221053616-f34f36aaa036/go.mod h1:WYyUw//5yVw9BJnoVjx7rI/3szsISxNZCYGOqTIrV0o=
github.com/88250/pdfcpu v0.3.14-0.20250424122812-f10e8d9d8d46 h1:Bq1JsDfVbHKUxNL/B2JXd8cC/1h6aFjrlXpGycnh0Hk=
github.com/88250/pdfcpu v0.3.14-0.20250424122812-f10e8d9d8d46/go.mod h1:fVfOloBzs2+W2VJCCbq60XIxc3yJHAZ0Gahv1oO0gyI=
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1 h1:48T899JQDwyyRu9yXHePYlPdHtpJfrJEUGBMH3SMBWY=

2
kernel/model/conf.go
View file

@ -1008,8 +1008,6 @@ func IsSubscriber() bool {
}
func IsPaidUser() bool {
// S3/WebDAV data sync and backup are available for a fee https://github.com/siyuan-note/siyuan/issues/8780
if IsSubscriber() {
return true
}

4
kernel/model/export.go
View file

@ -1777,7 +1777,7 @@ func yfm(docIAL map[string]string) string {
var title, created, updated, tags string
for k, v := range docIAL {
if "id" == k {
createdTime, parseErr := time.Parse("20060102150405", util.TimeFromID(v))
createdTime, parseErr := time.ParseInLocation("20060102150405", util.TimeFromID(v), time.Local)
if nil == parseErr {
created = createdTime.Format(time.RFC3339)
}
@ -1788,7 +1788,7 @@ func yfm(docIAL map[string]string) string {
continue
}
if "updated" == k {
updatedTime, parseErr := time.Parse("20060102150405", v)
updatedTime, parseErr := time.ParseInLocation("20060102150405", v, time.Local)
if nil == parseErr {
updated = updatedTime.Format(time.RFC3339)
}

4
kernel/model/sync.go
View file

@ -250,10 +250,14 @@ func checkSync(boot, exit, byHand bool) bool {
switch Conf.Sync.Provider {
case conf.ProviderSiYuan:
if !IsSubscriber() {
Conf.Sync.Enabled = false
Conf.Save()
return false
}
case conf.ProviderWebDAV, conf.ProviderS3, conf.ProviderLocal:
if !IsPaidUser() {
Conf.Sync.Enabled = false
Conf.Save()
return false
}
}

2
kernel/model/upload.go
View file

@ -225,7 +225,7 @@ func Upload(c *gin.Context) {
}
if "" != existAssetPath && !strings.HasPrefix(hash, "random_") {
succMap[baseName] = existAssetPath
succMap[baseName] = strings.TrimPrefix(existAssetPath, "/")
} else {
if skipIfDuplicated {
// 复制 PDF 矩形注解时不再重复插入图片 No longer upload image repeatedly when copying PDF rectangle annotation https://github.com/siyuan-note/siyuan/issues/10666