SagerNet/sing
1
0
Fork 0
mirror of https://github.com/SagerNet/sing.git synced 2025-04-04 04:17:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

badjson: Remove empty JSON object in JSON object

Browse source
This commit is contained in:
世界 2023-12-05 18:19:32 +08:00
parent d171f04941
commit 060edf2d69
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
common/json/badjson/object.go
View file

@ -4,8 +4,10 @@ import (
"bytes" "bytes"
"strings" "strings"
"github.com/sagernet/sing/common"
E "github.com/sagernet/sing/common/exceptions" E "github.com/sagernet/sing/common/exceptions"
"github.com/sagernet/sing/common/json" "github.com/sagernet/sing/common/json"
"github.com/sagernet/sing/common/x/collections"
"github.com/sagernet/sing/common/x/linkedhashmap" "github.com/sagernet/sing/common/x/linkedhashmap"
) )
@ -16,7 +18,12 @@ type JSONObject struct {
func (m JSONObject) MarshalJSON() ([]byte, error) { func (m JSONObject) MarshalJSON() ([]byte, error) {
buffer := new(bytes.Buffer) buffer := new(bytes.Buffer)
buffer.WriteString("{") buffer.WriteString("{")
items := m.Entries() items := common.Filter(m.Entries(), func(it collections.MapEntry[string, any]) bool {
if valueObject, valueIsJSONObject := it.Value.(*JSONObject); valueIsJSONObject && valueObject.IsEmpty() {
return false
}
return true
})
iLen := len(items) iLen := len(items)
for i, entry := range items { for i, entry := range items {
keyContent, err := json.Marshal(entry.Key) keyContent, err := json.Marshal(entry.Key)