fix(frontend-conf): Use pointer with omitempty to ignore frontend con…

…fig output Signed-off-by: qwqcode <[email protected]>
ArtalkJS · May 4, 2022 · a16977d · a16977d · qwqcode · May 4, 2022
1 parent 2cb8e40
commit a16977d
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 27 deletions.
diff --git a/config/config.go b/config/config.go
@@ -262,33 +262,33 @@ type NotifyLINEConf struct {
 
 // 使用转换 @link https://transform.tools/json-to-go
 type FrontendConf struct {
-	Placeholder  string `mapstructure:"placeholder" json:"placeholder,omitempty"`
-	NoComment    string `mapstructure:"noComment" json:"noComment,omitempty"`
-	SendBtn      string `mapstructure:"sendBtn" json:"sendBtn,omitempty"`
-	DarkMode     bool   `mapstructure:"darkMode" json:"darkMode,omitempty"`
-	EditorTravel bool   `mapstructure:"editorTravel" json:"editorTravel,omitempty"`
-	Emoticons    string `mapstructure:"emoticons" json:"emoticons,omitempty"`
-	Vote         bool   `mapstructure:"vote" json:"vote,omitempty"`
-	VoteDown     bool   `mapstructure:"voteDown" json:"voteDown,omitempty"`
-	UaBadge      bool   `mapstructure:"uaBadge" json:"uaBadge,omitempty"`
-	ListSort     bool   `mapstructure:"listSort" json:"listSort,omitempty"`
-	PvEl         string `mapstructure:"pvEl" json:"pvEl,omitempty"`
-	FlatMode     string `mapstructure:"flatMode" json:"flatMode,omitempty"`
-	MaxNesting   int    `mapstructure:"maxNesting" json:"maxNesting,omitempty"`
-	Gravatar     struct {
-		Default string `mapstructure:"default" json:"default,omitempty"`
-		Mirror  string `mapstructure:"mirror" json:"mirror,omitempty"`
+	Placeholder  *string `mapstructure:"placeholder" json:"placeholder,omitempty"`
+	NoComment    *string `mapstructure:"noComment" json:"noComment,omitempty"`
+	SendBtn      *string `mapstructure:"sendBtn" json:"sendBtn,omitempty"`
+	DarkMode     *bool   `mapstructure:"darkMode" json:"darkMode,omitempty"`
+	EditorTravel *bool   `mapstructure:"editorTravel" json:"editorTravel,omitempty"`
+	Emoticons    *string `mapstructure:"emoticons" json:"emoticons,omitempty"`
+	Vote         *bool   `mapstructure:"vote" json:"vote,omitempty"`
+	VoteDown     *bool   `mapstructure:"voteDown" json:"voteDown,omitempty"`
+	UaBadge      *bool   `mapstructure:"uaBadge" json:"uaBadge,omitempty"`
+	ListSort     *bool   `mapstructure:"listSort" json:"listSort,omitempty"`
+	PvEl         *string `mapstructure:"pvEl" json:"pvEl,omitempty"`
+	FlatMode     *string `mapstructure:"flatMode" json:"flatMode,omitempty"`
+	MaxNesting   *int    `mapstructure:"maxNesting" json:"maxNesting,omitempty"`
+	Gravatar     *struct {
+		Default *string `mapstructure:"default" json:"default,omitempty"`
+		Mirror  *string `mapstructure:"mirror" json:"mirror,omitempty"`
 	} `mapstructure:"gravatar" json:"gravatar,omitempty"`
-	Pagination struct {
-		PageSize int  `mapstructure:"pageSize" json:"pageSize,omitempty"`
-		ReadMore bool `mapstructure:"readMore" json:"readMore,omitempty"`
-		AutoLoad bool `mapstructure:"autoLoad" json:"autoLoad,omitempty"`
+	Pagination *struct {
+		PageSize *int  `mapstructure:"pageSize" json:"pageSize,omitempty"`
+		ReadMore *bool `mapstructure:"readMore" json:"readMore,omitempty"`
+		AutoLoad *bool `mapstructure:"autoLoad" json:"autoLoad,omitempty"`
 	} `mapstructure:"pagination" json:"pagination,omitempty"`
-	HeightLimit struct {
-		Content  int `mapstructure:"content" json:"content,omitempty"`
-		Children int `mapstructure:"children" json:"children,omitempty"`
+	HeightLimit *struct {
+		Content  *int `mapstructure:"content" json:"content,omitempty"`
+		Children *int `mapstructure:"children" json:"children,omitempty"`
 	} `mapstructure:"heightLimit" json:"heightLimit,omitempty"`
-	ImgUpload    bool `mapstructure:"imgUpload"  json:"imgUpload,omitempty"`
-	ReqTimeout   int  `mapstructure:"reqTimeout" json:"reqTimeout,omitempty"`
-	VersionCheck bool `mapstructure:"versionCheck" json:"versionCheck,omitempty"`
+	ImgUpload    *bool `mapstructure:"imgUpload"  json:"imgUpload,omitempty"`
+	ReqTimeout   *int  `mapstructure:"reqTimeout" json:"reqTimeout,omitempty"`
+	VersionCheck *bool `mapstructure:"versionCheck" json:"versionCheck,omitempty"`
 }
diff --git a/http/a_resp.go b/http/a_resp.go
@@ -115,7 +115,7 @@ func GetApiPublicConfDataMap(c echo.Context) Map {
 	}
 
 	frontendConf := config.Instance.Frontend
-	frontendConf.ImgUpload = imgUpload
+	frontendConf.ImgUpload = &imgUpload
 
 	return Map{
 		"img_upload":    imgUpload,