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

modules/client/sync/rooms/state: Supply invite room state on invite.

Browse source 
modules/client/rooms/invite: Add the sender's membership event.
This commit is contained in:
Jason Volk 2019-07-15 13:56:50 -07:00
parent 598585a431
commit 2f71edf41f
2 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/client/rooms/invite.cc
View file

@ -188,10 +188,12 @@ try
state.get(std::nothrow, "m.room.create", "", append);
state.get(std::nothrow, "m.room.power_levels", "", append);
state.get(std::nothrow, "m.room.join_rules", "", append);
state.get(std::nothrow, "m.room.history_visibility", "", append);
state.get(std::nothrow, "m.room.aliases", my_host(), append);
state.get(std::nothrow, "m.room.canonical_alias", "", append);
state.get(std::nothrow, "m.room.avatar", "", append);
state.get(std::nothrow, "m.room.name", "", append);
state.get(std::nothrow, "m.room.member", at<"sender"_>(event), append);
}
top.~object();

30
modules/client/sync/rooms/state.cc
View file

@ -82,6 +82,9 @@ ircd::m::sync::_default_fopts
bool
ircd::m::sync::room_state_linear(data &data)
{
if(data.membership == "invite")
return false;
return room_state_linear_events(data);
}
@ -125,8 +128,9 @@ ircd::m::sync::room_state_linear_events(data &data)
// use the timeline. We make an exception for past state events the server
// only recently obtained, to hide them from the timeline.
if(int64_t(state_exposure_depth) > -1)
if(json::get<"depth"_>(*data.event) + int64_t(state_exposure_depth) >= data.room_depth)
return false;
if(data.membership != "invite")
if(json::get<"depth"_>(*data.event) + int64_t(state_exposure_depth) >= data.room_depth)
return false;
json::stack::object rooms
{
@ -160,6 +164,28 @@ ircd::m::sync::room_state_linear_events(data &data)
*data.out, "events"
};
// Branch for supplying state to the client after its user's invite
// is processed. At this point the client has not received prior room
// state in /sync.
if(data.membership == "invite" &&
json::get<"type"_>(*data.event) == "m.room.member" &&
json::get<"state_key"_>(*data.event) == data.user.user_id)
{
const auto append{[&]
(const m::event &event)
{
room_state_append(data, array, event, index(event));
}};
const m::room::state state{*data.room};
state.get(std::nothrow, "m.room.create", "", append);
state.get(std::nothrow, "m.room.join_rules", "", append);
state.get(std::nothrow, "m.room.history_visibility", "", append);
const auto &sender(json::get<"sender"_>(*data.event));
state.get(std::nothrow, "m.room.member", sender, append);
}
room_state_append(data, array, *data.event, data.event_idx);
return true;
}