refactor and optimize receipt service data
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
parent
343ec59a8b
commit
c903a71807
5 changed files with 26 additions and 45 deletions
|
@ -559,8 +559,6 @@ async fn load_joined_room(
|
|||
.lazy_loading
|
||||
.lazy_load_confirm_delivery(sender_user, sender_device, room_id, sincecount);
|
||||
|
||||
// Database queries:
|
||||
|
||||
let current_shortstatehash = services
|
||||
.rooms
|
||||
.state
|
||||
|
@ -983,9 +981,9 @@ async fn load_joined_room(
|
|||
.filter_map(|(read_user, _, edu)| async move {
|
||||
services
|
||||
.users
|
||||
.user_is_ignored(&read_user, sender_user)
|
||||
.user_is_ignored(read_user, sender_user)
|
||||
.await
|
||||
.or_some((read_user, edu))
|
||||
.or_some((read_user.to_owned(), edu))
|
||||
})
|
||||
.collect()
|
||||
.await;
|
||||
|
|
|
@ -495,11 +495,11 @@ pub(crate) async fn sync_events_v4_route(
|
|||
.read_receipt
|
||||
.readreceipts_since(room_id, *roomsince)
|
||||
.filter_map(|(read_user, ts, v)| async move {
|
||||
(!services
|
||||
services
|
||||
.users
|
||||
.user_is_ignored(&read_user, sender_user)
|
||||
.await)
|
||||
.then_some((read_user, ts, v))
|
||||
.user_is_ignored(read_user, sender_user)
|
||||
.await
|
||||
.or_some((read_user.to_owned(), ts, v))
|
||||
})
|
||||
.collect()
|
||||
.await;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue