mirror of
https://github.com/matrix-construct/construct
synced 2024-09-30 04:38:52 +02:00
modules/client/rooms/account_data: Move checkpoint to cover both linear branches.
This commit is contained in:
parent
f7fa89b061
commit
7042d8e041
1 changed files with 7 additions and 8 deletions
|
@ -46,12 +46,19 @@ ircd::m::sync::room_account_data_linear(data &data)
|
||||||
if(json::get<"room_id"_>(event) != data.user_room.room_id)
|
if(json::get<"room_id"_>(event) != data.user_room.room_id)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
json::stack::checkpoint checkpoint
|
||||||
|
{
|
||||||
|
*data.out
|
||||||
|
};
|
||||||
|
|
||||||
if(room_account_data_linear_events(data, event))
|
if(room_account_data_linear_events(data, event))
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
|
checkpoint.rollback();
|
||||||
if(room_account_data_linear_tags(data, event))
|
if(room_account_data_linear_tags(data, event))
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
|
checkpoint.rollback();
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -257,11 +264,6 @@ ircd::m::sync::room_account_data_polylog_events_event(data &data,
|
||||||
bool
|
bool
|
||||||
ircd::m::sync::room_account_data_polylog_tags(data &data)
|
ircd::m::sync::room_account_data_polylog_tags(data &data)
|
||||||
{
|
{
|
||||||
json::stack::checkpoint checkpoint
|
|
||||||
{
|
|
||||||
*data.out
|
|
||||||
};
|
|
||||||
|
|
||||||
json::stack::object object
|
json::stack::object object
|
||||||
{
|
{
|
||||||
*data.out
|
*data.out
|
||||||
|
@ -318,8 +320,5 @@ ircd::m::sync::room_account_data_polylog_tags(data &data)
|
||||||
return true;
|
return true;
|
||||||
});
|
});
|
||||||
|
|
||||||
if(!ret)
|
|
||||||
checkpoint.rollback();
|
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue