From 1556d6d6a9e689be2fd0957ab9e71ae0b1143cac Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Thu, 9 Nov 2023 09:55:11 +0800
Subject: [PATCH 1/2] :bug: The authentication page after startup Alt+M fails
 https://github.com/siyuan-note/siyuan/issues/9575

---
 kernel/server/serve.go | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/kernel/server/serve.go b/kernel/server/serve.go
index 0a209c951..fc077504d 100644
--- a/kernel/server/serve.go
+++ b/kernel/server/serve.go
@@ -317,6 +317,25 @@ func serveCheckAuth(c *gin.Context) {
 		return
 	}
 
+	keymapHideWindow := "⌥M"
+	if nil != (*model.Conf.Keymap)["general"] {
+		switch (*model.Conf.Keymap)["general"].(type) {
+		case map[string]interface{}:
+			keymapGeneral := (*model.Conf.Keymap)["general"].(map[string]interface{})
+			if nil != keymapGeneral["toggleWin"] {
+				switch keymapGeneral["toggleWin"].(type) {
+				case map[string]interface{}:
+					toggleWin := keymapGeneral["toggleWin"].(map[string]interface{})
+					if nil != toggleWin["custom"] {
+						keymapHideWindow = toggleWin["custom"].(string)
+					}
+				}
+			}
+		}
+		if "" == keymapHideWindow {
+			keymapHideWindow = "⌥M"
+		}
+	}
 	model := map[string]interface{}{
 		"l0":               model.Conf.Language(173),
 		"l1":               model.Conf.Language(174),
@@ -330,6 +349,7 @@ func serveCheckAuth(c *gin.Context) {
 		"appearanceModeOS": model.Conf.Appearance.ModeOS,
 		"workspace":        filepath.Base(util.WorkspaceDir),
 		"workspacePath":    util.WorkspaceDir,
+		"keymapHideWindow": keymapHideWindow,
 	}
 	buf := &bytes.Buffer{}
 	if err = tpl.Execute(buf, model); nil != err {

From 5eaff769caef0583d9ebdd1e28a40b324d9f52c7 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Thu, 9 Nov 2023 09:55:53 +0800
Subject: [PATCH 2/2] :bug: The authentication page after startup Alt+M fails
 https://github.com/siyuan-note/siyuan/issues/9575

---
 kernel/server/serve.go | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/kernel/server/serve.go b/kernel/server/serve.go
index fc077504d..c44992a2c 100644
--- a/kernel/server/serve.go
+++ b/kernel/server/serve.go
@@ -337,19 +337,19 @@ func serveCheckAuth(c *gin.Context) {
 		}
 	}
 	model := map[string]interface{}{
-		"l0":               model.Conf.Language(173),
-		"l1":               model.Conf.Language(174),
-		"l2":               template.HTML(model.Conf.Language(172)),
-		"l3":               model.Conf.Language(175),
-		"l4":               model.Conf.Language(176),
-		"l5":               model.Conf.Language(177),
-		"l6":               model.Conf.Language(178),
-		"l7":               template.HTML(model.Conf.Language(184)),
-		"appearanceMode":   model.Conf.Appearance.Mode,
-		"appearanceModeOS": model.Conf.Appearance.ModeOS,
-		"workspace":        filepath.Base(util.WorkspaceDir),
-		"workspacePath":    util.WorkspaceDir,
-		"keymapHideWindow": keymapHideWindow,
+		"l0":                     model.Conf.Language(173),
+		"l1":                     model.Conf.Language(174),
+		"l2":                     template.HTML(model.Conf.Language(172)),
+		"l3":                     model.Conf.Language(175),
+		"l4":                     model.Conf.Language(176),
+		"l5":                     model.Conf.Language(177),
+		"l6":                     model.Conf.Language(178),
+		"l7":                     template.HTML(model.Conf.Language(184)),
+		"appearanceMode":         model.Conf.Appearance.Mode,
+		"appearanceModeOS":       model.Conf.Appearance.ModeOS,
+		"workspace":              filepath.Base(util.WorkspaceDir),
+		"workspacePath":          util.WorkspaceDir,
+		"keymapGeneralToggleWin": keymapHideWindow,
 	}
 	buf := &bytes.Buffer{}
 	if err = tpl.Execute(buf, model); nil != err {