oss/conduit
oss/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2025-06-27 16:35:59 +00:00
Code Wiki Activity

fix: don't load endless prev events and fix room join bug

Browse source
This commit is contained in:
Timo Kösters 2021-08-16 23:24:52 +02:00 • committed by Jonas Zohren
parent 8f1a41dcd2
commit 4a9483c07c
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/server_server.rs
View file

@ -907,7 +907,7 @@ pub async fn handle_incoming_pdu<'a>(
if let Some(json) =
json_opt.or_else(|| db.rooms.get_outlier_pdu_json(&prev_event_id).ok().flatten())
{
if incoming_pdu.origin_server_ts
if pdu.origin_server_ts
> db.rooms
.first_pdu_in_room(&room_id)
.map_err(|_| "Error loading first room event.".to_owned())?