TudbuT/conduit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

accept receipts prior to events

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-06-01 01:36:37 +00:00
parent 7d2f510cc3
commit c2586737ae
2 changed files with 4 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/api/mod.rs
View file

@ -7,7 +7,7 @@ extern crate conduit_core as conduit;
extern crate conduit_service as service;
pub use client_server::membership::{join_room_by_id_helper, leave_all_rooms};
pub(crate) use conduit::{debug_error, debug_info, debug_warn, utils, Error, Result};
pub(crate) use conduit::{debug_info, debug_warn, utils, Error, Result};
pub(crate) use ruma_wrapper::{Ruma, RumaResponse};
pub(crate) use service::{pdu::PduEvent, services, user_is_local};

22
src/api/server_server.rs
View file

@ -54,7 +54,6 @@ use tracing::{debug, error, trace, warn};
use crate::{
client_server::{self, claim_keys_helper, get_keys_helper},
debug_error,
service::{
pdu::{gen_event_id_canonical_json, PduBuilder},
rooms::event_handler::parse_incoming_pdu,
@ -369,22 +368,9 @@ pub(crate) async fn send_transaction_message_route(
}
if services().rooms.state_cache.is_joined(&user_id, &room_id)? {
if let Some((event_id, _)) = user_updates
.event_ids
.iter()
.filter_map(|id| {
services()
.rooms
.timeline
.get_pdu_count(id)
.ok()
.flatten()
.map(|r| (id, r))
})
.max_by_key(|(_, count)| *count)
{
for event_id in &user_updates.event_ids {
let mut user_receipts = BTreeMap::new();
user_receipts.insert(user_id.clone(), user_updates.data);
user_receipts.insert(user_id.clone(), user_updates.data.clone());
let mut receipts = BTreeMap::new();
receipts.insert(ReceiptType::Read, user_receipts);
@ -396,13 +382,11 @@ pub(crate) async fn send_transaction_message_route(
content: ReceiptEventContent(receipt_content),
room_id: room_id.clone(),
};
services()
.rooms
.read_receipt
.readreceipt_update(&user_id, &room_id, event)?;
} else {
// TODO fetch missing events
debug_error!("No known event ids in read receipt: {:?}", user_updates);
}
} else {
debug_warn!(%user_id, %room_id, "received read receipt EDU for user not in room");