Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-22 23:14: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 2022-11-09 10:18:17 +08:00
commit 3633926096
5 changed files with 29 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/types/index.d.ts vendored
View file

@ -332,6 +332,7 @@ declare interface IConfig {
stat: string
interval: number
cloudName: string
provider: number
},
lang: string
api: {

22
app/src/util/assets.ts
View file

@ -136,16 +136,22 @@ export const addGA = () => {
const para = {
version: Constants.SIYUAN_VERSION,
container: window.siyuan.config.system.container,
isLoggedIn: "false",
subscriptionStatus: "-1",
subscriptionPlan: "-1",
subscriptionType: "-1",
isLoggedIn: false,
subscriptionStatus: -1,
subscriptionPlan: -1,
subscriptionType: -1,
syncEnabled: false,
syncProvider: -1,
};
if (window.siyuan.user) {
para.isLoggedIn = "true";
para.subscriptionStatus = window.siyuan.user.userSiYuanSubscriptionStatus.toString();
para.subscriptionPlan = window.siyuan.user.userSiYuanSubscriptionPlan.toString();
para.subscriptionType = window.siyuan.user.userSiYuanSubscriptionType.toString();
para.isLoggedIn = true;
para.subscriptionStatus = window.siyuan.user.userSiYuanSubscriptionStatus;
para.subscriptionPlan = window.siyuan.user.userSiYuanSubscriptionPlan;
para.subscriptionType = window.siyuan.user.userSiYuanSubscriptionType;
}
if (window.siyuan.config.sync) {
para.syncEnabled = window.siyuan.config.sync.enabled;
para.syncProvider = window.siyuan.config.sync.provider;
}
gtag("event", Constants.ANALYTICS_EVT_ON_GET_CONFIG, para);
}