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

Clean up a bit

Browse source
This commit is contained in:
Neil Alexander 2021-07-28 17:09:43 +01:00
parent dd33f2b76d
commit ad05e3de6e
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
clientapi/routing/keys.go
View file

@ -112,22 +112,15 @@ func QueryKeys(req *http.Request, keyAPI api.KeyInternalAPI) util.JSONResponse {
Timeout: r.GetTimeout(), Timeout: r.GetTimeout(),
// TODO: Token? // TODO: Token?
}, &queryRes) }, &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{ return util.JSONResponse{
Code: 200, Code: 200,
JSON: res, 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,
},
} }
} }