Merge pull request #595 from Hi-Windom/huge_merge

#593
Hi-Windom · Mar 24, 2024 · 1339abf · 1339abf
2 parents a76e6d4 + ae3dcb6
commit 1339abf
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 16 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "app/guide/20230202000000-c123456"]
-	path = app/guide/20230202000000-c123456
-	url = https://github.com/Hi-Windom/user-guide-zh_CN.git
 [submodule "app/out"]
 	path = app/out
 	url = https://github.com/Hi-Windom/Sillot-Bridge.git
diff --git a/app/guide/20230202000000-c123456 b/app/guide/20230202000000-c123456
diff --git a/app/src/constants.ts b/app/src/constants.ts
@@ -193,7 +193,6 @@ export abstract class Constants extends SConst { // Sillot extend
     // id
     public static readonly HELP_PATH = {
         zh_CN: "20210808180117-czj9bvb",
-        zh_CN_Sillot: "20230202000000-c123456", // Sillot extend
         en_US: "20210808180117-6v0mkxr",
         fr_FR: "20210808180117-6v0mkxr",
     };

diff --git a/app/src/util/mount.ts b/app/src/util/mount.ts
@@ -97,12 +97,6 @@ export const mountHelp = () => {
     fetchPost("/api/notebook/removeNotebook", {notebook: notebookId, callback: Constants.CB_MOUNT_REMOVE}, () => {
         fetchPost("/api/notebook/openNotebook", {
             notebook: notebookId
-        }, () => {
-            fetchPost("/api/notebook/removeNotebook", {notebook: Constants.HELP_PATH.zh_CN_Sillot, callback: Constants.CB_MOUNT_REMOVE}, () => {
-                fetchPost("/api/notebook/openNotebook", {
-                    notebook: Constants.HELP_PATH.zh_CN_Sillot
-                });
-            });
         });
     });
 };

diff --git a/docs/starlight/package.json b/docs/starlight/package.json
@@ -10,10 +10,11 @@
     "astro": "astro"
   },
   "dependencies": {
+    "@astrojs/check": "^0.5.10",
     "@astrojs/starlight": "^0.21.2",
+    "@vercel/speed-insights": "^1.0.10",
     "astro": "^4.3.5",
     "sharp": "^0.32.5",
-    "@astrojs/check": "^0.5.10",
     "typescript": "^5.4.3"
   }
 }
diff --git a/docs/starlight/pnpm-lock.yaml b/docs/starlight/pnpm-lock.yaml
diff --git a/docs/starlight/src/content/docs/index.mdx b/docs/starlight/src/content/docs/index.mdx
@@ -17,6 +17,7 @@ hero:
 ---
 
 import { Card, CardGrid } from '@astrojs/starlight/components';
+import  SpeedInsights  from "@vercel/speed-insights/astro"
 
 ## Next steps
 
@@ -34,3 +35,4 @@ import { Card, CardGrid } from '@astrojs/starlight/components';
 		Learn more in [the Starlight Docs](https://starlight.astro.build/).
 	</Card>
 </CardGrid>
+<SpeedInsights/>
diff --git a/kernel/go.mod b/kernel/go.mod
@@ -56,7 +56,6 @@ require (
 	github.com/sashabaranov/go-openai v1.20.2
 	github.com/shirou/gopsutil/v3 v3.24.2
 	github.com/siyuan-note/dejavu v0.0.0-20240323004223-25eaaad1f650
-	github.com/siyuan-note/encryption v0.0.0-20231219001248-1e028a4d13b4
 	github.com/siyuan-note/eventbus v0.0.0-20240318125243-801c98e8f025
 	github.com/siyuan-note/filelock v0.0.0-20240128091141-94d7bb3e0772
 	github.com/siyuan-note/httpclient v0.0.0-20240323002956-eaba148a7247

diff --git a/kernel/model/mount.go b/kernel/model/mount.go
@@ -225,7 +225,6 @@ func Mount(boxID string) (alreadyMount bool, err error) {
 					"20210808180117-czj9bvb": "20200812220555-lj3enxa",
 					"20211226090932-5lcq56f": "20211226115423-d5z1joq",
 					"20210808180117-6v0mkxr": "20200923234011-ieuun1p",
-					"20230202000000-c123456": "20230202153732-20az8kv",
 				}
 				startID = guideStartID[boxID]
 				if nil != treenode.GetBlockTree(startID) {
@@ -245,5 +244,5 @@ func Mount(boxID string) (alreadyMount bool, err error) {
 }
 
 func IsUserGuide(boxID string) bool {
-	return "20210808180117-czj9bvb" == boxID || "20210808180117-6v0mkxr" == boxID || "20211226090932-5lcq56f" == boxID || "20230202000000-c123456" == boxID
+	return "20210808180117-czj9bvb" == boxID || "20210808180117-6v0mkxr" == boxID || "20211226090932-5lcq56f" == boxID
 }
diff --git a/kernel/model/sync.go b/kernel/model/sync.go
@@ -619,7 +619,6 @@ func getSyncIgnoreLines() (ret []string) {
 	ret = append(ret, "20210808180117-6v0mkxr/**/*")
 	ret = append(ret, "20210808180117-czj9bvb/**/*")
 	ret = append(ret, "20211226090932-5lcq56f/**/*")
-	ret = append(ret, "20230202000000-c123456/**/*")
 
 	ret = gulu.Str.RemoveDuplicatedElem(ret)
 	return