From 7958d35990ee9a6b7d4c7c1745ea5e98a05f6a41 Mon Sep 17 00:00:00 2001
From: frostime <frostime@foxmail.com>
Date: Sat, 11 Nov 2023 22:05:26 +0800
Subject: [PATCH 01/11] :whale: ci(siyuan): update siyuan package

---
 package.json   |   2 +-
 pnpm-lock.yaml | 532 +++++++++++++++++++++++++++----------------------
 2 files changed, 295 insertions(+), 239 deletions(-)

diff --git a/package.json b/package.json
index 28bb6d4..2c71742 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "minimist": "^1.2.8",
     "rollup-plugin-livereload": "^2.0.5",
     "sass": "^1.62.1",
-    "siyuan": "^0.8.4",
+    "siyuan": "^0.8.8",
     "svelte": "^3.57.0",
     "sy-plugin-changelog": "^0.0.6",
     "ts-node": "^10.9.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index bc3f6e5..3635bca 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -33,8 +33,8 @@ devDependencies:
     specifier: ^1.62.1
     version: 1.62.1
   siyuan:
-    specifier: ^0.8.4
-    version: 0.8.4
+    specifier: ^0.8.8
+    version: registry.npmmirror.com/siyuan@0.8.8
   svelte:
     specifier: ^3.57.0
     version: 3.57.0
@@ -66,204 +66,6 @@ packages:
       '@jridgewell/trace-mapping': 0.3.9
     dev: true
 
-  /@esbuild/android-arm64@0.17.19:
-    resolution: {integrity: sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [android]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/android-arm@0.17.19:
-    resolution: {integrity: sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [android]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/android-x64@0.17.19:
-    resolution: {integrity: sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [android]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/darwin-arm64@0.17.19:
-    resolution: {integrity: sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/darwin-x64@0.17.19:
-    resolution: {integrity: sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/freebsd-arm64@0.17.19:
-    resolution: {integrity: sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [freebsd]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/freebsd-x64@0.17.19:
-    resolution: {integrity: sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [freebsd]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/linux-arm64@0.17.19:
-    resolution: {integrity: sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/linux-arm@0.17.19:
-    resolution: {integrity: sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/linux-ia32@0.17.19:
-    resolution: {integrity: sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/linux-loong64@0.17.19:
-    resolution: {integrity: sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ==}
-    engines: {node: '>=12'}
-    cpu: [loong64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/linux-mips64el@0.17.19:
-    resolution: {integrity: sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A==}
-    engines: {node: '>=12'}
-    cpu: [mips64el]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/linux-ppc64@0.17.19:
-    resolution: {integrity: sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg==}
-    engines: {node: '>=12'}
-    cpu: [ppc64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/linux-riscv64@0.17.19:
-    resolution: {integrity: sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA==}
-    engines: {node: '>=12'}
-    cpu: [riscv64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/linux-s390x@0.17.19:
-    resolution: {integrity: sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q==}
-    engines: {node: '>=12'}
-    cpu: [s390x]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/linux-x64@0.17.19:
-    resolution: {integrity: sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/netbsd-x64@0.17.19:
-    resolution: {integrity: sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [netbsd]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/openbsd-x64@0.17.19:
-    resolution: {integrity: sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [openbsd]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/sunos-x64@0.17.19:
-    resolution: {integrity: sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [sunos]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/win32-arm64@0.17.19:
-    resolution: {integrity: sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [win32]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/win32-ia32@0.17.19:
-    resolution: {integrity: sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [win32]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/win32-x64@0.17.19:
-    resolution: {integrity: sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    dev: true
-    optional: true
-
   /@jridgewell/resolve-uri@3.1.1:
     resolution: {integrity: sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==}
     engines: {node: '>=6.0.0'}
@@ -402,7 +204,7 @@ packages:
       normalize-path: 3.0.0
       readdirp: 3.6.0
     optionalDependencies:
-      fsevents: 2.3.3
+      fsevents: registry.npmmirror.com/fsevents@2.3.3
     dev: true
 
   /chrono-node@2.6.3:
@@ -456,28 +258,28 @@ packages:
     hasBin: true
     requiresBuild: true
     optionalDependencies:
-      '@esbuild/android-arm': 0.17.19
-      '@esbuild/android-arm64': 0.17.19
-      '@esbuild/android-x64': 0.17.19
-      '@esbuild/darwin-arm64': 0.17.19
-      '@esbuild/darwin-x64': 0.17.19
-      '@esbuild/freebsd-arm64': 0.17.19
-      '@esbuild/freebsd-x64': 0.17.19
-      '@esbuild/linux-arm': 0.17.19
-      '@esbuild/linux-arm64': 0.17.19
-      '@esbuild/linux-ia32': 0.17.19
-      '@esbuild/linux-loong64': 0.17.19
-      '@esbuild/linux-mips64el': 0.17.19
-      '@esbuild/linux-ppc64': 0.17.19
-      '@esbuild/linux-riscv64': 0.17.19
-      '@esbuild/linux-s390x': 0.17.19
-      '@esbuild/linux-x64': 0.17.19
-      '@esbuild/netbsd-x64': 0.17.19
-      '@esbuild/openbsd-x64': 0.17.19
-      '@esbuild/sunos-x64': 0.17.19
-      '@esbuild/win32-arm64': 0.17.19
-      '@esbuild/win32-ia32': 0.17.19
-      '@esbuild/win32-x64': 0.17.19
+      '@esbuild/android-arm': registry.npmmirror.com/@esbuild/android-arm@0.17.19
+      '@esbuild/android-arm64': registry.npmmirror.com/@esbuild/android-arm64@0.17.19
+      '@esbuild/android-x64': registry.npmmirror.com/@esbuild/android-x64@0.17.19
+      '@esbuild/darwin-arm64': registry.npmmirror.com/@esbuild/darwin-arm64@0.17.19
+      '@esbuild/darwin-x64': registry.npmmirror.com/@esbuild/darwin-x64@0.17.19
+      '@esbuild/freebsd-arm64': registry.npmmirror.com/@esbuild/freebsd-arm64@0.17.19
+      '@esbuild/freebsd-x64': registry.npmmirror.com/@esbuild/freebsd-x64@0.17.19
+      '@esbuild/linux-arm': registry.npmmirror.com/@esbuild/linux-arm@0.17.19
+      '@esbuild/linux-arm64': registry.npmmirror.com/@esbuild/linux-arm64@0.17.19
+      '@esbuild/linux-ia32': registry.npmmirror.com/@esbuild/linux-ia32@0.17.19
+      '@esbuild/linux-loong64': registry.npmmirror.com/@esbuild/linux-loong64@0.17.19
+      '@esbuild/linux-mips64el': registry.npmmirror.com/@esbuild/linux-mips64el@0.17.19
+      '@esbuild/linux-ppc64': registry.npmmirror.com/@esbuild/linux-ppc64@0.17.19
+      '@esbuild/linux-riscv64': registry.npmmirror.com/@esbuild/linux-riscv64@0.17.19
+      '@esbuild/linux-s390x': registry.npmmirror.com/@esbuild/linux-s390x@0.17.19
+      '@esbuild/linux-x64': registry.npmmirror.com/@esbuild/linux-x64@0.17.19
+      '@esbuild/netbsd-x64': registry.npmmirror.com/@esbuild/netbsd-x64@0.17.19
+      '@esbuild/openbsd-x64': registry.npmmirror.com/@esbuild/openbsd-x64@0.17.19
+      '@esbuild/sunos-x64': registry.npmmirror.com/@esbuild/sunos-x64@0.17.19
+      '@esbuild/win32-arm64': registry.npmmirror.com/@esbuild/win32-arm64@0.17.19
+      '@esbuild/win32-ia32': registry.npmmirror.com/@esbuild/win32-ia32@0.17.19
+      '@esbuild/win32-x64': registry.npmmirror.com/@esbuild/win32-x64@0.17.19
     dev: true
 
   /fast-glob@3.2.12:
@@ -517,14 +319,6 @@ packages:
     resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
     dev: true
 
-  /fsevents@2.3.3:
-    resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
-    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
-    os: [darwin]
-    requiresBuild: true
-    dev: true
-    optional: true
-
   /glob-parent@5.1.2:
     resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
     engines: {node: '>= 6'}
@@ -599,7 +393,7 @@ packages:
     dependencies:
       universalify: 2.0.0
     optionalDependencies:
-      graceful-fs: 4.2.11
+      graceful-fs: registry.npmmirror.com/graceful-fs@4.2.11
     dev: true
 
   /jszip@3.10.1:
@@ -773,7 +567,7 @@ packages:
     engines: {node: '>=14.18.0', npm: '>=8.0.0'}
     hasBin: true
     optionalDependencies:
-      fsevents: 2.3.3
+      fsevents: registry.npmmirror.com/fsevents@2.3.3
     dev: true
 
   /run-parallel@1.2.0:
@@ -800,10 +594,6 @@ packages:
     resolution: {integrity: sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==}
     dev: true
 
-  /siyuan@0.8.4:
-    resolution: {integrity: sha512-hkFqTxIiRiPAgS237YV54rhijgHyl/HqPbmcrxn3SJxet3+EOXtPwNKx9awJDHXsp+w/p+VKlkHP3UElrurE4Q==}
-    dev: true
-
   /source-map-js@1.0.2:
     resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==}
     engines: {node: '>=0.10.0'}
@@ -943,7 +733,7 @@ packages:
       rollup: 3.25.2
       sass: 1.62.1
     optionalDependencies:
-      fsevents: 2.3.3
+      fsevents: registry.npmmirror.com/fsevents@2.3.3
     dev: true
 
   /vitefu@0.2.4(vite@4.3.7):
@@ -978,3 +768,269 @@ packages:
     resolution: {integrity: sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==}
     engines: {node: '>=6'}
     dev: true
+
+  registry.npmmirror.com/@esbuild/android-arm64@0.17.19:
+    resolution: {integrity: sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@esbuild/android-arm64/-/android-arm64-0.17.19.tgz}
+    name: '@esbuild/android-arm64'
+    version: 0.17.19
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [android]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  registry.npmmirror.com/@esbuild/android-arm@0.17.19:
+    resolution: {integrity: sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@esbuild/android-arm/-/android-arm-0.17.19.tgz}
+    name: '@esbuild/android-arm'
+    version: 0.17.19
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [android]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  registry.npmmirror.com/@esbuild/android-x64@0.17.19:
+    resolution: {integrity: sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@esbuild/android-x64/-/android-x64-0.17.19.tgz}
+    name: '@esbuild/android-x64'
+    version: 0.17.19
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [android]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  registry.npmmirror.com/@esbuild/darwin-arm64@0.17.19:
+    resolution: {integrity: sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@esbuild/darwin-arm64/-/darwin-arm64-0.17.19.tgz}
+    name: '@esbuild/darwin-arm64'
+    version: 0.17.19
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [darwin]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  registry.npmmirror.com/@esbuild/darwin-x64@0.17.19:
+    resolution: {integrity: sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@esbuild/darwin-x64/-/darwin-x64-0.17.19.tgz}
+    name: '@esbuild/darwin-x64'
+    version: 0.17.19
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [darwin]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  registry.npmmirror.com/@esbuild/freebsd-arm64@0.17.19:
+    resolution: {integrity: sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.19.tgz}
+    name: '@esbuild/freebsd-arm64'
+    version: 0.17.19
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [freebsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  registry.npmmirror.com/@esbuild/freebsd-x64@0.17.19:
+    resolution: {integrity: sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@esbuild/freebsd-x64/-/freebsd-x64-0.17.19.tgz}
+    name: '@esbuild/freebsd-x64'
+    version: 0.17.19
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [freebsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  registry.npmmirror.com/@esbuild/linux-arm64@0.17.19:
+    resolution: {integrity: sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@esbuild/linux-arm64/-/linux-arm64-0.17.19.tgz}
+    name: '@esbuild/linux-arm64'
+    version: 0.17.19
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  registry.npmmirror.com/@esbuild/linux-arm@0.17.19:
+    resolution: {integrity: sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@esbuild/linux-arm/-/linux-arm-0.17.19.tgz}
+    name: '@esbuild/linux-arm'
+    version: 0.17.19
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  registry.npmmirror.com/@esbuild/linux-ia32@0.17.19:
+    resolution: {integrity: sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@esbuild/linux-ia32/-/linux-ia32-0.17.19.tgz}
+    name: '@esbuild/linux-ia32'
+    version: 0.17.19
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  registry.npmmirror.com/@esbuild/linux-loong64@0.17.19:
+    resolution: {integrity: sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@esbuild/linux-loong64/-/linux-loong64-0.17.19.tgz}
+    name: '@esbuild/linux-loong64'
+    version: 0.17.19
+    engines: {node: '>=12'}
+    cpu: [loong64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  registry.npmmirror.com/@esbuild/linux-mips64el@0.17.19:
+    resolution: {integrity: sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@esbuild/linux-mips64el/-/linux-mips64el-0.17.19.tgz}
+    name: '@esbuild/linux-mips64el'
+    version: 0.17.19
+    engines: {node: '>=12'}
+    cpu: [mips64el]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  registry.npmmirror.com/@esbuild/linux-ppc64@0.17.19:
+    resolution: {integrity: sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@esbuild/linux-ppc64/-/linux-ppc64-0.17.19.tgz}
+    name: '@esbuild/linux-ppc64'
+    version: 0.17.19
+    engines: {node: '>=12'}
+    cpu: [ppc64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  registry.npmmirror.com/@esbuild/linux-riscv64@0.17.19:
+    resolution: {integrity: sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@esbuild/linux-riscv64/-/linux-riscv64-0.17.19.tgz}
+    name: '@esbuild/linux-riscv64'
+    version: 0.17.19
+    engines: {node: '>=12'}
+    cpu: [riscv64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  registry.npmmirror.com/@esbuild/linux-s390x@0.17.19:
+    resolution: {integrity: sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@esbuild/linux-s390x/-/linux-s390x-0.17.19.tgz}
+    name: '@esbuild/linux-s390x'
+    version: 0.17.19
+    engines: {node: '>=12'}
+    cpu: [s390x]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  registry.npmmirror.com/@esbuild/linux-x64@0.17.19:
+    resolution: {integrity: sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@esbuild/linux-x64/-/linux-x64-0.17.19.tgz}
+    name: '@esbuild/linux-x64'
+    version: 0.17.19
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  registry.npmmirror.com/@esbuild/netbsd-x64@0.17.19:
+    resolution: {integrity: sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@esbuild/netbsd-x64/-/netbsd-x64-0.17.19.tgz}
+    name: '@esbuild/netbsd-x64'
+    version: 0.17.19
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [netbsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  registry.npmmirror.com/@esbuild/openbsd-x64@0.17.19:
+    resolution: {integrity: sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@esbuild/openbsd-x64/-/openbsd-x64-0.17.19.tgz}
+    name: '@esbuild/openbsd-x64'
+    version: 0.17.19
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [openbsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  registry.npmmirror.com/@esbuild/sunos-x64@0.17.19:
+    resolution: {integrity: sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@esbuild/sunos-x64/-/sunos-x64-0.17.19.tgz}
+    name: '@esbuild/sunos-x64'
+    version: 0.17.19
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [sunos]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  registry.npmmirror.com/@esbuild/win32-arm64@0.17.19:
+    resolution: {integrity: sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@esbuild/win32-arm64/-/win32-arm64-0.17.19.tgz}
+    name: '@esbuild/win32-arm64'
+    version: 0.17.19
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  registry.npmmirror.com/@esbuild/win32-ia32@0.17.19:
+    resolution: {integrity: sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@esbuild/win32-ia32/-/win32-ia32-0.17.19.tgz}
+    name: '@esbuild/win32-ia32'
+    version: 0.17.19
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  registry.npmmirror.com/@esbuild/win32-x64@0.17.19:
+    resolution: {integrity: sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@esbuild/win32-x64/-/win32-x64-0.17.19.tgz}
+    name: '@esbuild/win32-x64'
+    version: 0.17.19
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  registry.npmmirror.com/fsevents@2.3.3:
+    resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fsevents/-/fsevents-2.3.3.tgz}
+    name: fsevents
+    version: 2.3.3
+    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
+    os: [darwin]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  registry.npmmirror.com/graceful-fs@4.2.11:
+    resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.11.tgz}
+    name: graceful-fs
+    version: 4.2.11
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  registry.npmmirror.com/siyuan@0.8.8:
+    resolution: {integrity: sha512-hWADf2RsEhDVIZhGMVq1CdvI4r1gKOdoI8nSvNszF9ztK/cwKQo90EWDwz/V7uSyWoTgt2xVDZXsIk3ZAS3cvA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/siyuan/-/siyuan-0.8.8.tgz}
+    name: siyuan
+    version: 0.8.8
+    dev: true

From 1eb5a302ecf99a8fceaa732ce739f3453f9c8cf5 Mon Sep 17 00:00:00 2001
From: frostime <frostime@foxmail.com>
Date: Sat, 11 Nov 2023 22:20:43 +0800
Subject: [PATCH 02/11] =?UTF-8?q?refacotor(appId)=EF=BC=9A=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E6=96=B0=E7=9A=84=20API=20=E6=9D=A5=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=20APPID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin.json       | 4 ++--
 src/func/index.ts | 9 +--------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/plugin.json b/plugin.json
index 8f62e1b..aaede17 100644
--- a/plugin.json
+++ b/plugin.json
@@ -6,8 +6,8 @@
     "en_US": "Daily Note Today"
   },
   "url": "https://github.com/frostime/siyuan-dailynote-today",
-  "version": "1.2.10",
-  "minAppVersion": "2.10.6",
+  "version": "1.2.11",
+  "minAppVersion": "2.10.13",
   "description": {
     "zh_CN": "自动创建日记 + 快速打开日记 + 日程 TODO 管理 + 移动块功能",
     "en_US": "Automatically open today's notes + Quickly open today's notes + TODO mangagement for today + Move blocks"
diff --git a/src/func/index.ts b/src/func/index.ts
index 7fb785d..2148645 100644
--- a/src/func/index.ts
+++ b/src/func/index.ts
@@ -269,14 +269,7 @@ export async function createDiary(notebook: Notebook, todayDiaryHpath: string) {
  */
 export async function openDiary(notebook: Notebook) {
     console.log(utils.app)
-    //@ts-ignore
-    const ws_url: string = window.siyuan.ws.ws.url;
-    const appIdReg = /app=(\w+)&/
-    let match = ws_url.match(appIdReg);
-    let appId = ""; //https://github.com/frostime/siyuan-dailynote-today/issues/171
-    if (match) {
-        appId = match[1];
-    }
+    let appId = utils.app.appId;
     await serverApi.createDailyNote(notebook.id, appId);
     showMessage(`${i18n.Open}: ${notebook.name}`, 2000, 'info');
 }

From 20a54749ea82546b52f73205cc800c489b240bdc Mon Sep 17 00:00:00 2001
From: frostime <frostime@foxmail.com>
Date: Sun, 12 Nov 2023 17:06:41 +0800
Subject: [PATCH 03/11] =?UTF-8?q?=F0=9F=A6=84=20refactor(loaded-protyle):?=
 =?UTF-8?q?=20=E5=B0=86=E4=BA=8B=E4=BB=B6=E9=87=8D=E6=9E=84=E4=B8=BA?=
 =?UTF-8?q?=E6=96=B0=E7=89=88=E7=9A=84`loaded-protyle-static`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin.json                    |  2 +-
 src/components/toolbar-menu.ts | 18 ++++++++++--------
 src/func/index.ts              |  2 +-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/plugin.json b/plugin.json
index aaede17..0025596 100644
--- a/plugin.json
+++ b/plugin.json
@@ -7,7 +7,7 @@
   },
   "url": "https://github.com/frostime/siyuan-dailynote-today",
   "version": "1.2.11",
-  "minAppVersion": "2.10.13",
+  "minAppVersion": "2.10.14",
   "description": {
     "zh_CN": "自动创建日记 + 快速打开日记 + 日程 TODO 管理 + 移动块功能",
     "en_US": "Automatically open today's notes + Quickly open today's notes + TODO mangagement for today + Move blocks"
diff --git a/src/components/toolbar-menu.ts b/src/components/toolbar-menu.ts
index e61ab34..43aca55 100644
--- a/src/components/toolbar-menu.ts
+++ b/src/components/toolbar-menu.ts
@@ -1,4 +1,4 @@
-import { IMenuItemOption, Menu, Plugin, confirm, showMessage } from "siyuan";
+import { IMenuItemOption, Menu, Plugin, confirm, showMessage, IEventBusMap } from "siyuan";
 import { currentDiaryStatus, openDiary, updateTodayReservation } from "../func";
 import notebooks from "../global-notebooks";
 import { reservation, settings } from "../global-status";
@@ -49,11 +49,11 @@ export class ToolbarMenuItem {
         if (!reservation.isTodayReserved) {
             return
         }
-        this.plugin.eventBus.on("loaded-protyle", this.onProtyleLoadedBindThis);
+        this.plugin.eventBus.on("loaded-protyle-static", this.onProtyleLoadedBindThis);
         // 3分钟后, 取消监听, 防止不必要的性能损耗
         setTimeout(
             () => {
-                this.plugin.eventBus.off("loaded-protyle", this.onProtyleLoadedBindThis);
+                this.plugin.eventBus.off("loaded-protyle-static", this.onProtyleLoadedBindThis);
             }, 
             1000 * 60 * 2
         );
@@ -64,7 +64,7 @@ export class ToolbarMenuItem {
         eventBus.unSubscribe('moveBlocks', UpdateDailyNoteStatusListener);
         this.ele.remove();
         this.ele = null;
-        this.plugin.eventBus.off("loaded-protyle", this.onProtyleLoadedBindThis);
+        this.plugin.eventBus.off("loaded-protyle-static", this.onProtyleLoadedBindThis);
         debug('TopBarIcon released');
     }
 
@@ -193,17 +193,19 @@ export class ToolbarMenuItem {
      * 监听自动打开日记后，插入当天预约用
      */
     private async onProtyleLoaded({ detail }) {
-        const block_ = detail.block;
+        console.debug(detail);
+        const protyle = detail.protyle;
+        const block_ = protyle.block;
         if (block_.id != block_.rootID) {
             return;
         }
         //是否为文档
-        const headElement: HTMLElement = detail?.model?.headElement;
+        const headElement: HTMLElement = protyle?.model?.headElement;
         if (!headElement) {
             return;
         }
         //笔记本是否是默认笔记本
-        const notebookId = detail.notebookId;
+        const notebookId = protyle.notebookId;
         if (notebookId !== notebooks.default.id) {
             return;
         }
@@ -224,7 +226,7 @@ export class ToolbarMenuItem {
             // console.log(block.hpath);
             if (notebooks.default.dailynoteHpath === block.hpath) {
                 debug('Got Today\'s daily note');
-                this.plugin.eventBus.off("loaded-protyle", this.onProtyleLoadedBindThis);
+                this.plugin.eventBus.off("loaded-protyle-static", this.onProtyleLoadedBindThis);
                 await updateTodayReservation(notebooks.default, true);
             }
         }
diff --git a/src/func/index.ts b/src/func/index.ts
index 2148645..d38fda6 100644
--- a/src/func/index.ts
+++ b/src/func/index.ts
@@ -268,7 +268,7 @@ export async function createDiary(notebook: Notebook, todayDiaryHpath: string) {
  * @param notebook_index 笔记本的 index
  */
 export async function openDiary(notebook: Notebook) {
-    console.log(utils.app)
+    // console.log(utils.app)
     let appId = utils.app.appId;
     await serverApi.createDailyNote(notebook.id, appId);
     showMessage(`${i18n.Open}: ${notebook.name}`, 2000, 'info');

From e15acf599231f83dd7669bc96fcfa5bdf2d57700 Mon Sep 17 00:00:00 2001
From: frostime <frostime@foxmail.com>
Date: Sun, 12 Nov 2023 17:31:06 +0800
Subject: [PATCH 04/11] =?UTF-8?q?=E2=9C=A8=20feat(setting):=20=E4=B8=BA?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=90=8E=E6=89=93=E5=BC=80=E6=97=A5=E8=AE=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/setting-gui.svelte           | 4 ++++
 src/components/settings/setting-item.svelte | 4 ++--
 src/global-status.ts                        | 1 +
 src/i18n/en_US.json                         | 4 ++++
 src/i18n/zh_CN.json                         | 4 ++++
 5 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/components/setting-gui.svelte b/src/components/setting-gui.svelte
index 8033fe9..e9fd5eb 100644
--- a/src/components/setting-gui.svelte
+++ b/src/components/setting-gui.svelte
@@ -50,6 +50,10 @@
             {
                 name: "DisableAutoCreateOnMobile",
                 type: "checkbox"
+            },
+            {
+                name: "AutoOpenAfterSync",
+                type: "checkbox"
             }
         ],
         reservation: [
diff --git a/src/components/settings/setting-item.svelte b/src/components/settings/setting-item.svelte
index f4f2583..b359ea4 100644
--- a/src/components/settings/setting-item.svelte
+++ b/src/components/settings/setting-item.svelte
@@ -22,9 +22,9 @@
 
 <label class="fn__flex b3-label">
     <div class="fn__flex-1">
-        {content.title}
+        {@html content.title}
         <div class="b3-label__text">
-            {content.text}
+            {@html content.text}
         </div>
     </div>
     <span class="fn__space" />
diff --git a/src/global-status.ts b/src/global-status.ts
index fe0aad3..d12ba72 100644
--- a/src/global-status.ts
+++ b/src/global-status.ts
@@ -23,6 +23,7 @@ class SettingManager {
 
     settings: any = {
         OpenOnStart: true as boolean, //启动的时候自动打开日记
+        AutoOpenAfterSync: false as boolean, //在第一次同步之后再自动打开日记
         DefaultNotebook: '', //默认笔记本的 ID
         DisableAutoCreateOnMobile: false as boolean, //移动端自动创建日记
         IconPosition: 'left' as IconPosition, //图标放置位置
diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json
index 9d0e8d5..66c9164 100644
--- a/src/i18n/en_US.json
+++ b/src/i18n/en_US.json
@@ -7,6 +7,10 @@
             "title": "Open Today's Diary Automatically",
             "text": "Open Today's Diary automatically when the plugin is loaded"
         },
+        "AutoOpenAfterSync": {
+            "title": "Automatically create daily note only after synchronization <span style=\"font-weight: bold; color: red\">*Experimental Features</span>",
+            "text": "To solve the document conflict problem caused by synchronization + automatic opening of DN, try opening DN automatically after synchronization. This feature is <b>experimental</b> and lacks sufficient testing, so please use it at your discretion."
+        },
         "DefaultNotebook": {
             "title": "Default Notebook ID",
             "text": "The notebook where the daily note is created by default, use the first notebook if blank",
diff --git a/src/i18n/zh_CN.json b/src/i18n/zh_CN.json
index 26a2fdf..820df4d 100644
--- a/src/i18n/zh_CN.json
+++ b/src/i18n/zh_CN.json
@@ -7,6 +7,10 @@
             "title": "自动打开 Daily Note",
             "text": "插件启动后自动打开今日的 Daily Note"
         },
+        "AutoOpenAfterSync": {
+            "title": "在同步后才自动创建日记 <span style=\"font-weight: bold; color: red\">*实验性功能</span>",
+            "text": "为了解决同步+自动打开日记造成的文件冲突问题，尝试在同步之后在自动打开日记。本功能为<b>实验性功能</b>，缺少足够的测试，请斟酌使用。"
+        },
         "DefaultNotebook": {
             "title": "设置默认笔记本 ID",
             "text": "设置默认的笔记本 ID, 留空时表示选择排位第一的笔记本",

From 9db3b4737eff26a5b22d0d0a46a42bdfb351f472 Mon Sep 17 00:00:00 2001
From: frostime <frostime@foxmail.com>
Date: Sun, 12 Nov 2023 17:43:17 +0800
Subject: [PATCH 05/11] =?UTF-8?q?=F0=9F=A6=84=20refactor(dailynote):=20?=
 =?UTF-8?q?=E5=B0=86=E9=83=A8=E5=88=86dn=E7=9B=B8=E5=85=B3=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=8A=BD=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/func/dailynote.ts | 49 +++++++++++++++++++++++++++++++++++++++++++
 src/func/index.ts     | 32 +++-------------------------
 src/index.ts          |  2 ++
 src/types/index.d.ts  |  2 +-
 4 files changed, 55 insertions(+), 30 deletions(-)

diff --git a/src/func/dailynote.ts b/src/func/dailynote.ts
index 92ba19d..2cc76c0 100644
--- a/src/func/dailynote.ts
+++ b/src/func/dailynote.ts
@@ -1,4 +1,15 @@
+/*
+ * Copyright (c) 2023 by Yp Z (frostime). All Rights Reserved.
+ * @Author       : Yp Z
+ * @Date         : 2023-06-16 21:00:30
+ * @FilePath     : /src/func/dailynote.ts
+ * @LastEditTime : 2023-11-12 17:40:14
+ * @Description  : 
+ */
 import * as serverApi from '../serverApi';
+import * as utils from '@/utils';
+import { info, i18n } from '@/utils';
+import { showMessage } from 'siyuan';
 
 /**
  * 
@@ -19,3 +30,41 @@ export async function getDailynoteSprig(notebookId: string): Promise<string> {
 export async function renderDailynotePath(sprig: string) {
     return await serverApi.renderSprig(sprig);
 }
+
+
+function today(): string {
+    let date = new Date();
+    let year = date.getFullYear();
+    let month = date.getMonth() + 1;
+    let day = date.getDate();
+    return `${year}${month < 10 ? '0' + month : month}${day < 10 ? '0' + day : day}`;
+}
+
+export async function createDiary(notebook: Notebook, todayDiaryHpath: string) {
+    let doc_id = await serverApi.createDocWithMd(notebook.id, todayDiaryHpath, "");
+    info(`创建日记: ${notebook.name} ${todayDiaryHpath}`);
+    serverApi.setBlockAttrs(doc_id, { "custom-dailynote": today() });
+    return doc_id;
+}
+
+
+/**
+ * 打开指定的笔记本下今天的日记，如果不存在则创建
+ * @param notebook_index 笔记本的 index
+ */
+export async function openDiary(notebook: Notebook) {
+    // console.log(utils.app)
+    let appId = utils.app.appId;
+    await serverApi.createDailyNote(notebook.id, appId);
+    showMessage(`${i18n.Open}: ${notebook.name}`, 2000, 'info');
+}
+
+// class AutoOpenDailyNoteHandler {
+
+    
+
+//     constructor() {
+
+//     }
+// }
+
diff --git a/src/func/index.ts b/src/func/index.ts
index d38fda6..e4967ae 100644
--- a/src/func/index.ts
+++ b/src/func/index.ts
@@ -5,11 +5,13 @@ import { showMessage, confirm, Dialog, openTab } from 'siyuan';
 import notebooks from '../global-notebooks';
 import { info, warn, error, i18n, lute, app, isMobile, formatBlockTime, debug } from "../utils";
 import * as serverApi from '../serverApi';
-import * as utils from '@/utils';
 import { reservation, settings } from '../global-status';
 import { Retrieve, RetvFactory } from './reserve';
 import { getDailynoteSprig, renderDailynotePath } from './dailynote';
 
+export * from './dailynote';
+export * from './reserve';
+
 
 const default_sprig = `/daily note/{{now | date "2006/01"}}/{{now | date "2006-01-02"}}`
 const hiddenNotebook: Set<string> = new Set(["思源笔记用户指南", "SiYuan User Guide"]);
@@ -97,8 +99,6 @@ export async function currentDiaryStatus() {
 }
 
 
-
-
 /**
  * getDocsByHpath returns all documents in the database that have a given hpath. 
  * If a notebook is not null, then it only returns documents in that notebook that have the given hpath.
@@ -247,32 +247,6 @@ export async function checkDuplicateDiary(): Promise<boolean> {
     return true;
 }
 
-function today(): string {
-    let date = new Date();
-    let year = date.getFullYear();
-    let month = date.getMonth() + 1;
-    let day = date.getDate();
-    return `${year}${month < 10 ? '0' + month : month}${day < 10 ? '0' + day : day}`;
-}
-
-export async function createDiary(notebook: Notebook, todayDiaryHpath: string) {
-    let doc_id = await serverApi.createDocWithMd(notebook.id, todayDiaryHpath, "");
-    info(`创建日记: ${notebook.name} ${todayDiaryHpath}`);
-    serverApi.setBlockAttrs(doc_id, { "custom-dailynote": today() });
-    return doc_id;
-}
-
-
-/**
- * 打开指定的笔记本下今天的日记，如果不存在则创建
- * @param notebook_index 笔记本的 index
- */
-export async function openDiary(notebook: Notebook) {
-    // console.log(utils.app)
-    let appId = utils.app.appId;
-    await serverApi.createDailyNote(notebook.id, appId);
-    showMessage(`${i18n.Open}: ${notebook.name}`, 2000, 'info');
-}
 
 export async function filterExistsBlocks(blockIds: string[]): Promise<Set<string>> {
     let idStr = blockIds.map(id => `'${id}'`).join(",");
diff --git a/src/index.ts b/src/index.ts
index adf10b7..d9575da 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -21,6 +21,8 @@ import "./index.scss";
 let OnWsMainEvent: EventListener;
 // const WAIT_TIME_FOR_SYNC_CHECK: Milisecond = 1000 * 60 * 5;
 const MAX_CHECK_SYNC_TIMES: number = 10; //为了避免每次同步都检查，最多检查10次
+//@ts-ignore
+const SYNC_ENABLED = window.siyuan.config.sync.enabled;
 
 
 export default class DailyNoteTodayPlugin extends Plugin {
diff --git a/src/types/index.d.ts b/src/types/index.d.ts
index b6cf758..6c5ae75 100644
--- a/src/types/index.d.ts
+++ b/src/types/index.d.ts
@@ -86,7 +86,7 @@ type SettingKey = (
     'PluginVersion' | "EnableMove" | 'EnableReserve' | 
     "ExpandGutterMenu" | 'PopupReserveDialog' | 'ResvEmbedAt' |
     'RetvType' | 'EnableResvDock' | 'DisableAutoCreateOnMobile' |
-    'NotebookBlacklist'
+    'NotebookBlacklist' | 'AutoOpenAfterSync'
 );
 
 interface ISettingItem {

From 1011a5b1a403ef8427b1ce4cb8ba3134b52a24b8 Mon Sep 17 00:00:00 2001
From: frostime <frostime@foxmail.com>
Date: Sun, 12 Nov 2023 18:04:39 +0800
Subject: [PATCH 06/11] =?UTF-8?q?=F0=9F=A6=84=20refactor(dailynote):=20?=
 =?UTF-8?q?=E6=8A=8Adaily=20note=E7=9B=B8=E5=85=B3=E7=9A=84=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=87=BD=E6=95=B0=E7=A7=BB=E5=88=B0=20dailynote.ts=20?=
 =?UTF-8?q?=E5=86=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/toolbar-menu.ts | 35 +-----------
 src/func/dailynote.ts          | 99 +++++++++++++++++++++++++++++++---
 src/func/index.ts              | 33 ------------
 src/index.ts                   |  6 +--
 4 files changed, 95 insertions(+), 78 deletions(-)

diff --git a/src/components/toolbar-menu.ts b/src/components/toolbar-menu.ts
index 43aca55..c9d3ed4 100644
--- a/src/components/toolbar-menu.ts
+++ b/src/components/toolbar-menu.ts
@@ -1,4 +1,4 @@
-import { IMenuItemOption, Menu, Plugin, confirm, showMessage, IEventBusMap } from "siyuan";
+import { IMenuItemOption, Menu, Plugin, showMessage, IEventBusMap } from "siyuan";
 import { currentDiaryStatus, openDiary, updateTodayReservation } from "../func";
 import notebooks from "../global-notebooks";
 import { reservation, settings } from "../global-status";
@@ -42,6 +42,7 @@ export class ToolbarMenuItem {
     }
 
     /**
+     * #TODO: 将这个函数重构放到 reservation.ts 下
      * 根据预约情况, 监听日记本的加载, 如果是今天的日记本, 则更新预约状态
      * @returns 
      */
@@ -157,38 +158,6 @@ export class ToolbarMenuItem {
         return menuItems;
     }
 
-    /**
-     * 初始化的时候，加载所有的笔记本
-     */
-    async autoOpenDailyNote() {
-        debug('自动开启日记');
-        if (isMobile && settings.get('DisableAutoCreateOnMobile') === true) {
-            // showMessage('移动端不开放');
-            return;
-        }
-        //小窗打开模式下, 不再自动打开
-        const url = new URL(window.location.href);
-        // showMessage(url.pathname);
-        if (url.pathname.startsWith('/stage/build/app/window.html')) {
-            debug('小窗模式, 无需自动打开日记');
-            return;
-        }
-
-        if (notebooks.notebooks.length > 0) {
-            if (settings.settings.OpenOnStart === true) {
-                let notebookId: string = settings.get('DefaultNotebook');
-                let notebook: Notebook = notebooks.default;
-                if (notebook) {
-                    await openDiary(notebook);
-                    // initTodayReservation(notebook);
-                } else {
-                    confirm(i18n.Name, `${notebookId} ${i18n.InvalidDefaultNotebook}`)
-                    return
-                }
-            }
-        }
-    }
-
     /**
      * 监听自动打开日记后，插入当天预约用
      */
diff --git a/src/func/dailynote.ts b/src/func/dailynote.ts
index 2cc76c0..fc46320 100644
--- a/src/func/dailynote.ts
+++ b/src/func/dailynote.ts
@@ -3,13 +3,19 @@
  * @Author       : Yp Z
  * @Date         : 2023-06-16 21:00:30
  * @FilePath     : /src/func/dailynote.ts
- * @LastEditTime : 2023-11-12 17:40:14
+ * @LastEditTime : 2023-11-12 18:01:37
  * @Description  : 
  */
 import * as serverApi from '../serverApi';
 import * as utils from '@/utils';
-import { info, i18n } from '@/utils';
-import { showMessage } from 'siyuan';
+import { info, i18n, isMobile, debug } from '@/utils';
+import { showMessage, confirm } from 'siyuan';
+import notebooks from "../global-notebooks";
+import { settings } from '@/global-status';
+
+import { getDocsByHpath } from '@/func';
+
+import type DailyNoteTodayPlugin from '@/index';
 
 /**
  * 
@@ -59,12 +65,89 @@ export async function openDiary(notebook: Notebook) {
     showMessage(`${i18n.Open}: ${notebook.name}`, 2000, 'info');
 }
 
-// class AutoOpenDailyNoteHandler {
+/**
+ * 根据思源中已经有 diary 的笔记本，更新下拉框中的笔记本状态
+ * 注意，本函数不会更新 notebooks
+ * @details
+ * 1. 遍历所有笔记本，找到所有的 daily note 的 hpath
+ * 2. 对每种 hpath，调用 `await getDocsByHpath(todayDNHpath)`，查询是否存在对应的文件
+ */
+export async function currentDiaryStatus() {
+    // let todayDiary = getTodayDiaryPath();
+    //所有 hpath 的配置方案
+    let hpath_set: Set<string> = new Set();
+    notebooks.notebooks.forEach((notebook) => {
+        hpath_set.add(notebook.dailynoteHpath!);
+    });
+
+    let diaryStatus: Map<string, boolean> = new Map();
+    let count_diary = 0;
+    for (const todayDNHpath of hpath_set) {
+        //对每种 daily note 的方案，看看是否存在对应的路径
+        let docs = await getDocsByHpath(todayDNHpath);
+        if (docs.length > 0) {
+            let notebook_with_diary = docs.map(doc => doc.box);
+            notebook_with_diary.forEach((notebookId: string) => {
+                diaryStatus.set(notebookId, true);
+            });
+            count_diary += notebook_with_diary.length;
+        }
+    }
+    info(`更新日记状态: 当前日记共 ${count_diary} 篇`);
+    return diaryStatus;
+}
+
+/**
+ * 初始化的时候，加载所有的笔记本
+ */
+export async function autoOpenDailyNote() {
+    debug('自动开启日记');
+    if (isMobile && settings.get('DisableAutoCreateOnMobile') === true) {
+        // showMessage('移动端不开放');
+        return;
+    }
+    //小窗打开模式下, 不再自动打开
+    const url = new URL(window.location.href);
+    // showMessage(url.pathname);
+    if (url.pathname.startsWith('/stage/build/app/window.html')) {
+        debug('小窗模式, 无需自动打开日记');
+        return;
+    }
+
+    if (notebooks.notebooks.length > 0) {
+        if (settings.settings.OpenOnStart === true) {
+            let notebookId: string = settings.get('DefaultNotebook');
+            let notebook: Notebook = notebooks.default;
+            if (notebook) {
+                await openDiary(notebook);
+                // initTodayReservation(notebook);
+            } else {
+                confirm(i18n.Name, `${notebookId} ${i18n.InvalidDefaultNotebook}`)
+                return
+            }
+        }
+    }
+}
 
-    
+//@ts-ignore
+const SYNC_ENABLED = window.siyuan.config.sync.enabled;
 
-//     constructor() {
+class AutoOpenDailyNoteHandler {
+    plugin: DailyNoteTodayPlugin;
+    openOnStart: boolean;
+    autoOpenAfterSync: boolean;
 
-//     }
-// }
+    constructor(plugin: DailyNoteTodayPlugin) {
+        this.plugin = plugin;
+        this.openOnStart = settings.get('OpenOnStart');
+        this.autoOpenAfterSync = settings.get('AutoOpenAfterSync');
+    }
+
+    onPluginLoad() {
+        //如果思源没有开启
+        if (SYNC_ENABLED === false) {
+
+        }
+    }
+}
 
diff --git a/src/func/index.ts b/src/func/index.ts
index e4967ae..b12aa7d 100644
--- a/src/func/index.ts
+++ b/src/func/index.ts
@@ -66,39 +66,6 @@ export async function queryNotebooks(): Promise<Array<Notebook> | null> {
 }
 
 
-/**
- * 根据思源中已经有 diary 的笔记本，更新下拉框中的笔记本状态
- * 注意，本函数不会更新 notebooks
- * @details
- * 1. 遍历所有笔记本，找到所有的 daily note 的 hpath
- * 2. 对每种 hpath，调用 `await getDocsByHpath(todayDNHpath)`，查询是否存在对应的文件
- */
-export async function currentDiaryStatus() {
-    // let todayDiary = getTodayDiaryPath();
-    //所有 hpath 的配置方案
-    let hpath_set: Set<string> = new Set();
-    notebooks.notebooks.forEach((notebook) => {
-        hpath_set.add(notebook.dailynoteHpath!);
-    });
-
-    let diaryStatus: Map<string, boolean> = new Map();
-    let count_diary = 0;
-    for (const todayDNHpath of hpath_set) {
-        //对每种 daily note 的方案，看看是否存在对应的路径
-        let docs = await getDocsByHpath(todayDNHpath);
-        if (docs.length > 0) {
-            let notebook_with_diary = docs.map(doc => doc.box);
-            notebook_with_diary.forEach((notebookId: string) => {
-                diaryStatus.set(notebookId, true);
-            });
-            count_diary += notebook_with_diary.length;
-        }
-    }
-    info(`更新日记状态: 当前日记共 ${count_diary} 篇`);
-    return diaryStatus;
-}
-
-
 /**
  * getDocsByHpath returns all documents in the database that have a given hpath. 
  * If a notebook is not null, then it only returns documents in that notebook that have the given hpath.
diff --git a/src/index.ts b/src/index.ts
index d9575da..a0bd0f5 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -6,7 +6,7 @@ import Setting from './components/setting-gui.svelte'
 import ShowReserve from './components/dock-reserve.svelte';
 import { ToolbarMenuItem } from './components/toolbar-menu';
 import { GutterMenu } from './components/gutter-menu';
-import { checkDuplicateDiary, updateTodayReservation } from './func';
+import { checkDuplicateDiary, updateTodayReservation, autoOpenDailyNote } from './func';
 import { debug, info, setApp, setI18n, setIsMobile, setPlugin, debouncer } from './utils';
 import { settings, reservation } from './global-status';
 import notebooks from './global-notebooks';
@@ -21,8 +21,6 @@ import "./index.scss";
 let OnWsMainEvent: EventListener;
 // const WAIT_TIME_FOR_SYNC_CHECK: Milisecond = 1000 * 60 * 5;
 const MAX_CHECK_SYNC_TIMES: number = 10; //为了避免每次同步都检查，最多检查10次
-//@ts-ignore
-const SYNC_ENABLED = window.siyuan.config.sync.enabled;
 
 
 export default class DailyNoteTodayPlugin extends Plugin {
@@ -76,7 +74,7 @@ export default class DailyNoteTodayPlugin extends Plugin {
 
         this.toolbarItem.startMonitorDailyNoteForReservation();
         // 如果有笔记本，且设置中允许启动时打开，则打开第一个笔记本
-        await this.toolbarItem.autoOpenDailyNote();
+        await autoOpenDailyNote();
 
         this.checkDuplicateDiary();
         this.checkDuplicateDiary_Debounce = debouncer.debounce(

From 593ca01c35e23bb22451c0c74490efcf96df3f9b Mon Sep 17 00:00:00 2001
From: frostime <frostime@foxmail.com>
Date: Sun, 12 Nov 2023 18:15:58 +0800
Subject: [PATCH 07/11] =?UTF-8?q?=F0=9F=A6=84=20refactor(dailynote):=20?=
 =?UTF-8?q?=E5=B0=86=20dailynote.ts=20=E6=8B=86=E5=88=86=E4=B8=BA=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AA=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/func/dailynote.ts                 | 153 --------------------------
 src/func/dailynote/basic.ts           |  65 +++++++++++
 src/func/dailynote/check-duplicate.ts |   0
 src/func/dailynote/index.ts           |  37 +++++++
 src/func/dailynote/open-dn.ts         |  71 ++++++++++++
 5 files changed, 173 insertions(+), 153 deletions(-)
 delete mode 100644 src/func/dailynote.ts
 create mode 100644 src/func/dailynote/basic.ts
 create mode 100644 src/func/dailynote/check-duplicate.ts
 create mode 100644 src/func/dailynote/index.ts
 create mode 100644 src/func/dailynote/open-dn.ts

diff --git a/src/func/dailynote.ts b/src/func/dailynote.ts
deleted file mode 100644
index fc46320..0000000
--- a/src/func/dailynote.ts
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright (c) 2023 by Yp Z (frostime). All Rights Reserved.
- * @Author       : Yp Z
- * @Date         : 2023-06-16 21:00:30
- * @FilePath     : /src/func/dailynote.ts
- * @LastEditTime : 2023-11-12 18:01:37
- * @Description  : 
- */
-import * as serverApi from '../serverApi';
-import * as utils from '@/utils';
-import { info, i18n, isMobile, debug } from '@/utils';
-import { showMessage, confirm } from 'siyuan';
-import notebooks from "../global-notebooks";
-import { settings } from '@/global-status';
-
-import { getDocsByHpath } from '@/func';
-
-import type DailyNoteTodayPlugin from '@/index';
-
-/**
- * 
- * @param notebook 笔记本对象
- * @returns 笔记本的 Daily Note 路径模板
- */
-export async function getDailynoteSprig(notebookId: string): Promise<string> {
-    let conf = await serverApi.getNotebookConf(notebookId);
-    let sprig: string = conf.conf.dailyNoteSavePath;
-    return sprig;
-}
-
-/**
- * 要求思源解析模板
- * @param sprig
- * @returns 
- */
-export async function renderDailynotePath(sprig: string) {
-    return await serverApi.renderSprig(sprig);
-}
-
-
-function today(): string {
-    let date = new Date();
-    let year = date.getFullYear();
-    let month = date.getMonth() + 1;
-    let day = date.getDate();
-    return `${year}${month < 10 ? '0' + month : month}${day < 10 ? '0' + day : day}`;
-}
-
-export async function createDiary(notebook: Notebook, todayDiaryHpath: string) {
-    let doc_id = await serverApi.createDocWithMd(notebook.id, todayDiaryHpath, "");
-    info(`创建日记: ${notebook.name} ${todayDiaryHpath}`);
-    serverApi.setBlockAttrs(doc_id, { "custom-dailynote": today() });
-    return doc_id;
-}
-
-
-/**
- * 打开指定的笔记本下今天的日记，如果不存在则创建
- * @param notebook_index 笔记本的 index
- */
-export async function openDiary(notebook: Notebook) {
-    // console.log(utils.app)
-    let appId = utils.app.appId;
-    await serverApi.createDailyNote(notebook.id, appId);
-    showMessage(`${i18n.Open}: ${notebook.name}`, 2000, 'info');
-}
-
-/**
- * 根据思源中已经有 diary 的笔记本，更新下拉框中的笔记本状态
- * 注意，本函数不会更新 notebooks
- * @details
- * 1. 遍历所有笔记本，找到所有的 daily note 的 hpath
- * 2. 对每种 hpath，调用 `await getDocsByHpath(todayDNHpath)`，查询是否存在对应的文件
- */
-export async function currentDiaryStatus() {
-    // let todayDiary = getTodayDiaryPath();
-    //所有 hpath 的配置方案
-    let hpath_set: Set<string> = new Set();
-    notebooks.notebooks.forEach((notebook) => {
-        hpath_set.add(notebook.dailynoteHpath!);
-    });
-
-    let diaryStatus: Map<string, boolean> = new Map();
-    let count_diary = 0;
-    for (const todayDNHpath of hpath_set) {
-        //对每种 daily note 的方案，看看是否存在对应的路径
-        let docs = await getDocsByHpath(todayDNHpath);
-        if (docs.length > 0) {
-            let notebook_with_diary = docs.map(doc => doc.box);
-            notebook_with_diary.forEach((notebookId: string) => {
-                diaryStatus.set(notebookId, true);
-            });
-            count_diary += notebook_with_diary.length;
-        }
-    }
-    info(`更新日记状态: 当前日记共 ${count_diary} 篇`);
-    return diaryStatus;
-}
-
-/**
- * 初始化的时候，加载所有的笔记本
- */
-export async function autoOpenDailyNote() {
-    debug('自动开启日记');
-    if (isMobile && settings.get('DisableAutoCreateOnMobile') === true) {
-        // showMessage('移动端不开放');
-        return;
-    }
-    //小窗打开模式下, 不再自动打开
-    const url = new URL(window.location.href);
-    // showMessage(url.pathname);
-    if (url.pathname.startsWith('/stage/build/app/window.html')) {
-        debug('小窗模式, 无需自动打开日记');
-        return;
-    }
-
-    if (notebooks.notebooks.length > 0) {
-        if (settings.settings.OpenOnStart === true) {
-            let notebookId: string = settings.get('DefaultNotebook');
-            let notebook: Notebook = notebooks.default;
-            if (notebook) {
-                await openDiary(notebook);
-                // initTodayReservation(notebook);
-            } else {
-                confirm(i18n.Name, `${notebookId} ${i18n.InvalidDefaultNotebook}`)
-                return
-            }
-        }
-    }
-}
-
-//@ts-ignore
-const SYNC_ENABLED = window.siyuan.config.sync.enabled;
-
-class AutoOpenDailyNoteHandler {
-    plugin: DailyNoteTodayPlugin;
-    openOnStart: boolean;
-    autoOpenAfterSync: boolean;
-
-    constructor(plugin: DailyNoteTodayPlugin) {
-        this.plugin = plugin;
-        this.openOnStart = settings.get('OpenOnStart');
-        this.autoOpenAfterSync = settings.get('AutoOpenAfterSync');
-    }
-
-    onPluginLoad() {
-        //如果思源没有开启
-        if (SYNC_ENABLED === false) {
-
-        }
-    }
-}
-
diff --git a/src/func/dailynote/basic.ts b/src/func/dailynote/basic.ts
new file mode 100644
index 0000000..e055412
--- /dev/null
+++ b/src/func/dailynote/basic.ts
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2023 by Yp Z (frostime). All Rights Reserved.
+ * @Author       : Yp Z
+ * @Date         : 2023-11-12 18:06:46
+ * @FilePath     : /src/func/dailynote/basic.ts
+ * @LastEditTime : 2023-11-12 18:15:30
+ * @Description  : 
+ */
+import * as serverApi from '@/serverApi';
+import notebooks from "@/global-notebooks";
+import { info } from '@/utils';
+import { getDocsByHpath } from '@/func';
+
+/**
+ * 
+ * @param notebook 笔记本对象
+ * @returns 笔记本的 Daily Note 路径模板
+ */
+export async function getDailynoteSprig(notebookId: string): Promise<string> {
+    let conf = await serverApi.getNotebookConf(notebookId);
+    let sprig: string = conf.conf.dailyNoteSavePath;
+    return sprig;
+}
+
+/**
+ * 要求思源解析模板
+ * @param sprig
+ * @returns 
+ */
+export async function renderDailynotePath(sprig: string) {
+    return await serverApi.renderSprig(sprig);
+}
+
+
+/**
+ * 根据思源中已经有 diary 的笔记本，更新下拉框中的笔记本状态
+ * 注意，本函数不会更新 notebooks
+ * @details
+ * 1. 遍历所有笔记本，找到所有的 daily note 的 hpath
+ * 2. 对每种 hpath，调用 `await getDocsByHpath(todayDNHpath)`，查询是否存在对应的文件
+ */
+export async function currentDiaryStatus() {
+    // let todayDiary = getTodayDiaryPath();
+    //所有 hpath 的配置方案
+    let hpath_set: Set<string> = new Set();
+    notebooks.notebooks.forEach((notebook) => {
+        hpath_set.add(notebook.dailynoteHpath!);
+    });
+
+    let diaryStatus: Map<string, boolean> = new Map();
+    let count_diary = 0;
+    for (const todayDNHpath of hpath_set) {
+        //对每种 daily note 的方案，看看是否存在对应的路径
+        let docs = await getDocsByHpath(todayDNHpath);
+        if (docs.length > 0) {
+            let notebook_with_diary = docs.map(doc => doc.box);
+            notebook_with_diary.forEach((notebookId: string) => {
+                diaryStatus.set(notebookId, true);
+            });
+            count_diary += notebook_with_diary.length;
+        }
+    }
+    info(`更新日记状态: 当前日记共 ${count_diary} 篇`);
+    return diaryStatus;
+}
diff --git a/src/func/dailynote/check-duplicate.ts b/src/func/dailynote/check-duplicate.ts
new file mode 100644
index 0000000..e69de29
diff --git a/src/func/dailynote/index.ts b/src/func/dailynote/index.ts
new file mode 100644
index 0000000..8dede77
--- /dev/null
+++ b/src/func/dailynote/index.ts
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2023 by Yp Z (frostime). All Rights Reserved.
+ * @Author       : Yp Z
+ * @Date         : 2023-06-16 21:00:30
+ * @FilePath     : /src/func/dailynote/index.ts
+ * @LastEditTime : 2023-11-12 18:11:57
+ * @Description  : 
+ */
+import { settings } from '@/global-status';
+
+import type DailyNoteTodayPlugin from '@/index';
+export * from './basic';
+export * from './open-dn';
+// export * from './check-duplicate';
+
+//@ts-ignore
+const SYNC_ENABLED = window.siyuan.config.sync.enabled;
+
+export class AutoOpenDailyNoteHandler {
+    plugin: DailyNoteTodayPlugin;
+    openOnStart: boolean;
+    autoOpenAfterSync: boolean;
+
+    constructor(plugin: DailyNoteTodayPlugin) {
+        this.plugin = plugin;
+        this.openOnStart = settings.get('OpenOnStart');
+        this.autoOpenAfterSync = settings.get('AutoOpenAfterSync');
+    }
+
+    onPluginLoad() {
+        //如果思源没有开启
+        if (SYNC_ENABLED === false) {
+
+        }
+    }
+}
+
diff --git a/src/func/dailynote/open-dn.ts b/src/func/dailynote/open-dn.ts
new file mode 100644
index 0000000..9848bd3
--- /dev/null
+++ b/src/func/dailynote/open-dn.ts
@@ -0,0 +1,71 @@
+import { showMessage, confirm } from 'siyuan';
+
+
+import notebooks from "@/global-notebooks";
+import { settings } from '@/global-status';
+
+import * as serverApi from '@/serverApi';
+import * as utils from '@/utils';
+import { info, i18n, isMobile, debug } from '@/utils';
+
+
+function today(): string {
+    let date = new Date();
+    let year = date.getFullYear();
+    let month = date.getMonth() + 1;
+    let day = date.getDate();
+    return `${year}${month < 10 ? '0' + month : month}${day < 10 ? '0' + day : day}`;
+}
+
+
+export async function createDiary(notebook: Notebook, todayDiaryHpath: string) {
+    let doc_id = await serverApi.createDocWithMd(notebook.id, todayDiaryHpath, "");
+    info(`创建日记: ${notebook.name} ${todayDiaryHpath}`);
+    serverApi.setBlockAttrs(doc_id, { "custom-dailynote": today() });
+    return doc_id;
+}
+
+/**
+ * 打开指定的笔记本下今天的日记，如果不存在则创建
+ * @param notebook_index 笔记本的 index
+ */
+export async function openDiary(notebook: Notebook) {
+    // console.log(utils.app)
+    let appId = utils.app.appId;
+    await serverApi.createDailyNote(notebook.id, appId);
+    showMessage(`${i18n.Open}: ${notebook.name}`, 2000, 'info');
+}
+
+
+
+/**
+ * 初始化的时候，加载所有的笔记本
+ */
+export async function autoOpenDailyNote() {
+    debug('自动开启日记');
+    if (isMobile && settings.get('DisableAutoCreateOnMobile') === true) {
+        // showMessage('移动端不开放');
+        return;
+    }
+    //小窗打开模式下, 不再自动打开
+    const url = new URL(window.location.href);
+    // showMessage(url.pathname);
+    if (url.pathname.startsWith('/stage/build/app/window.html')) {
+        debug('小窗模式, 无需自动打开日记');
+        return;
+    }
+
+    if (notebooks.notebooks.length > 0) {
+        if (settings.settings.OpenOnStart === true) {
+            let notebookId: string = settings.get('DefaultNotebook');
+            let notebook: Notebook = notebooks.default;
+            if (notebook) {
+                await openDiary(notebook);
+                // initTodayReservation(notebook);
+            } else {
+                confirm(i18n.Name, `${notebookId} ${i18n.InvalidDefaultNotebook}`)
+                return
+            }
+        }
+    }
+}

From 0b6e1e9a6ef69b8afac8372452a9e6626be22967 Mon Sep 17 00:00:00 2001
From: frostime <frostime@foxmail.com>
Date: Sun, 12 Nov 2023 18:25:56 +0800
Subject: [PATCH 08/11] =?UTF-8?q?refactor(dailynote):=20=E7=BB=A7=E7=BB=AD?=
 =?UTF-8?q?=E6=8B=86=E5=88=86=E6=95=B4=E7=90=86=20dailynote=20=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/func/dailynote/basic.ts            |   2 +-
 src/func/dailynote/check-duplicate.ts  |   0
 src/func/dailynote/handle-duplicate.ts | 138 +++++++++++++++
 src/func/dailynote/index.ts            |   2 +-
 src/func/index.ts                      | 221 +------------------------
 src/func/misc.ts                       |  85 ++++++++++
 6 files changed, 230 insertions(+), 218 deletions(-)
 delete mode 100644 src/func/dailynote/check-duplicate.ts
 create mode 100644 src/func/dailynote/handle-duplicate.ts
 create mode 100644 src/func/misc.ts

diff --git a/src/func/dailynote/basic.ts b/src/func/dailynote/basic.ts
index e055412..820533d 100644
--- a/src/func/dailynote/basic.ts
+++ b/src/func/dailynote/basic.ts
@@ -9,7 +9,7 @@
 import * as serverApi from '@/serverApi';
 import notebooks from "@/global-notebooks";
 import { info } from '@/utils';
-import { getDocsByHpath } from '@/func';
+import { getDocsByHpath } from '@/func/misc';
 
 /**
  * 
diff --git a/src/func/dailynote/check-duplicate.ts b/src/func/dailynote/check-duplicate.ts
deleted file mode 100644
index e69de29..0000000
diff --git a/src/func/dailynote/handle-duplicate.ts b/src/func/dailynote/handle-duplicate.ts
new file mode 100644
index 0000000..ba4ca45
--- /dev/null
+++ b/src/func/dailynote/handle-duplicate.ts
@@ -0,0 +1,138 @@
+import * as serverApi from "@/serverApi";
+
+import { showMessage, Dialog } from 'siyuan';
+import notebooks from '@/global-notebooks';
+import { error, i18n, lute, isMobile, formatBlockTime } from "@/utils";
+
+import { getDocsByHpath } from '@/func/misc';
+
+/**
+ * 由于同步的问题，默认的笔记本中可能出现重复的日记，这里检查下是否有重复的日记
+ * @param notebook 
+ * @param todayDiaryHpath 
+ */
+export async function checkDuplicateDiary(): Promise<boolean> {
+    let notebook: Notebook = notebooks.default;
+    let hpath = notebook.dailynoteHpath!;
+    let docs = await getDocsByHpath(hpath, notebook);
+
+    if (docs.length <= 1) {
+        return false;
+    }
+    //莫名其妙出现了重复的 id, 所以还是去重一下
+    let idSet: Set<string> = new Set();
+    let uniqueDocs: Array<Block> = [];
+    docs.forEach((doc) => {
+        if (!idSet.has(doc.id)) {
+            uniqueDocs.push(doc);
+            idSet.add(doc.id);
+        }
+    });
+    docs = uniqueDocs;
+
+    if (docs.length <= 1) {
+        return false;
+    }
+
+    console.warn(`Conflict daily note: ${notebook.name} ${hpath}`);
+
+    let confilctTable = [];
+    for (let doc of docs) {
+        let id = doc.id;
+        let created = doc.created;
+        created = `${created.slice(0, 4)}-${created.slice(4, 6)}-${created.slice(6, 8)} ${created.slice(8, 10)}:${created.slice(10, 12)}:${created.slice(12, 14)}`
+        let updated = doc.updated;
+        updated = `${updated.slice(0, 4)}-${updated.slice(4, 6)}-${updated.slice(6, 8)} ${updated.slice(8, 10)}:${updated.slice(10, 12)}:${updated.slice(12, 14)}`
+        let row = `| ${id} | ${doc.content} | ${created} | ${updated} | ${notebook.name} |\n`;
+        confilctTable.push(row);
+    }
+
+    let content: string = i18n.ConflictDiary.part1.join("\n") + "\n";
+    for (let row of confilctTable) {
+        content += row;
+    }
+    content += "\n" + i18n.ConflictDiary.part2.join("\n");
+    content = lute.Md2HTML(content);
+    let html = `
+        <div class="b3-typography typofont-1rem"
+            style="margin: 0.5rem;"
+        >
+            ${content}
+        </div>
+        <div class="fn__flex b3-label" style="border-top: 1px solid var(--b3-theme-surface-lighter);">
+            <div class="fn__flex-1"></div>
+            <span class="fn__space"></span>
+            <button class="b3-button b3-button--outline fn__flex-center fn__size200" id="merge">
+                ${i18n.ConflictDiary.AutoMerge}
+            </button>
+        </div>
+        `;
+    let dialog = new Dialog({
+        title: i18n.Name,
+        content: html,
+        width: isMobile ? "80%" : "50%",
+    });
+    dialog.element.querySelector("#merge")?.addEventListener("click", async () => {
+        showMessage("Merge", 1000, "info");
+        docs = docs.sort((a, b) => {
+            return a.created >= b.created ? -1 : 1;
+        });
+        //选择最早的日记
+        let latestDoc = docs.pop();
+        // let childs: Block[] = await serverApi.getChildBlocks(latestDoc.id);
+        // let lastChildBlockID = childs[childs.length - 1].id;
+        let result = await serverApi.appendBlock(latestDoc.id, i18n.ConflictDiary.HeadingMarkdown, "markdown");
+        let lastChildBlockID = result?.[0]?.doOperations[0].id;
+        if (lastChildBlockID === undefined) {
+            error(`无法获取最新日记的最后一个 block id`);
+            showMessage(i18n.ConflictDiary.fail, 2000, "error");
+            dialog.destroy();
+            return;
+        }
+
+        //将其他的日记合并到最新的日记中
+        for (let doc of docs) {
+            let id = doc.id;
+            let created: string = doc.created;
+
+            /* 可能存在不安全的情况, 保守一点, 不删除无用文档
+            let updated: string = doc.updated;
+            let stat = await serverApi.getTreeStat(id);
+            //if all value is 0
+            let empty = true;
+            Object.keys(stat).forEach(key => {
+                if (stat[key] != 0) {
+                    empty = false;
+                }
+            });
+
+            //空白日记, 直接删除
+            if (empty) {
+                await serverApi.removeDoc(doc.box, doc.path);
+                console.log(`Remove empty doc ${id}`);
+                continue;
+            }
+
+            const noRefLink = stat.refCount == 0 && stat.linkCount == 0;
+
+            //如果无链接, 且创建时间和更新时间相差超过 5 秒, 大概率是模板日记, 可以直接删除
+            if (noRefLink && parseInt(created) + 5 >= parseInt(updated)) {
+                await serverApi.removeDoc(doc.box, doc.path);
+                console.log(`Remove not modified doc ${id} ${created} ${updated}`);
+            } else {
+                let time = formatBlockTime(created);
+                await serverApi.renameDoc(doc.box, doc.path, `${doc.content} [${time}]`);
+                await serverApi.doc2Heading(id, lastChildBlockID, true);
+                console.log(`Merge doc ${id}`);
+            }
+            */
+            let time = formatBlockTime(created);
+            await serverApi.renameDoc(doc.box, doc.path, `${doc.content} [${time}]`);
+            await serverApi.doc2Heading(id, lastChildBlockID, true);
+            console.log(`Merge doc ${id}`);
+        }
+        showMessage(i18n.ConflictDiary.success, 2000, "info");
+        dialog.destroy();
+    });
+    return true;
+}
\ No newline at end of file
diff --git a/src/func/dailynote/index.ts b/src/func/dailynote/index.ts
index 8dede77..0906c27 100644
--- a/src/func/dailynote/index.ts
+++ b/src/func/dailynote/index.ts
@@ -11,7 +11,7 @@ import { settings } from '@/global-status';
 import type DailyNoteTodayPlugin from '@/index';
 export * from './basic';
 export * from './open-dn';
-// export * from './check-duplicate';
+export * from './handle-duplicate';
 
 //@ts-ignore
 const SYNC_ENABLED = window.siyuan.config.sync.enabled;
diff --git a/src/func/index.ts b/src/func/index.ts
index b12aa7d..3b6f034 100644
--- a/src/func/index.ts
+++ b/src/func/index.ts
@@ -1,230 +1,19 @@
 /**
  * Copyright (c) 2023 frostime all rights reserved.
  */
-import { showMessage, confirm, Dialog, openTab } from 'siyuan';
-import notebooks from '../global-notebooks';
-import { info, warn, error, i18n, lute, app, isMobile, formatBlockTime, debug } from "../utils";
+import { confirm, openTab } from 'siyuan';
+import { error, i18n, app, debug } from "../utils";
 import * as serverApi from '../serverApi';
 import { reservation, settings } from '../global-status';
 import { Retrieve, RetvFactory } from './reserve';
-import { getDailynoteSprig, renderDailynotePath } from './dailynote';
+
+import { getDocsByHpath } from './misc';
 
 export * from './dailynote';
+export * from './misc';
 export * from './reserve';
 
 
-const default_sprig = `/daily note/{{now | date "2006/01"}}/{{now | date "2006-01-02"}}`
-const hiddenNotebook: Set<string> = new Set(["思源笔记用户指南", "SiYuan User Guide"]);
-
-/**
- * 获取所有笔记本，并解析今日日记路径
- * @details
- *  1. Call serverApi.lsNotebooks to get all notebooks
- *  2. Filter out Siyuan guide notebook
- *  3. Sort notebooks by sort
- *  4. Get all daily note sprig and today's diary path
- * @returns all_notebooks `Array<Notebook>|null`
- */
-export async function queryNotebooks(): Promise<Array<Notebook> | null> {
-    try {
-        let result = await serverApi.lsNotebooks();
-        let all_notebooks: Array<Notebook> = result.notebooks;
-        //delete notebook with name "思源笔记用户指南"
-        const blacklist = settings.get("NotebookBlacklist");
-        all_notebooks = all_notebooks.filter(
-            notebook => {
-                return !notebook.closed && !hiddenNotebook.has(notebook.name);
-            }
-        );
-
-        let all_notebook_names = all_notebooks.map(notebook => notebook.name);
-
-        //Get all daily note sprig
-        for (let notebook of all_notebooks) {
-            let sprig = await getDailynoteSprig(notebook.id);
-            notebook.dailynoteSprig = sprig != "" ? sprig : default_sprig;
-            notebook.dailynoteHpath = await renderDailynotePath(notebook.dailynoteSprig);
-
-            //防止出现不符合规范的 sprig, 不过根据 debug 情况看似乎不会出现这种情况
-            if (notebook.dailynoteHpath == "") {
-                warn(`Invalid daily note srpig of ${notebook.name}`);
-                notebook.dailynoteSprig = default_sprig;
-                notebook.dailynoteHpath = await renderDailynotePath(default_sprig);
-            }
-
-            if (notebook.icon == "") {
-                notebook.icon = "1f5c3";
-            }
-        }
-
-        debug(`Read all notebooks: ${all_notebook_names}`);
-        return all_notebooks;
-    } catch (err) {
-        error(err);
-        return null;
-    }
-}
-
-
-/**
- * getDocsByHpath returns all documents in the database that have a given hpath. 
- * If a notebook is not null, then it only returns documents in that notebook that have the given hpath.
- * @param hpath 
- * @param notebook 
- * @returns blocks Array<Block>
- */
-export async function getDocsByHpath(hpath: string, notebook: Notebook | null = null): Promise<Array<Block>> {
-    let sql = `select * from blocks where type='d' and hpath = '${hpath}'`;
-    if (notebook != null) {
-        sql = `select * from blocks where type='d' and hpath = '${hpath}' and box = '${notebook.id}'`;
-    }
-    let result: Array<Block> = await serverApi.sql(sql);
-    return result;
-}
-
-
-/**
- * 由于同步的问题，默认的笔记本中可能出现重复的日记，这里检查下是否有重复的日记
- * @param notebook 
- * @param todayDiaryHpath 
- */
-export async function checkDuplicateDiary(): Promise<boolean> {
-    let notebook: Notebook = notebooks.default;
-    let hpath = notebook.dailynoteHpath!;
-    let docs = await getDocsByHpath(hpath, notebook);
-
-    if (docs.length <= 1) {
-        return false;
-    }
-    //莫名其妙出现了重复的 id, 所以还是去重一下
-    let idSet: Set<string> = new Set();
-    let uniqueDocs: Array<Block> = [];
-    docs.forEach((doc) => {
-        if (!idSet.has(doc.id)) {
-            uniqueDocs.push(doc);
-            idSet.add(doc.id);
-        }
-    });
-    docs = uniqueDocs;
-
-    if (docs.length <= 1) {
-        return false;
-    }
-
-    console.warn(`Conflict daily note: ${notebook.name} ${hpath}`);
-
-    let confilctTable = [];
-    for (let doc of docs) {
-        let id = doc.id;
-        let created = doc.created;
-        created = `${created.slice(0, 4)}-${created.slice(4, 6)}-${created.slice(6, 8)} ${created.slice(8, 10)}:${created.slice(10, 12)}:${created.slice(12, 14)}`
-        let updated = doc.updated;
-        updated = `${updated.slice(0, 4)}-${updated.slice(4, 6)}-${updated.slice(6, 8)} ${updated.slice(8, 10)}:${updated.slice(10, 12)}:${updated.slice(12, 14)}`
-        let row = `| ${id} | ${doc.content} | ${created} | ${updated} | ${notebook.name} |\n`;
-        confilctTable.push(row);
-    }
-
-    let content: string = i18n.ConflictDiary.part1.join("\n") + "\n";
-    for (let row of confilctTable) {
-        content += row;
-    }
-    content += "\n" + i18n.ConflictDiary.part2.join("\n");
-    content = lute.Md2HTML(content);
-    let html = `
-        <div class="b3-typography typofont-1rem"
-            style="margin: 0.5rem;"
-        >
-            ${content}
-        </div>
-        <div class="fn__flex b3-label" style="border-top: 1px solid var(--b3-theme-surface-lighter);">
-            <div class="fn__flex-1"></div>
-            <span class="fn__space"></span>
-            <button class="b3-button b3-button--outline fn__flex-center fn__size200" id="merge">
-                ${i18n.ConflictDiary.AutoMerge}
-            </button>
-        </div>
-        `;
-    let dialog = new Dialog({
-        title: i18n.Name,
-        content: html,
-        width: isMobile ? "80%" : "50%",
-    });
-    dialog.element.querySelector("#merge")?.addEventListener("click", async () => {
-        showMessage("Merge", 1000, "info");
-        docs = docs.sort((a, b) => {
-            return a.created >= b.created ? -1 : 1;
-        });
-        //选择最早的日记
-        let latestDoc = docs.pop();
-        // let childs: Block[] = await serverApi.getChildBlocks(latestDoc.id);
-        // let lastChildBlockID = childs[childs.length - 1].id;
-        let result = await serverApi.appendBlock(latestDoc.id, i18n.ConflictDiary.HeadingMarkdown, "markdown");
-        let lastChildBlockID = result?.[0]?.doOperations[0].id;
-        if (lastChildBlockID === undefined) {
-            error(`无法获取最新日记的最后一个 block id`);
-            showMessage(i18n.ConflictDiary.fail, 2000, "error");
-            dialog.destroy();
-            return;
-        }
-
-        //将其他的日记合并到最新的日记中
-        for (let doc of docs) {
-            let id = doc.id;
-            let created: string = doc.created;
-
-            /* 可能存在不安全的情况, 保守一点, 不删除无用文档
-            let updated: string = doc.updated;
-            let stat = await serverApi.getTreeStat(id);
-            //if all value is 0
-            let empty = true;
-            Object.keys(stat).forEach(key => {
-                if (stat[key] != 0) {
-                    empty = false;
-                }
-            });
-
-            //空白日记, 直接删除
-            if (empty) {
-                await serverApi.removeDoc(doc.box, doc.path);
-                console.log(`Remove empty doc ${id}`);
-                continue;
-            }
-
-            const noRefLink = stat.refCount == 0 && stat.linkCount == 0;
-
-            //如果无链接, 且创建时间和更新时间相差超过 5 秒, 大概率是模板日记, 可以直接删除
-            if (noRefLink && parseInt(created) + 5 >= parseInt(updated)) {
-                await serverApi.removeDoc(doc.box, doc.path);
-                console.log(`Remove not modified doc ${id} ${created} ${updated}`);
-            } else {
-                let time = formatBlockTime(created);
-                await serverApi.renameDoc(doc.box, doc.path, `${doc.content} [${time}]`);
-                await serverApi.doc2Heading(id, lastChildBlockID, true);
-                console.log(`Merge doc ${id}`);
-            }
-            */
-            let time = formatBlockTime(created);
-            await serverApi.renameDoc(doc.box, doc.path, `${doc.content} [${time}]`);
-            await serverApi.doc2Heading(id, lastChildBlockID, true);
-            console.log(`Merge doc ${id}`);
-        }
-        showMessage(i18n.ConflictDiary.success, 2000, "info");
-        dialog.destroy();
-    });
-    return true;
-}
-
-
-export async function filterExistsBlocks(blockIds: string[]): Promise<Set<string>> {
-    let idStr = blockIds.map(id => `'${id}'`).join(",");
-    const sql = `select distinct id from blocks where id in (${idStr})`;
-    let blocks: Array<Block> = await serverApi.sql(sql);
-    let idSet: Set<string> = new Set();
-    blocks.forEach(block => {
-        idSet.add(block.id);
-    });
-    return idSet;
-}
 
 export async function initTodayReservation(notebook: Notebook) {
     let todayDiaryPath = notebook.dailynoteHpath;
diff --git a/src/func/misc.ts b/src/func/misc.ts
new file mode 100644
index 0000000..4088986
--- /dev/null
+++ b/src/func/misc.ts
@@ -0,0 +1,85 @@
+import { warn, error, debug } from "../utils";
+import * as serverApi from '../serverApi';
+import { settings } from '../global-status';
+import { getDailynoteSprig, renderDailynotePath } from './dailynote';
+
+const default_sprig = `/daily note/{{now | date "2006/01"}}/{{now | date "2006-01-02"}}`
+const hiddenNotebook: Set<string> = new Set(["思源笔记用户指南", "SiYuan User Guide"]);
+
+/**
+ * 获取所有笔记本，并解析今日日记路径
+ * @details
+ *  1. Call serverApi.lsNotebooks to get all notebooks
+ *  2. Filter out Siyuan guide notebook
+ *  3. Sort notebooks by sort
+ *  4. Get all daily note sprig and today's diary path
+ * @returns all_notebooks `Array<Notebook>|null`
+ */
+export async function queryNotebooks(): Promise<Array<Notebook> | null> {
+    try {
+        let result = await serverApi.lsNotebooks();
+        let all_notebooks: Array<Notebook> = result.notebooks;
+        //delete notebook with name "思源笔记用户指南"
+        const blacklist = settings.get("NotebookBlacklist");
+        all_notebooks = all_notebooks.filter(
+            notebook => {
+                return !notebook.closed && !hiddenNotebook.has(notebook.name);
+            }
+        );
+
+        let all_notebook_names = all_notebooks.map(notebook => notebook.name);
+
+        //Get all daily note sprig
+        for (let notebook of all_notebooks) {
+            let sprig = await getDailynoteSprig(notebook.id);
+            notebook.dailynoteSprig = sprig != "" ? sprig : default_sprig;
+            notebook.dailynoteHpath = await renderDailynotePath(notebook.dailynoteSprig);
+
+            //防止出现不符合规范的 sprig, 不过根据 debug 情况看似乎不会出现这种情况
+            if (notebook.dailynoteHpath == "") {
+                warn(`Invalid daily note srpig of ${notebook.name}`);
+                notebook.dailynoteSprig = default_sprig;
+                notebook.dailynoteHpath = await renderDailynotePath(default_sprig);
+            }
+
+            if (notebook.icon == "") {
+                notebook.icon = "1f5c3";
+            }
+        }
+
+        debug(`Read all notebooks: ${all_notebook_names}`);
+        return all_notebooks;
+    } catch (err) {
+        error(err);
+        return null;
+    }
+}
+
+
+/**
+ * getDocsByHpath returns all documents in the database that have a given hpath. 
+ * If a notebook is not null, then it only returns documents in that notebook that have the given hpath.
+ * @param hpath 
+ * @param notebook 
+ * @returns blocks Array<Block>
+ */
+export async function getDocsByHpath(hpath: string, notebook: Notebook | null = null): Promise<Array<Block>> {
+    let sql = `select * from blocks where type='d' and hpath = '${hpath}'`;
+    if (notebook != null) {
+        sql = `select * from blocks where type='d' and hpath = '${hpath}' and box = '${notebook.id}'`;
+    }
+    let result: Array<Block> = await serverApi.sql(sql);
+    return result;
+}
+
+
+export async function filterExistsBlocks(blockIds: string[]): Promise<Set<string>> {
+    let idStr = blockIds.map(id => `'${id}'`).join(",");
+    const sql = `select distinct id from blocks where id in (${idStr})`;
+    let blocks: Array<Block> = await serverApi.sql(sql);
+    let idSet: Set<string> = new Set();
+    blocks.forEach(block => {
+        idSet.add(block.id);
+    });
+    return idSet;
+}
\ No newline at end of file

From 191dc3588a8cef29a068abb1cf63f04825cc0917 Mon Sep 17 00:00:00 2001
From: frostime <frostime@foxmail.com>
Date: Sun, 12 Nov 2023 18:33:18 +0800
Subject: [PATCH 09/11] =?UTF-8?q?=F0=9F=A6=84=20refactor(reserve):=20?=
 =?UTF-8?q?=E6=8B=86=E5=88=86=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/func/index.ts                        | 110 -----------------------
 src/func/misc.ts                         |  47 +++++++++-
 src/func/{reserve.ts => reserve/core.ts} |   8 ++
 src/func/reserve/index.ts                |  74 +++++++++++++++
 4 files changed, 125 insertions(+), 114 deletions(-)
 rename src/func/{reserve.ts => reserve/core.ts} (95%)
 create mode 100644 src/func/reserve/index.ts

diff --git a/src/func/index.ts b/src/func/index.ts
index 3b6f034..b27f7d3 100644
--- a/src/func/index.ts
+++ b/src/func/index.ts
@@ -1,117 +1,7 @@
 /**
  * Copyright (c) 2023 frostime all rights reserved.
  */
-import { confirm, openTab } from 'siyuan';
-import { error, i18n, app, debug } from "../utils";
-import * as serverApi from '../serverApi';
-import { reservation, settings } from '../global-status';
-import { Retrieve, RetvFactory } from './reserve';
-
-import { getDocsByHpath } from './misc';
 
 export * from './dailynote';
 export * from './misc';
 export * from './reserve';
-
-
-
-export async function initTodayReservation(notebook: Notebook) {
-    let todayDiaryPath = notebook.dailynoteHpath;
-    let docId;
-    let retry = 0;
-    const MAX_RETRY = 5;
-    const INTERVAL = 2500;
-    while (retry < MAX_RETRY) {
-        //插件自动创建日记的情况下可能会出现第一次拿不到的情况, 需要重试几次
-        let docs = await getDocsByHpath(todayDiaryPath!, notebook);
-        debug(`In initResrv, retry: ${retry}`);
-        if (docs[0]?.id !== undefined) {
-            docId = docs[0].id;
-            break;
-        }
-        await new Promise(resolve => setTimeout(resolve, INTERVAL));
-        retry++;
-    }
-    if (docId === undefined) {
-        error(`无法获取今日日记的 docId`);
-        return;
-    }
-    updateDocReservation(docId, false);
-}
-
-export async function updateTodayReservation(notebook: Notebook, refresh: boolean = false) {
-    let todayDiaryPath = notebook.dailynoteHpath;
-    let docs = await getDocsByHpath(todayDiaryPath!, notebook);
-    let docId = docs[0].id;
-    updateDocReservation(docId, refresh);
-}
-
-export async function updateDocReservation(docId: string, refresh: boolean = false) {
-    let resvBlockIds = reservation.getTodayReservations();
-    if (resvBlockIds.length == 0) {
-        return;
-    }
-    let retvType = settings.get('RetvType');
-    let retv: Retrieve = RetvFactory(retvType, settings.get('ResvEmbedAt'), resvBlockIds, docId);
-    let retvBlocks = await retv.checkRetv();
-    const hasInserted = retvBlocks.length > 0;
-
-    if (hasInserted && !refresh) {
-        debug(`今日已经插入过预约了`);
-        return;
-    } else {
-        resvBlockIds = resvBlockIds.map((id) => `"${id}"`);
-        let sql = `select * from blocks where id in (${resvBlockIds.join(',')})`;
-        // console.log(resvBlockIds);
-        //1. 先检查预约块是否存在
-        let resvBlocks: Block[] = await serverApi.sql(sql);
-        if (resvBlocks.length === 0) {
-            confirm(i18n.Name, i18n.Msg.Resv404);
-            return;
-        }
-        //如果是初次创建, 则插入到日记的最前面
-        if (hasInserted) {
-            retv.update();
-        } else {
-            //否则, 就更新
-            retv.insert();
-        }
-    }
-}
-
-export function compareVersion(v1Str: string, v2Str: string) {
-    let v1 = v1Str.split('.')
-    let v2 = v2Str.split('.')
-    const len = Math.max(v1.length, v2.length)
-
-    while (v1.length < len) {
-        v1.push('0')
-    }
-    while (v2.length < len) {
-        v2.push('0')
-    }
-
-    for (let i = 0; i < len; i++) {
-        const num1 = parseInt(v1[i])
-        const num2 = parseInt(v2[i])
-
-        if (num1 > num2) {
-            return 1
-        } else if (num1 < num2) {
-            return -1
-        }
-    }
-
-    return 0
-}
-
-export function openBlock(blockId: BlockId) {
-    openTab({
-        app: app,
-        doc: {
-            id: blockId,
-            action: ['cb-get-focus'],
-            zoomIn: true
-        }
-    });
-}
diff --git a/src/func/misc.ts b/src/func/misc.ts
index 4088986..6711af1 100644
--- a/src/func/misc.ts
+++ b/src/func/misc.ts
@@ -1,6 +1,8 @@
-import { warn, error, debug } from "../utils";
-import * as serverApi from '../serverApi';
-import { settings } from '../global-status';
+import { openTab } from 'siyuan';
+
+import { warn, error, debug, app } from "@/utils";
+import * as serverApi from '@/serverApi';
+import { settings } from '@/global-status';
 import { getDailynoteSprig, renderDailynotePath } from './dailynote';
 
 const default_sprig = `/daily note/{{now | date "2006/01"}}/{{now | date "2006-01-02"}}`
@@ -82,4 +84,41 @@ export async function filterExistsBlocks(blockIds: string[]): Promise<Set<string
         idSet.add(block.id);
     });
     return idSet;
-}
\ No newline at end of file
+}
+
+export function compareVersion(v1Str: string, v2Str: string) {
+    let v1 = v1Str.split('.')
+    let v2 = v2Str.split('.')
+    const len = Math.max(v1.length, v2.length)
+
+    while (v1.length < len) {
+        v1.push('0')
+    }
+    while (v2.length < len) {
+        v2.push('0')
+    }
+
+    for (let i = 0; i < len; i++) {
+        const num1 = parseInt(v1[i])
+        const num2 = parseInt(v2[i])
+
+        if (num1 > num2) {
+            return 1
+        } else if (num1 < num2) {
+            return -1
+        }
+    }
+
+    return 0
+}
+
+export function openBlock(blockId: BlockId) {
+    openTab({
+        app: app,
+        doc: {
+            id: blockId,
+            action: ['cb-get-focus'],
+            zoomIn: true
+        }
+    });
+}
diff --git a/src/func/reserve.ts b/src/func/reserve/core.ts
similarity index 95%
rename from src/func/reserve.ts
rename to src/func/reserve/core.ts
index 55be649..7c39b97 100644
--- a/src/func/reserve.ts
+++ b/src/func/reserve/core.ts
@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2023 by Yp Z (frostime). All Rights Reserved.
+ * @Author       : Yp Z
+ * @Date         : 2023-06-17 13:55:54
+ * @FilePath     : /src/func/reserve/reserve.ts
+ * @LastEditTime : 2023-11-12 18:27:58
+ * @Description  : 
+ */
 import * as serverApi from '@/serverApi';
 
 
diff --git a/src/func/reserve/index.ts b/src/func/reserve/index.ts
new file mode 100644
index 0000000..4ee5e5b
--- /dev/null
+++ b/src/func/reserve/index.ts
@@ -0,0 +1,74 @@
+import { confirm } from 'siyuan';
+import { error, i18n, debug } from "@/utils";
+import * as serverApi from '@/serverApi';
+import { reservation, settings } from '@/global-status';
+import { Retrieve, RetvFactory } from './core';
+
+import { getDocsByHpath } from '../misc';
+
+export * from './core';
+
+
+export async function initTodayReservation(notebook: Notebook) {
+    let todayDiaryPath = notebook.dailynoteHpath;
+    let docId;
+    let retry = 0;
+    const MAX_RETRY = 5;
+    const INTERVAL = 2500;
+    while (retry < MAX_RETRY) {
+        //插件自动创建日记的情况下可能会出现第一次拿不到的情况, 需要重试几次
+        let docs = await getDocsByHpath(todayDiaryPath!, notebook);
+        debug(`In initResrv, retry: ${retry}`);
+        if (docs[0]?.id !== undefined) {
+            docId = docs[0].id;
+            break;
+        }
+        await new Promise(resolve => setTimeout(resolve, INTERVAL));
+        retry++;
+    }
+    if (docId === undefined) {
+        error(`无法获取今日日记的 docId`);
+        return;
+    }
+    updateDocReservation(docId, false);
+}
+
+export async function updateTodayReservation(notebook: Notebook, refresh: boolean = false) {
+    let todayDiaryPath = notebook.dailynoteHpath;
+    let docs = await getDocsByHpath(todayDiaryPath!, notebook);
+    let docId = docs[0].id;
+    updateDocReservation(docId, refresh);
+}
+
+export async function updateDocReservation(docId: string, refresh: boolean = false) {
+    let resvBlockIds = reservation.getTodayReservations();
+    if (resvBlockIds.length == 0) {
+        return;
+    }
+    let retvType = settings.get('RetvType');
+    let retv: Retrieve = RetvFactory(retvType, settings.get('ResvEmbedAt'), resvBlockIds, docId);
+    let retvBlocks = await retv.checkRetv();
+    const hasInserted = retvBlocks.length > 0;
+
+    if (hasInserted && !refresh) {
+        debug(`今日已经插入过预约了`);
+        return;
+    } else {
+        resvBlockIds = resvBlockIds.map((id) => `"${id}"`);
+        let sql = `select * from blocks where id in (${resvBlockIds.join(',')})`;
+        // console.log(resvBlockIds);
+        //1. 先检查预约块是否存在
+        let resvBlocks: Block[] = await serverApi.sql(sql);
+        if (resvBlocks.length === 0) {
+            confirm(i18n.Name, i18n.Msg.Resv404);
+            return;
+        }
+        //如果是初次创建, 则插入到日记的最前面
+        if (hasInserted) {
+            retv.update();
+        } else {
+            //否则, 就更新
+            retv.insert();
+        }
+    }
+}

From 0ba49b91a8ee94bd81fd820cdf52993f3a801ca1 Mon Sep 17 00:00:00 2001
From: frostime <frostime@foxmail.com>
Date: Sun, 12 Nov 2023 19:02:29 +0800
Subject: [PATCH 10/11] =?UTF-8?q?=F0=9F=8C=88=20style(check=20duplicate):?=
 =?UTF-8?q?=20=E6=95=B4=E7=90=86=E5=90=88=E5=B9=B6=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E6=97=A5=E8=AE=B0=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin.json                            |   2 +-
 src/components/setting-gui.svelte      |   9 +-
 src/func/dailynote/handle-duplicate.ts | 152 +++++++++++--------------
 src/types/index.d.ts                   |   4 +
 4 files changed, 77 insertions(+), 90 deletions(-)

diff --git a/plugin.json b/plugin.json
index 0025596..f46325c 100644
--- a/plugin.json
+++ b/plugin.json
@@ -28,5 +28,5 @@
       "https://afdian.net/a/frostime"
     ]
   },
-  "keywords": ["dailynote", "diary", "日记", "笔记", "日程", "TODO", "预约", "reservation"]
+  "keywords": ["dailynote", "diary", "日记", "笔记", "日程", "TODO", "待办", "预约", "reservation"]
 }
diff --git a/src/components/setting-gui.svelte b/src/components/setting-gui.svelte
index e9fd5eb..9bcc0dc 100644
--- a/src/components/setting-gui.svelte
+++ b/src/components/setting-gui.svelte
@@ -50,11 +50,12 @@
             {
                 name: "DisableAutoCreateOnMobile",
                 type: "checkbox"
-            },
-            {
-                name: "AutoOpenAfterSync",
-                type: "checkbox"
             }
+            //1.3.0 版本再加上
+            // {
+            //     name: "AutoOpenAfterSync",
+            //     type: "checkbox"
+            // }
         ],
         reservation: [
             {
diff --git a/src/func/dailynote/handle-duplicate.ts b/src/func/dailynote/handle-duplicate.ts
index ba4ca45..789eb9c 100644
--- a/src/func/dailynote/handle-duplicate.ts
+++ b/src/func/dailynote/handle-duplicate.ts
@@ -6,35 +6,42 @@ import { error, i18n, lute, isMobile, formatBlockTime } from "@/utils";
 
 import { getDocsByHpath } from '@/func/misc';
 
-/**
- * 由于同步的问题，默认的笔记本中可能出现重复的日记，这里检查下是否有重复的日记
- * @param notebook 
- * @param todayDiaryHpath 
- */
-export async function checkDuplicateDiary(): Promise<boolean> {
-    let notebook: Notebook = notebooks.default;
-    let hpath = notebook.dailynoteHpath!;
-    let docs = await getDocsByHpath(hpath, notebook);
-
-    if (docs.length <= 1) {
-        return false;
-    }
-    //莫名其妙出现了重复的 id, 所以还是去重一下
-    let idSet: Set<string> = new Set();
-    let uniqueDocs: Array<Block> = [];
-    docs.forEach((doc) => {
-        if (!idSet.has(doc.id)) {
-            uniqueDocs.push(doc);
-            idSet.add(doc.id);
-        }
+async function mergeDocs(docs: DocBlock[], callback?: () => void) {
+    showMessage("Merge", 1000, "info");
+    docs = docs.sort((a, b) => {
+        return a.created >= b.created ? -1 : 1;
     });
-    docs = uniqueDocs;
+    //选择最早的日记
+    let latestDoc = docs.pop();
+    // let childs: Block[] = await serverApi.getChildBlocks(latestDoc.id);
+    // let lastChildBlockID = childs[childs.length - 1].id;
+    let result = await serverApi.appendBlock(latestDoc.id, i18n.ConflictDiary.HeadingMarkdown, "markdown");
+    let lastChildBlockID = result?.[0]?.doOperations[0].id;
+    if (lastChildBlockID === undefined) {
+        error(`无法获取最新日记的最后一个 block id`);
+        showMessage(i18n.ConflictDiary.fail, 2000, "error");
+        // dialog.destroy();
+        callback();
+        return latestDoc;
+    }
 
-    if (docs.length <= 1) {
-        return false;
+    //将其他的日记合并到最新的日记中
+    for (let doc of docs) {
+        let id = doc.id;
+        let created: string = doc.created;
+
+        let time = formatBlockTime(created);
+        await serverApi.renameDoc(doc.box, doc.path, `${doc.content} [${time}]`);
+        await serverApi.doc2Heading(id, lastChildBlockID, true);
+        console.log(`Merge doc ${id}`);
     }
+    showMessage(i18n.ConflictDiary.success, 2000, "info");
+    // dialog.destroy();
+    callback();
+    return latestDoc;
+}
 
-    console.warn(`Conflict daily note: ${notebook.name} ${hpath}`);
+function buildShowDuplicateDocDom(docs: Block[], notebook: Notebook): string {
 
     let confilctTable = [];
     for (let doc of docs) {
@@ -67,72 +74,47 @@ export async function checkDuplicateDiary(): Promise<boolean> {
             </button>
         </div>
         `;
+    return html;
+}
+
+/**
+ * 由于同步的问题，默认的笔记本中可能出现重复的日记，这里检查下是否有重复的日记
+ * @param notebook 
+ * @param todayDiaryHpath 
+ */
+export async function checkDuplicateDiary(): Promise<boolean> {
+    let notebook: Notebook = notebooks.default;
+    let hpath = notebook.dailynoteHpath!;
+    let docs = (await getDocsByHpath(hpath, notebook)) as DocBlock[];
+
+    if (docs.length <= 1) {
+        return false;
+    }
+    //莫名其妙出现了重复的 id, 所以还是去重一下
+    let idSet: Set<string> = new Set();
+    let uniqueDocs: Array<DocBlock> = [];
+    docs.forEach((doc) => {
+        if (!idSet.has(doc.id)) {
+            uniqueDocs.push(doc);
+            idSet.add(doc.id);
+        }
+    });
+    docs = uniqueDocs;
+
+    if (docs.length <= 1) {
+        return false;
+    }
+
+    console.warn(`Conflict daily note: ${notebook.name} ${hpath}`);
+    const html = buildShowDuplicateDocDom(docs, notebook);
     let dialog = new Dialog({
         title: i18n.Name,
         content: html,
         width: isMobile ? "80%" : "50%",
     });
+    let uniqueDNDoc = null;
     dialog.element.querySelector("#merge")?.addEventListener("click", async () => {
-        showMessage("Merge", 1000, "info");
-        docs = docs.sort((a, b) => {
-            return a.created >= b.created ? -1 : 1;
-        });
-        //选择最早的日记
-        let latestDoc = docs.pop();
-        // let childs: Block[] = await serverApi.getChildBlocks(latestDoc.id);
-        // let lastChildBlockID = childs[childs.length - 1].id;
-        let result = await serverApi.appendBlock(latestDoc.id, i18n.ConflictDiary.HeadingMarkdown, "markdown");
-        let lastChildBlockID = result?.[0]?.doOperations[0].id;
-        if (lastChildBlockID === undefined) {
-            error(`无法获取最新日记的最后一个 block id`);
-            showMessage(i18n.ConflictDiary.fail, 2000, "error");
-            dialog.destroy();
-            return;
-        }
-
-        //将其他的日记合并到最新的日记中
-        for (let doc of docs) {
-            let id = doc.id;
-            let created: string = doc.created;
-
-            /* 可能存在不安全的情况, 保守一点, 不删除无用文档
-            let updated: string = doc.updated;
-            let stat = await serverApi.getTreeStat(id);
-            //if all value is 0
-            let empty = true;
-            Object.keys(stat).forEach(key => {
-                if (stat[key] != 0) {
-                    empty = false;
-                }
-            });
-
-            //空白日记, 直接删除
-            if (empty) {
-                await serverApi.removeDoc(doc.box, doc.path);
-                console.log(`Remove empty doc ${id}`);
-                continue;
-            }
-
-            const noRefLink = stat.refCount == 0 && stat.linkCount == 0;
-
-            //如果无链接, 且创建时间和更新时间相差超过 5 秒, 大概率是模板日记, 可以直接删除
-            if (noRefLink && parseInt(created) + 5 >= parseInt(updated)) {
-                await serverApi.removeDoc(doc.box, doc.path);
-                console.log(`Remove not modified doc ${id} ${created} ${updated}`);
-            } else {
-                let time = formatBlockTime(created);
-                await serverApi.renameDoc(doc.box, doc.path, `${doc.content} [${time}]`);
-                await serverApi.doc2Heading(id, lastChildBlockID, true);
-                console.log(`Merge doc ${id}`);
-            }
-            */
-            let time = formatBlockTime(created);
-            await serverApi.renameDoc(doc.box, doc.path, `${doc.content} [${time}]`);
-            await serverApi.doc2Heading(id, lastChildBlockID, true);
-            console.log(`Merge doc ${id}`);
-        }
-        showMessage(i18n.ConflictDiary.success, 2000, "info");
-        dialog.destroy();
+        uniqueDNDoc = mergeDocs(docs, () => { dialog.destroy() });
     });
     return true;
 }
\ No newline at end of file
diff --git a/src/types/index.d.ts b/src/types/index.d.ts
index 6c5ae75..f2041f8 100644
--- a/src/types/index.d.ts
+++ b/src/types/index.d.ts
@@ -72,6 +72,10 @@ type Block = {
     updated: string;
 }
 
+type DocBlock = Block & {
+    type: 'd'
+}
+
 type doOperation = {
     action: string;
     data: string;

From d24776d49281f969078f87d6b1ab4333f90a4a31 Mon Sep 17 00:00:00 2001
From: frostime <frostime@foxmail.com>
Date: Sun, 12 Nov 2023 19:49:27 +0800
Subject: [PATCH 11/11] =?UTF-8?q?=F0=9F=90=9E=20fix(duplicate):=20?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5=E7=88=B6=E6=96=87=E6=A1=A3=E6=A0=91=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E9=87=8D=E5=A4=8D=20close=20#175?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/func/dailynote/handle-duplicate.ts | 39 ++++++++++++++++++++++----
 src/i18n/en_US.json                    |  8 ++++++
 src/i18n/zh_CN.json                    |  8 ++++++
 3 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/src/func/dailynote/handle-duplicate.ts b/src/func/dailynote/handle-duplicate.ts
index 789eb9c..13d48ae 100644
--- a/src/func/dailynote/handle-duplicate.ts
+++ b/src/func/dailynote/handle-duplicate.ts
@@ -41,7 +41,7 @@ async function mergeDocs(docs: DocBlock[], callback?: () => void) {
     return latestDoc;
 }
 
-function buildShowDuplicateDocDom(docs: Block[], notebook: Notebook): string {
+function buildShowDuplicateDocDom(docs: Block[], notebook: Notebook, ansestorDup?: boolean): string {
 
     let confilctTable = [];
     for (let doc of docs) {
@@ -65,6 +65,7 @@ function buildShowDuplicateDocDom(docs: Block[], notebook: Notebook): string {
             style="margin: 0.5rem;"
         >
             ${content}
+            ${ansestorDup ? i18n.ConflictDiary.part3.join("\n") : ""}
         </div>
         <div class="fn__flex b3-label" style="border-top: 1px solid var(--b3-theme-surface-lighter);">
             <div class="fn__flex-1"></div>
@@ -77,12 +78,31 @@ function buildShowDuplicateDocDom(docs: Block[], notebook: Notebook): string {
     return html;
 }
 
+/**
+ * 检查这些文档是否祖先文档树不同
+ */
+function ifAncestorDiff(docs: DocBlock[]): boolean {
+    let paths: string[] = docs.map(doc => doc.path);
+    //trim base doc
+    paths = paths.map(path => path.slice(0, path.lastIndexOf("/")));
+    //check if identical
+    let identical = true;
+    for (let i = 1; i < paths.length; i++) {
+        if (paths[i] !== paths[0]) {
+            identical = false;
+            break;
+        }
+    }
+    return !identical;
+}
+
 /**
  * 由于同步的问题，默认的笔记本中可能出现重复的日记，这里检查下是否有重复的日记
  * @param notebook 
  * @param todayDiaryHpath 
  */
 export async function checkDuplicateDiary(): Promise<boolean> {
+    // ==================== 检查是否有重复 ====================
     let notebook: Notebook = notebooks.default;
     let hpath = notebook.dailynoteHpath!;
     let docs = (await getDocsByHpath(hpath, notebook)) as DocBlock[];
@@ -90,7 +110,8 @@ export async function checkDuplicateDiary(): Promise<boolean> {
     if (docs.length <= 1) {
         return false;
     }
-    //莫名其妙出现了重复的 id, 所以还是去重一下
+
+    // ==================== 由于未知原因可能出现重复的 id, 需要去重 ====================
     let idSet: Set<string> = new Set();
     let uniqueDocs: Array<DocBlock> = [];
     docs.forEach((doc) => {
@@ -105,16 +126,24 @@ export async function checkDuplicateDiary(): Promise<boolean> {
         return false;
     }
 
+    // ==================== 检查顶部文档树是否也有重复 ====================
+    const ascendantDiff = ifAncestorDiff(docs); //如果为 true，说明祖先的文档树也不同
+
+    // ==================== 合并今天的日记 ====================
     console.warn(`Conflict daily note: ${notebook.name} ${hpath}`);
-    const html = buildShowDuplicateDocDom(docs, notebook);
+    const html = buildShowDuplicateDocDom(docs, notebook, ascendantDiff);
     let dialog = new Dialog({
         title: i18n.Name,
         content: html,
         width: isMobile ? "80%" : "50%",
     });
-    let uniqueDNDoc = null;
     dialog.element.querySelector("#merge")?.addEventListener("click", async () => {
-        uniqueDNDoc = mergeDocs(docs, () => { dialog.destroy() });
+        mergeDocs(docs, () => { 
+            dialog.destroy();
+            if (ascendantDiff) {
+                showMessage("祖先", 10000, "info");
+            }
+        });
     });
     return true;
 }
\ No newline at end of file
diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json
index 66c9164..eedf958 100644
--- a/src/i18n/en_US.json
+++ b/src/i18n/en_US.json
@@ -140,6 +140,14 @@
             "    You may have created a diary on another device before and then created a diary on this device, resulting in a synchronization conflict.",
             "    Please merge and delete redundant diaries manually: Open today's diary, locate the diary document, and the conflicting document will be nearby."
         ],
+        "part3": [
+            "<p style=\"font-weight: bold; color: red\">",
+            "We found that in addition to the dailynote document conflict, the parent document at the upper level seems to be in conflict as well, and \"Auto Merge\" cannot handle this complexity of merging document trees.",
+            "</p>",
+            "<p style=\"font-weight: bold; color: red\">",
+            "Of course, <u>you can still to use the \"Auto Merge\" feature</u> to merge dailynote, but it is recommended that you manually deal with duplicate parent documents after auto-merging.",
+            "</p>"
+        ],
         "AutoMerge": "Auto merge",
         "HeadingMarkdown": "# Duplicate diaries are listed below",
         "success": "Merge success",
diff --git a/src/i18n/zh_CN.json b/src/i18n/zh_CN.json
index 820df4d..ba42b18 100644
--- a/src/i18n/zh_CN.json
+++ b/src/i18n/zh_CN.json
@@ -142,6 +142,14 @@
             "- 应该如何处理?",
             "    请自行合并删除多余的日记: 打开今日的日记, 然后定位日记文档, 冲突的文档就在一旁"
         ],
+        "part3": [
+            "<p style=\"font-weight: bold; color: red\">",
+            "我们发现除了日记文档冲突外，上层的父文档似乎也出现了冲突，「自动合并」无法处理这种合并文档树的复杂情况。",
+            "</p>",
+            "<p style=\"font-weight: bold; color: red\">",
+            "当然，<u>你可以继续使用「自动合并」功能</u>来合并今日日记的文档，但是建议你在自动合并后手动处理一下重复的父文档。",
+            "</p>"
+        ],
         "AutoMerge": "自动合并",
         "HeadingMarkdown": "# 以下为其他重复的日记",
         "success": "自动合并成功",