MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-12-26 15:33:54 +01:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️ Simplify user::rooms iteration callstack.

Browse source
This commit is contained in:
Jason Volk 2018-05-21 00:19:08 -07:00
parent ca1fbfec55
commit 2755d779c9
1 changed files with 2 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
ircd/m/m.cc
View file

@ -2111,22 +2111,7 @@ void
ircd::m::user::rooms::for_each(const closure_bool &closure)
const
{
const m::room::state state{user_room};
state.test("ircd.member", [&closure]
(const m::event &event)
{
const m::room::id &room_id
{
at<"state_key"_>(event)
};
const string_view &membership
{
unquote(at<"content"_>(event).at("membership"))
};
return !closure(room_id, membership);
});
for_each(string_view{}, closure);
}
void
@ -2147,8 +2132,6 @@ ircd::m::user::rooms::for_each(const string_view &membership,
const closure_bool &closure)
const
{
if(empty(membership))
return for_each(closure);
const m::room::state state{user_room};
state.test("ircd.member", [&membership, &closure]
@ -2159,7 +2142,7 @@ const
unquote(at<"content"_>(event).at("membership"))
};
if(membership_ != membership)
if(membership && membership_ != membership)
return false;
const m::room::id &room_id