From c6d88359d7aae985f9688dddb321d07ef2043708 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20K=C3=B6sters?= <timo@koesters.xyz>
Date: Fri, 7 Jan 2022 09:56:09 +0100
Subject: [PATCH] fix: incremental lazy loading

---
 src/client_server/sync.rs | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/client_server/sync.rs b/src/client_server/sync.rs
index c2014403..a6122893 100644
--- a/src/client_server/sync.rs
+++ b/src/client_server/sync.rs
@@ -484,28 +484,27 @@ async fn sync_helper(
 
                     state_events.push(pdu);
                 }
-                for (_, event) in &timeline_pdus {
-                    if lazy_loaded.contains(&event.sender) {
-                        continue;
-                    }
+            }
 
-                    if !db.rooms.lazy_load_was_sent_before(
-                        &sender_user,
-                        &sender_device,
+            for (_, event) in &timeline_pdus {
+                if lazy_loaded.contains(&event.sender) {
+                    continue;
+                }
+
+                if !db.rooms.lazy_load_was_sent_before(
+                    &sender_user,
+                    &sender_device,
+                    &room_id,
+                    &event.sender,
+                )? || lazy_load_send_redundant
+                {
+                    if let Some(member_event) = db.rooms.room_state_get(
                         &room_id,
-                        &event.sender,
-                    )? || lazy_load_send_redundant
-                    {
-                        let pdu = match db.rooms.get_pdu(&id)? {
-                            Some(pdu) => pdu,
-                            None => {
-                                error!("Pdu in state not found: {}", id);
-                                continue;
-                            }
-                        };
-
+                        &EventType::RoomMember,
+                        event.sender.as_str(),
+                    )? {
                         lazy_loaded.insert(event.sender.clone());
-                        state_events.push(pdu);
+                        state_events.push(member_event);
                     }
                 }
             }