blah/blahrs
1
0
Fork 0
mirror of https://github.com/Blah-IM/blahrs.git synced 2025-05-01 00:31:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(blahd): merge queries for last-seen update

Browse source
This commit is contained in:
oxalica 2024-09-24 19:37:50 -04:00
parent 0911d56e22
commit c4fbf1294b
1 changed files with 9 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
blahd/src/database.rs
View file

@ -553,34 +553,22 @@ pub trait TransactionOps {
} }
fn mark_room_msg_seen(&self, rid: Id, uid: i64, cid: Id) -> Result<()> { fn mark_room_msg_seen(&self, rid: Id, uid: i64, cid: Id) -> Result<()> {
let max_cid_in_room = prepare_cached_and_bind!( // We should already verify the existence of the room member.
self.conn(),
r"
SELECT MAX(`cid`)
FROM `msg` INDEXED BY `room_latest_msg`
WHERE `rid` = :rid
"
)
.raw_query()
.next()?
.map(|row| row.get(0))
.transpose()?
.unwrap_or(Id(0));
// FIXME: This leaks room existence information.
api_ensure!(cid <= max_cid_in_room, "invalid cid");
let updated = prepare_cached_and_bind!( let updated = prepare_cached_and_bind!(
self.conn(), self.conn(),
r" r"
UPDATE `room_member` UPDATE `room_member`
SET `last_seen_cid` = MAX(`last_seen_cid`, :cid) SET `last_seen_cid` = :cid
WHERE (`rid`, `uid`) = (:rid, :uid) WHERE (`rid`, `uid`) = (:rid, :uid) AND
:cid <= (
SELECT MAX(`cid`)
FROM `msg` INDEXED BY `room_latest_msg`
WHERE `rid` = :rid
)
" "
) )
.raw_execute()?; .raw_execute()?;
if updated != 1 { api_ensure!(updated == 1, "invalid cid");
return Err(ApiError::RoomNotFound);
}
Ok(()) Ok(())
} }
} }