jimzah/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2025-01-10 08:14:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: no notification counts for fast /syncs

Browse Source
This commit is contained in:
Timo Kösters 2020-09-17 19:58:19 +02:00
parent ea3aaa6b5c
commit 8bcfff2766
No known key found for this signature in database
GPG Key ID: 24DA7517711A2BA4
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/database/rooms.rs
View File

@ -447,6 +447,11 @@ impl Rooms {
// This is also the next_batch/since value // This is also the next_batch/since value
let index = globals.next_count()?; 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(); let mut pdu_id = pdu.room_id.as_bytes().to_vec();
pdu_id.push(0xff); pdu_id.push(0xff);
pdu_id.extend_from_slice(&index.to_be_bytes()); pdu_id.extend_from_slice(&index.to_be_bytes());
@ -503,9 +508,6 @@ impl Rooms {
_ => {} _ => {}
} }
self.edus
.private_read_set(&pdu.room_id, &pdu.sender, index, &globals)?;
Ok(pdu_id) Ok(pdu_id)
} }
@ -520,7 +522,7 @@ impl Rooms {
// Store state for event. The state does not include the event itself. // 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. // Instead it's the state before the pdu, so the room's old state.
self.pduid_statehash 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() { if new_pdu.state_key.is_none() {
return Ok(old_state_hash); return Ok(old_state_hash);
} }