From 8bcfff276652e20fee14e13109d80a514e1a107d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20K=C3=B6sters?= <timo@koesters.xyz>
Date: Thu, 17 Sep 2020 19:58:19 +0200
Subject: [PATCH] fix: no notification counts for fast /syncs

---
 src/database/rooms.rs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/database/rooms.rs b/src/database/rooms.rs
index 595862624..18881dd84 100644
--- a/src/database/rooms.rs
+++ b/src/database/rooms.rs
@@ -447,6 +447,11 @@ pub fn append_pdu(
         // This is also the next_batch/since value
         let index = globals.next_count()?;
 
+        // Mark as read first so the sending client doesn't get a notification even if appending
+        // fails
+        self.edus
+            .private_read_set(&pdu.room_id, &pdu.sender, index, &globals)?;
+
         let mut pdu_id = pdu.room_id.as_bytes().to_vec();
         pdu_id.push(0xff);
         pdu_id.extend_from_slice(&index.to_be_bytes());
@@ -503,9 +508,6 @@ pub fn append_pdu(
             _ => {}
         }
 
-        self.edus
-            .private_read_set(&pdu.room_id, &pdu.sender, index, &globals)?;
-
         Ok(pdu_id)
     }
 
@@ -520,7 +522,7 @@ pub fn append_to_state(&self, new_pdu_id: &[u8], new_pdu: &PduEvent) -> Result<S
                 // Store state for event. The state does not include the event itself.
                 // Instead it's the state before the pdu, so the room's old state.
                 self.pduid_statehash
-                    .insert(dbg!(new_pdu_id), &old_state_hash)?;
+                    .insert(new_pdu_id, &old_state_hash)?;
                 if new_pdu.state_key.is_none() {
                     return Ok(old_state_hash);
                 }