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

ircd:Ⓜ️:room::bootstrap: Add expectation for non-empty host.

Browse source
This commit is contained in:
Jason Volk 2020-08-25 14:43:22 -07:00
parent 9c4aea4ca6
commit a8cd30157e
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
matrix/room_bootstrap.cc
View file

@ -111,6 +111,9 @@ ircd::m::room::bootstrap::bootstrap(m::event::id::buf &event_id_buf,
hosts[0] hosts[0]
}; };
if(!host && !event_id_buf)
return;
log::info log::info
{ {
log, "Starting in %s for %s to '%s' joined:%b ver:%s", log, "Starting in %s for %s to '%s' joined:%b ver:%s",
@ -121,14 +124,13 @@ ircd::m::room::bootstrap::bootstrap(m::event::id::buf &event_id_buf,
room_version, room_version,
}; };
if(existing_join) if(existing_join)
event_id_buf = m::event_id(std::nothrow, member_event_idx); event_id_buf = m::event_id(std::nothrow, member_event_idx);
if(!event_id_buf) if(host && !event_id_buf)
event_id_buf = m::roomstrap::make_join(host, room_id, user_id, room_version_buf); event_id_buf = m::roomstrap::make_join(host, room_id, user_id, room_version_buf);
if(!room_version) if(host && !room_version)
m::roomstrap::make_join(host, room_id, user_id, room_version_buf); m::roomstrap::make_join(host, room_id, user_id, room_version_buf);
assert(event_id_buf); assert(event_id_buf);