hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2024-12-27 07:28:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't send nulls

Browse source
This commit is contained in:
Neil Alexander 2021-07-28 16:03:06 +01:00
parent 9a541a03fc
commit 525c9e054f
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
clientapi/routing/keys.go
View file

@ -112,15 +112,22 @@ func QueryKeys(req *http.Request, keyAPI api.KeyInternalAPI) util.JSONResponse {
Timeout: r.GetTimeout(),
// TODO: Token?
}, &queryRes)
res := map[string]interface{}{
"device_keys": queryRes.DeviceKeys,
"failures": queryRes.Failures,
}
if k := queryRes.MasterKeys; k != nil {
res["master_keys"] = k
}
if k := queryRes.SelfSigningKeys; k != nil {
res["self_signing_keys"] = k
}
if k := queryRes.UserSigningKeys; k != nil {
res["user_signing_keys"] = k
}
return util.JSONResponse{
Code: 200,
JSON: map[string]interface{}{
"device_keys": queryRes.DeviceKeys,
"master_keys": queryRes.MasterKeys,
"self_signing_keys": queryRes.SelfSigningKeys,
"user_signing_keys": queryRes.UserSigningKeys,
"failures": queryRes.Failures,
},
JSON: res,
}
}

4
federationapi/routing/keys.go
View file

@ -72,8 +72,8 @@ func QueryDeviceKeys(
Code: 200,
JSON: struct {
DeviceKeys interface{} `json:"device_keys"`
MasterKeys interface{} `json:"master_keys"`
SelfSigningKeys interface{} `json:"self_signing_keys"`
MasterKeys interface{} `json:"master_keys,omitempty"`
SelfSigningKeys interface{} `json:"self_signing_keys,omitempty"`
}{
queryRes.DeviceKeys,
queryRes.MasterKeys,