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

ircd:Ⓜ️:room::members: Replace assertion with error log.

Browse source
This commit is contained in:
Jason Volk 2019-07-26 17:31:56 -07:00
parent 2a736ac581
commit e404c7a094
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
ircd/m_room.cc
View file

@ -3135,7 +3135,7 @@ const
// joined members optimization. Only possible when seeking // joined members optimization. Only possible when seeking
// membership="join" on the present state of the room. // membership="join" on the present state of the room.
if(membership == "join" && present) if(membership == "join" && present)
return this->for_each(membership, [&closure, &state, this] return this->for_each(membership, [this, &closure, &state]
(const id::user &member) (const id::user &member)
{ {
const auto event_idx const auto event_idx
@ -3143,10 +3143,18 @@ const
state.get(std::nothrow, "m.room.member", member) state.get(std::nothrow, "m.room.member", member)
}; };
assert(event_idx); if(likely(event_idx))
return event_idx? return closure(member, event_idx);
closure(member, event_idx):
true; log::error
{
log, "Failed to find member event_idx:%zu for %s in present state of %s",
event_idx,
string_view{member},
string_view{room.room_id},
};
return true;
}); });
return state.for_each("m.room.member", [this, &membership, &closure] return state.for_each("m.room.member", [this, &membership, &closure]