mirror of
https://github.com/matrix-construct/construct
synced 2024-11-29 10:12:39 +01:00
ircd:Ⓜ️:v1: Fix and simplify key::query request content.
This commit is contained in:
parent
f97472291e
commit
b59f571c94
1 changed files with 22 additions and 10 deletions
32
ircd/m_v1.cc
32
ircd/m_v1.cc
|
@ -1428,23 +1428,35 @@ ircd::m::v1::_make_server_keys(const vector_view<const key::server_key> &keys,
|
|||
const mutable_buffer &buf)
|
||||
{
|
||||
json::stack out{buf};
|
||||
json::stack::object top{out};
|
||||
json::stack::object server_keys
|
||||
{
|
||||
json::stack::object top{out};
|
||||
json::stack::member server_keys{top, "server_keys"};
|
||||
json::stack::object keys_object{server_keys};
|
||||
for(const auto &sk : keys)
|
||||
top, "server_keys"
|
||||
};
|
||||
|
||||
for(const auto &[server_name, key_id] : keys)
|
||||
{
|
||||
json::stack::object server_object
|
||||
{
|
||||
json::stack::member server_name{keys_object, sk.first};
|
||||
json::stack::object server_object{server_name};
|
||||
json::stack::member key_name{server_object, sk.second};
|
||||
json::stack::object key_object{key_name};
|
||||
json::stack::member mvut
|
||||
server_keys, server_name
|
||||
};
|
||||
|
||||
if(key_id)
|
||||
{
|
||||
json::stack::object key_object
|
||||
{
|
||||
key_object, "minimum_valid_until_ts", json::value{0L}
|
||||
server_object, key_id
|
||||
};
|
||||
|
||||
//json::stack::member mvut
|
||||
//{
|
||||
// key_object, "minimum_valid_until_ts", json::value(0L)
|
||||
//};
|
||||
}
|
||||
}
|
||||
|
||||
server_keys.~object();
|
||||
top.~object();
|
||||
return out.completed();
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue