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

modules/client/events: Add missing user::room event_append_opts contextual data.

Browse source
This commit is contained in:
Jason Volk 2019-06-29 18:51:23 -07:00
parent 1f8bff0ef5
commit a3da1fd0d0
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
modules/client/events.cc
View file

@ -20,7 +20,8 @@ static void
append_event(json::stack::array &out, append_event(json::stack::array &out,
const m::event &event, const m::event &event,
const m::event::idx &event_idx, const m::event::idx &event_idx,
const int64_t &room_depth); const int64_t &room_depth,
const m::user::room &);
static bool static bool
get_events_from(client &client, get_events_from(client &client,
@ -222,12 +223,17 @@ get__events(client &client,
m::depth(room_id) m::depth(room_id)
}; };
const m::user::room user_room
{
request.user_id
};
json::stack::array chunk json::stack::array chunk
{ {
top, "chunk" top, "chunk"
}; };
append_event(chunk, event_, event_idx, room_depth); append_event(chunk, event_, event_idx, room_depth, user_room);
} }
else json::stack::array else json::stack::array
{ {
@ -298,6 +304,11 @@ get_events_from(client &client,
const int64_t &room_depth, const int64_t &room_depth,
json::stack::object &out) json::stack::object &out)
{ {
const m::user::room user_room
{
request.user_id
};
m::room::messages it m::room::messages it
{ {
room_id, event_id room_id, event_id
@ -317,7 +328,7 @@ get_events_from(client &client,
if(!visible(it.event_id(), request.user_id)) if(!visible(it.event_id(), request.user_id))
continue; continue;
append_event(chunk, *it, it.event_idx(), room_depth); append_event(chunk, *it, it.event_idx(), room_depth, user_room);
++j; ++j;
} }
@ -337,10 +348,13 @@ void
append_event(json::stack::array &out, append_event(json::stack::array &out,
const m::event &event, const m::event &event,
const m::event::idx &event_idx, const m::event::idx &event_idx,
const int64_t &room_depth) const int64_t &room_depth,
const m::user::room &user_room)
{ {
m::event_append_opts opts; m::event_append_opts opts;
opts.event_idx = &event_idx; opts.event_idx = &event_idx;
opts.room_depth = &room_depth; opts.room_depth = &room_depth;
opts.user_room = &user_room;
opts.user_id = &user_room.user.user_id;
m::append(out, event, opts); m::append(out, event, opts);
} }