From f9a2edc0dda2b44fd04d20d946ea2b5431cf5d29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20K=C3=B6sters?= <timo@koesters.xyz>
Date: Sat, 14 Aug 2021 22:50:45 +0200
Subject: [PATCH] fix: also fetch prev events that are outliers already

---
 src/database/rooms.rs | 13 +++++++++++++
 src/server_server.rs  | 24 +++++++++++++-----------
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/database/rooms.rs b/src/database/rooms.rs
index 99f0c83e..4a3ab71a 100644
--- a/src/database/rooms.rs
+++ b/src/database/rooms.rs
@@ -844,6 +844,19 @@ impl Rooms {
             .transpose()
     }
 
+    /// Returns the json of a pdu.
+    pub fn get_outlier_pdu_json(
+        &self,
+        event_id: &EventId,
+    ) -> Result<Option<CanonicalJsonObject>> {
+        self.eventid_outlierpdu
+            .get(event_id.as_bytes())?
+            .map(|pdu| {
+                serde_json::from_slice(&pdu).map_err(|_| Error::bad_database("Invalid PDU in db."))
+            })
+            .transpose()
+    }
+
     /// Returns the json of a pdu.
     pub fn get_non_outlier_pdu_json(
         &self,
diff --git a/src/server_server.rs b/src/server_server.rs
index e7221261..a293d1b1 100644
--- a/src/server_server.rs
+++ b/src/server_server.rs
@@ -887,10 +887,10 @@ pub async fn handle_incoming_pdu<'a>(
     let mut todo_outlier_stack = incoming_pdu.prev_events.clone();
     let mut todo_timeline_stack = Vec::new();
     while let Some(prev_event_id) = todo_outlier_stack.pop() {
-        if let Some((pdu, Some(json))) = fetch_and_handle_outliers(
+        if let Some((pdu, json_opt)) = fetch_and_handle_outliers(
             db,
             origin,
-            &[prev_event_id],
+            &[prev_event_id.clone()],
             &create_event,
             &room_id,
             pub_key_map,
@@ -898,15 +898,17 @@ pub async fn handle_incoming_pdu<'a>(
         .await
         .pop()
         {
-            if incoming_pdu.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
-            {
-                todo_outlier_stack.extend(pdu.prev_events.iter().cloned());
-                todo_timeline_stack.push((pdu, json));
+            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
+                    > db.rooms
+                        .first_pdu_in_room(&room_id)
+                        .map_err(|_| "Error loading first room event.".to_owned())?
+                        .expect("Room exists")
+                        .origin_server_ts
+                {
+                    todo_outlier_stack.extend(pdu.prev_events.iter().cloned());
+                    todo_timeline_stack.push((pdu, json));
+                }
             }
         }
     }