MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2025-03-13 21:10:32 +01:00
Code Issues Releases Wiki Activity

modules/vm: Move the room_id append up the stack.

Browse source
This commit is contained in:
Jason Volk 2019-07-11 19:21:11 -07:00
parent 2d7a914eb2
commit b5219750be
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
modules/m_vm.cc
View file

@ -233,11 +233,6 @@ ircd::m::vm::inject(eval &eval,
*eval.copts
};
const json::iov::push room_id
{
event, { "room_id", room.room_id }
};
const m::room::head head
{
room
@ -337,16 +332,30 @@ ircd::m::vm::inject(eval &eval,
eval.issue = nullptr;
}};
const scope_restore eval_room_id
{
eval.room_id,
!eval.room_id &&
event.has("room_id")?
string_view{event.at("room_id")}:
string_view{eval.room_id}
};
assert(eval.issue);
assert(eval.copts);
assert(eval.opts);
assert(eval.copts);
const auto &opts
{
*eval.copts
};
assert(eval.room_id);
const json::iov::push room_id
{
event, { "room_id", eval.room_id }
};
const json::iov::add origin_
{
event, opts.add_origin,