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

🎨 Sign in to use S3/WebDAV data sync https://github.com/siyuan-note/siyuan/issues/8779

Browse source
This commit is contained in:
Daniel 2023-07-19 12:15:37 +08:00
parent 11764557ac
commit c4558c26dd
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
3 changed files with 45 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

9
kernel/model/conf.go
View file

@ -714,6 +714,15 @@ func IsSubscriber() bool {
return nil != Conf.User && (-1 == Conf.User.UserSiYuanProExpireTime || 0 < Conf.User.UserSiYuanProExpireTime) && 0 == Conf.User.UserSiYuanSubscriptionStatus
}
func IsThirdPartySyncPaid() bool {
if IsSubscriber() {
return true
}
return nil != Conf.User // Sign in to use S3/WebDAV data sync https://github.com/siyuan-note/siyuan/issues/8779
// TODO https://github.com/siyuan-note/siyuan/issues/8780
// return nil != Conf.User && 1 == Conf.User.UserSiYuanThirdPartySyncPayStatus
}
const (
MaskedUserData = ""
MaskedAccessAuthCode = "*******"

15
kernel/model/sync.go
View file

@ -229,8 +229,19 @@ func checkSync(boot, exit, byHand bool) bool {
return false
}
if !IsSubscriber() && conf.ProviderSiYuan == Conf.Sync.Provider {
return false
switch Conf.Sync.Provider {
case conf.ProviderSiYuan:
if !IsSubscriber() {
return false
}
case conf.ProviderWebDAV:
if !IsThirdPartySyncPaid() {
return false
}
case conf.ProviderS3:
if !IsThirdPartySyncPaid() {
return false
}
}
if util.IsMutexLocked(&syncLock) {