MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-09-29 20:28:52 +02:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️ Retool the local query to the m::keys room.

Browse source
This commit is contained in:
Jason Volk 2018-02-10 17:58:39 -08:00
parent 43d581f1e9
commit 9ddf83c73c
1 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
ircd/m/keys.cc
View file

@ -417,23 +417,12 @@ bool
ircd::m::keys::get_local(const string_view &server_name, ircd::m::keys::get_local(const string_view &server_name,
const keys_closure &closure) const keys_closure &closure)
{ {
const m::vm::query<m::vm::where::equal> query static const string_view type{"ircd.key"};
return m::keys::room.get(std::nothrow, type, server_name, [&closure]
(const m::event &event)
{ {
{ "room_id", keys::room.room_id }, closure(json::get<"content"_>(event));
{ "type", "ircd.key" }, });
{ "state_key", server_name },
};
const auto have
{
[&closure](const auto &event)
{
closure(json::get<"content"_>(event));
return true;
}
};
return m::vm::test(query, have);
} }
void void
@ -459,7 +448,8 @@ ircd::m::keys::set(const keys &keys)
keys keys
}; };
send(keys::room, sender, "ircd.key", state_key, json::object{derp}); static const string_view type{"ircd.key"};
send(keys::room, sender, type, state_key, json::object{derp});
} }
/// Verify this key data (with itself). /// Verify this key data (with itself).