TudbuT/conduit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-old-events' into 'next'

Browse source 
fix: make sure old events don't sneek into the timeline

See merge request famedly/conduit!188
This commit is contained in:
Timo Kösters 2021-09-03 09:47:24 +00:00
commit a449b1d73f
1 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/server_server.rs
View file

@ -977,6 +977,12 @@ pub(crate) async fn handle_incoming_pdu<'a>(
.map_err(|_| "Failed to ask database for event.".to_owned())? .map_err(|_| "Failed to ask database for event.".to_owned())?
.ok_or_else(|| "Failed to find create event in db.".to_owned())?; .ok_or_else(|| "Failed to find create event in db.".to_owned())?;
let first_pdu_in_room = db
.rooms
.first_pdu_in_room(&room_id)
.map_err(|_| "Error loading first room event.".to_owned())?
.expect("Room exists");
let (incoming_pdu, val) = handle_outlier_pdu( let (incoming_pdu, val) = handle_outlier_pdu(
origin, origin,
&create_event, &create_event,
@ -993,13 +999,7 @@ pub(crate) async fn handle_incoming_pdu<'a>(
return Ok(None); return Ok(None);
} }
if incoming_pdu.origin_server_ts if incoming_pdu.origin_server_ts < first_pdu_in_room.origin_server_ts {
< db.rooms
.first_pdu_in_room(&room_id)
.map_err(|_| "Error loading first room event.".to_owned())?
.expect("Room exists")
.origin_server_ts
{
return Ok(None); return Ok(None);
} }
@ -1037,13 +1037,7 @@ pub(crate) async fn handle_incoming_pdu<'a>(
if let Some(json) = if let Some(json) =
json_opt.or_else(|| db.rooms.get_outlier_pdu_json(&prev_event_id).ok().flatten()) json_opt.or_else(|| db.rooms.get_outlier_pdu_json(&prev_event_id).ok().flatten())
{ {
if pdu.origin_server_ts if pdu.origin_server_ts > first_pdu_in_room.origin_server_ts {
> db.rooms
.first_pdu_in_room(&room_id)
.map_err(|_| "Error loading first room event.".to_owned())?
.expect("Room exists")
.origin_server_ts
{
amount += 1; amount += 1;
for prev_prev in &pdu.prev_events { for prev_prev in &pdu.prev_events {
if !graph.contains_key(prev_prev) { if !graph.contains_key(prev_prev) {
@ -1095,6 +1089,10 @@ pub(crate) async fn handle_incoming_pdu<'a>(
break; break;
} }
if let Some((pdu, json)) = eventid_info.remove(&prev_id) { if let Some((pdu, json)) = eventid_info.remove(&prev_id) {
if pdu.origin_server_ts < first_pdu_in_room.origin_server_ts {
continue;
}
let start_time = Instant::now(); let start_time = Instant::now();
let event_id = pdu.event_id.clone(); let event_id = pdu.event_id.clone();
if let Err(e) = upgrade_outlier_to_timeline_pdu( if let Err(e) = upgrade_outlier_to_timeline_pdu(