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

modules/client/sync: Readd the transaction_id on longpoll; fix ghost events.

Browse source
This commit is contained in:
Jason Volk 2019-02-28 18:28:45 -08:00
parent 1089530652
commit 8fee82b0d6
3 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/ircd/m/sync.h
View file

@ -97,6 +97,7 @@ struct ircd::m::sync::data
string_view membership;
event::idx room_head {0}; // if *room
event::idx event_idx {0}; // if *event
string_view client_txnid;
data(const m::user &user,
const m::events::range &range,

5
modules/client/sync.cc
View file

@ -567,6 +567,11 @@ ircd::m::sync::longpoll::handle(data &data,
data.event_idx, event.event_idx
};
const scope_restore client_txnid
{
data.client_txnid, event.client_txnid
};
json::stack::checkpoint checkpoint
{
*data.out

6
modules/client/sync/rooms/timeline.cc
View file

@ -169,4 +169,10 @@ ircd::m::sync::_room_timeline_append(data &data,
long(vm::current_sequence - event_idx)
}
};
if(data.client_txnid)
json::stack::member
{
unsigned_, "transaction_id", data.client_txnid
};
}