Fix JSON comment bug

Simple-Tracker · Sep 24, 2024 · 180cd93 · 180cd93
1 parent 5f26718
commit 180cd93
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/config.go b/config.go
@@ -266,7 +266,7 @@ func SetBlockListFromFile() bool {
 
 		var content []string
 		if filepath.Ext(filePath) == ".json" {
-			err = json.Unmarshal(blockListContent, &content)
+			err = json.Unmarshal(jsonc.ToJSON(blockListContent), &content)
 			if err != nil {
 				Log("SetBlockListFromFile", GetLangText("Error-GenJSONWithID"), true, filePath, err.Error())
 				continue
@@ -305,7 +305,7 @@ func SetBlockListFromURL() bool {
 
 		var content []string
 		if strings.HasSuffix(strings.ToLower(strings.Split(httpHeader.Get("Content-Type"), ";")[0]), "json") {
-			err := json.Unmarshal(blockListContent, &content)
+			err := json.Unmarshal(jsonc.ToJSON(blockListContent), &content)
 			if err != nil {
 				Log("SetBlockListFromFile", GetLangText("Error-GenJSONWithID"), true, blockListURL, err.Error())
 				continue
@@ -380,7 +380,7 @@ func SetIPBlockListFromFile() bool {
 
 		var content []string
 		if filepath.Ext(filePath) == ".json" {
-			err := json.Unmarshal(ipBlockListFile, &content)
+			err := json.Unmarshal(jsonc.ToJSON(ipBlockListFile), &content)
 			if err != nil {
 				Log("SetIPBlockListFromFile", GetLangText("Error-GenJSONWithID"), true, filePath, err.Error())
 			}
@@ -416,7 +416,7 @@ func SetIPBlockListFromURL() bool {
 
 		var content []string
 		if strings.HasSuffix(httpHeader.Get("Content-Type"), "json") {
-			err := json.Unmarshal(ipBlockListContent, &content)
+			err := json.Unmarshal(jsonc.ToJSON(ipBlockListContent), &content)
 			if err != nil {
 				Log("SetIPBlockListFromURL", GetLangText("Error-GenJSONWithID"), true, ipBlockListURL, err.Error())
 				continue

diff --git a/i18n.go b/i18n.go
@@ -5,6 +5,7 @@ import (
 	"os"
 
 	"github.com/Xuanwo/go-locale"
+	"github.com/tidwall/jsonc"
 )
 
 var langContent map[string]string
@@ -136,7 +137,7 @@ func LoadLang(langCode string) bool {
 		return false
 	}
 
-	if err := json.Unmarshal(langFile, &langContent); err != nil {
+	if err := json.Unmarshal(jsonc.ToJSON(langFile), &langContent); err != nil {
 		Log("LoadLang", GetLangText("Error-ParseLang"), false, langPath, err.Error())
 		return false
 	}