MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2025-01-15 17:16:49 +01:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️ Reenable the state test/for_each; ensure any value unquote(); minor.

Browse source
This commit is contained in:
Jason Volk 2018-02-09 12:10:34 -08:00
parent 366716c890
commit 0906db32d0
1 changed files with 76 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

96
ircd/m/room.cc
View file

@ -352,7 +352,7 @@ const
(const string_view &event_id) (const string_view &event_id)
{ {
event::fetch event; event::fetch event;
if(!seek(event, event_id, std::nothrow)) if(!seek(event, unquote(event_id), std::nothrow))
return; return;
assert(json::get<"type"_>(event) == "m.room.member"); assert(json::get<"type"_>(event) == "m.room.member");
@ -463,7 +463,7 @@ const
(const string_view &event_id) (const string_view &event_id)
{ {
event::fetch event; event::fetch event;
if(seek(event, event_id, std::nothrow)) if(seek(event, unquote(event_id), std::nothrow))
closure(event); closure(event);
}); });
} }
@ -472,10 +472,31 @@ bool
ircd::m::room::has(const string_view &type) ircd::m::room::has(const string_view &type)
const const
{ {
return test(type, [](const auto &event) const event::id::buf event_id_buf
{ {
return true; !event_id? head(room_id) : string_view{}
};
const event::id event_id
{
this->event_id? this->event_id : event_id_buf
};
m::state::id_buffer state_root_buf;
const auto state_root
{
dbs::state_root(state_root_buf, room_id, event_id)
};
bool ret{false};
m::state::each(state_root, type, [&ret]
(const json::array &key, const string_view &val)
{
ret = true;
return false;
}); });
return ret;
} }
bool bool
@ -510,13 +531,33 @@ ircd::m::room::for_each(const string_view &type,
const event::closure &closure) const event::closure &closure)
const const
{ {
const vm::query<vm::where::equal> query const event::id::buf event_id_buf
{ {
{ "room_id", room_id }, !event_id? head(room_id) : string_view{}
{ "type", type },
}; };
return m::vm::for_each(query, closure); const event::id event_id
{
this->event_id? this->event_id : event_id_buf
};
m::state::id_buffer state_root_buf;
const auto state_root
{
dbs::state_root(state_root_buf, room_id, event_id)
};
event::fetch event;
m::state::each(state_root, type, [&event, &closure]
(const json::array &key, const string_view &event_id)
{
if(!seek(event, unquote(event_id), std::nothrow))
return true;
// logical inversion for test vs. until protocol.
closure(event);
return true;
});
} }
bool bool
@ -524,13 +565,32 @@ ircd::m::room::test(const string_view &type,
const event::closure_bool &closure) const event::closure_bool &closure)
const const
{ {
const vm::query<vm::where::equal> query const event::id::buf event_id_buf
{ {
{ "room_id", room_id }, !event_id? head(room_id) : string_view{}
{ "type", type },
}; };
return m::vm::test(query, closure); const event::id event_id
{
this->event_id? this->event_id : event_id_buf
};
m::state::id_buffer state_root_buf;
const auto state_root
{
dbs::state_root(state_root_buf, room_id, event_id)
};
event::fetch event;
return !m::state::each(state_root, type, [&event, &closure]
(const json::array &key, const string_view &event_id)
{
if(!seek(event, unquote(event_id), std::nothrow))
return true;
// logical inversion for test vs. until protocol.
return !closure(event);
});
} }
// //
@ -558,15 +618,11 @@ const
}; };
event::fetch event; event::fetch event;
return m::state::each(state_root, "m.room.member", [&event, &view] static const string_view type{"m.room.member"};
(const json::array &key, const string_view &val) return m::state::each(state_root, type, [&event, &view]
(const json::array &key, const string_view &event_id)
{ {
const string_view event_id if(!seek(event, unquote(event_id), std::nothrow))
{
unquote(val)
};
if(!seek(event, event_id, std::nothrow))
return false; return false;
return view(event); return view(event);