mirror/matrix-rust-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-rust-sdk.git synced 2025-12-24 00:01:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

refactor(r2d2): Split out the encryption info update method into reusable components

Browse Source
This commit is contained in:
Damir Jelić
2025-12-17 09:34:23 +01:00
parent 4ee6906f47
commit 6c68ca2a64
1 changed files with 35 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
crates/matrix-sdk/src/event_cache/redecryptor.rs
View File

@@ -498,6 +498,40 @@ impl EventCache {
Ok(())
}
/// Attempt to update the encryption info for the given list of events.
async fn update_encryption_info_for_events(
&self,
room: &Room,
events: Vec<EventIdAndEvent>,
) -> Result<(), EventCacheError> {
// Let's attempt to update their encryption info.
let mut updated_events = Vec::with_capacity(events.len());
for (event_id, mut event) in events {
if let Some(session_id) = event.encryption_info.session_id() {
let new_encryption_info =
room.get_encryption_info(session_id, &event.encryption_info.sender).await;
// Only create a replacement if the encryption info actually changed.
if let Some(new_encryption_info) = new_encryption_info
&& event.encryption_info != new_encryption_info
{
event.encryption_info = new_encryption_info;
updated_events.push((event_id, event, None));
}
}
}
let event_ids: BTreeSet<_> =
updated_events.iter().map(|(event_id, _, _)| event_id).collect();
if !event_ids.is_empty() {
trace!(?event_ids, "Replacing the encryption info of some events");
}
self.on_resolved_utds(room.room_id(), updated_events).await
}
#[instrument(skip_all, fields(room_id, session_id))]
async fn update_encryption_info(
&self,
@@ -523,31 +557,7 @@ impl EventCache {
}
// Let's attempt to update their encryption info.
let mut updated_events = Vec::with_capacity(events.len());
for (event_id, mut event) in events {
let new_encryption_info =
room.get_encryption_info(session_id, &event.encryption_info.sender).await;
// Only create a replacement if the encryption info actually changed.
if let Some(new_encryption_info) = new_encryption_info
&& event.encryption_info != new_encryption_info
{
event.encryption_info = new_encryption_info;
updated_events.push((event_id, event, None));
}
}
let event_ids: BTreeSet<_> =
updated_events.iter().map(|(event_id, _, _)| event_id).collect();
if !event_ids.is_empty() {
trace!(?event_ids, "Replacing the encryption info of some events");
}
self.on_resolved_utds(room_id, updated_events).await?;
Ok(())
self.update_encryption_info_for_events(&room, events).await
}
/// Explicitly request the redecryption of a set of events.