mirror of
https://github.com/matrix-construct/construct
synced 2024-09-27 11:18:51 +02:00
ircd:Ⓜ️ Reenable the room membership test using state b-tree query.
This commit is contained in:
parent
45f165b462
commit
cee2b5d561
1 changed files with 22 additions and 20 deletions
|
@ -330,33 +330,35 @@ ircd::m::room::membership(const m::id::user &user_id,
|
||||||
const string_view &membership)
|
const string_view &membership)
|
||||||
const
|
const
|
||||||
{
|
{
|
||||||
const vm::query<vm::where::equal> member_event
|
const event::id::buf event_id_buf
|
||||||
{
|
{
|
||||||
{ "room_id", room_id },
|
!event_id? head(room_id) : string_view{}
|
||||||
{ "type", "m.room.member" },
|
|
||||||
{ "state_key", user_id },
|
|
||||||
};
|
};
|
||||||
|
|
||||||
if(!membership)
|
const event::id event_id
|
||||||
return m::vm::test(member_event);
|
|
||||||
|
|
||||||
const vm::query<vm::where::test> membership_test{[&membership]
|
|
||||||
(const auto &event)
|
|
||||||
{
|
{
|
||||||
const json::object &content
|
this->event_id? this->event_id : event_id_buf
|
||||||
{
|
};
|
||||||
json::at<"content"_>(event)
|
|
||||||
};
|
|
||||||
|
|
||||||
const auto &existing_membership
|
m::state::id_buffer state_root_buf;
|
||||||
{
|
const auto state_root
|
||||||
unquote(content.at("membership"))
|
{
|
||||||
};
|
dbs::state_root(state_root_buf, room_id, event_id)
|
||||||
|
};
|
||||||
|
|
||||||
return membership == existing_membership;
|
bool ret{false};
|
||||||
}};
|
m::state::get(state_root, "m.room.member", user_id, [&membership, &ret]
|
||||||
|
(const string_view &event_id)
|
||||||
|
{
|
||||||
|
event::fetch event;
|
||||||
|
if(!seek(event, event_id, std::nothrow))
|
||||||
|
return;
|
||||||
|
|
||||||
return m::vm::test(member_event && membership_test);
|
assert(json::get<"type"_>(event) == "m.room.member");
|
||||||
|
ret = at<"membership"_>(event) == membership;
|
||||||
|
});
|
||||||
|
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool
|
bool
|
||||||
|
|
Loading…
Reference in a new issue