Mirrors
/
mautrix-go
mirror of https://github.com/mautrix/go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix bug

resp-create-room-add-room-version
Tulir Asokan 2022-08-04 15:03:04 +03:00
parent c6df5e34ba
commit 3b741b3dfc
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
responses.go
View File

@ -395,19 +395,21 @@ func (rc *RespCapabilities) UnmarshalJSON(data []byte) error {
}
func (rc *RespCapabilities) MarshalJSON() ([]byte, error) {
marshalableCopy := make(map[string]interface{})
marshalableCopy := make(map[string]interface{}, len(rc.Custom))
val := reflect.ValueOf(rc).Elem()
for _, field := range reflect.VisibleFields(val.Type()) {
jsonTag := strings.Split(field.Tag.Get("json"), ",")[0]
if jsonTag != "-" && jsonTag != "" {
fieldVal := val.FieldByIndex(field.Index)
if !fieldVal.IsNil() {
rc.Custom[jsonTag] = fieldVal.Interface()
marshalableCopy[jsonTag] = fieldVal.Interface()
}
}
}
for key, value := range rc.Custom {
marshalableCopy[key] = value
if rc.Custom != nil {
for key, value := range rc.Custom {
marshalableCopy[key] = value
}
}
var buf bytes.Buffer
buf.WriteString(`{"capabilities":`)

1
responses_test.go
View File

@ -109,4 +109,5 @@ func TestRespCapabilities_MarshalJSON(t *testing.T) {
marshaledString := string(canonicaljson.CanonicalJSONAssumeValid(data))
origString := string(canonicaljson.CanonicalJSONAssumeValid([]byte(sampleData)))
assert.Equal(t, marshaledString, origString)
assert.Len(t, sampleObject.Custom, 1)
}