mirror/matrix-rust-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-rust-sdk.git synced 2026-04-22 16:17:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore(sdk): Move handle_joined_room_update from RoomEventCacheInner to RoomEventCache.

Browse Source 
The idea of this patch is to make `RoomEventCache::inner` private. This
is required to achieve that goal.
This commit is contained in:
Ivan Enderlin
2026-02-26 15:14:25 +01:00
parent 1342daf381
commit d291be4235
2 changed files with 14 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
crates/matrix-sdk/src/event_cache/caches/room/mod.rs
View File

@@ -273,11 +273,20 @@ impl RoomEventCache {
Ok(())
}
/// Handle a [`JoinedRoomUpdate`].
#[instrument(skip_all, fields(room_id = %self.room_id()))]
pub(in super::super) async fn handle_left_room_update(
&self,
updates: LeftRoomUpdate,
) -> Result<()> {
pub async fn handle_joined_room_update(&self, updates: JoinedRoomUpdate) -> Result<()> {
self.inner
.handle_timeline(updates.timeline, updates.ephemeral.clone(), updates.ambiguity_changes)
.await?;
self.inner.handle_account_data(updates.account_data);
Ok(())
}
/// Handle a [`LeftRoomUpdate`].
#[instrument(skip_all, fields(room_id = %self.room_id()))]
pub async fn handle_left_room_update(&self, updates: LeftRoomUpdate) -> Result<()> {
self.inner.handle_timeline(updates.timeline, Vec::new(), updates.ambiguity_changes).await?;
Ok(())
@@ -421,22 +430,6 @@ impl RoomEventCacheInner {
}
}
#[instrument(skip_all, fields(room_id = %self.room_id))]
pub(in super::super) async fn handle_joined_room_update(
&self,
updates: JoinedRoomUpdate,
) -> Result<()> {
self.handle_timeline(
updates.timeline,
updates.ephemeral.clone(),
updates.ambiguity_changes,
)
.await?;
self.handle_account_data(updates.account_data);
Ok(())
}
/// Handle a [`Timeline`], i.e. new events received by a sync for this
/// room.
async fn handle_timeline(
@@ -853,7 +846,6 @@ mod timed_tests {
};
room_event_cache
.inner
.handle_joined_room_update(JoinedRoomUpdate { timeline, ..Default::default() })
.await
.unwrap();
@@ -933,7 +925,6 @@ mod timed_tests {
let timeline = Timeline { limited: false, prev_batch: None, events: vec![ev] };
room_event_cache
.inner
.handle_joined_room_update(JoinedRoomUpdate { timeline, ..Default::default() })
.await
.unwrap();
@@ -1275,7 +1266,6 @@ mod timed_tests {
let timeline = Timeline { limited: false, prev_batch: None, events: vec![ev2] };
room_event_cache
.inner
.handle_joined_room_update(JoinedRoomUpdate { timeline, ..Default::default() })
.await
.unwrap();
@@ -1382,7 +1372,6 @@ mod timed_tests {
// Propagate an update including a limited timeline with one message and a
// prev-batch token.
room_event_cache
.inner
.handle_joined_room_update(JoinedRoomUpdate {
timeline: Timeline {
limited: true,
@@ -1444,7 +1433,6 @@ mod timed_tests {
// Now, propagate an update for another message, but the timeline isn't limited
// this time.
room_event_cache
.inner
.handle_joined_room_update(JoinedRoomUpdate {
timeline: Timeline {
limited: false,
@@ -1728,7 +1716,6 @@ mod timed_tests {
// events.
let evid4 = event_id!("$4");
room_event_cache
.inner
.handle_joined_room_update(JoinedRoomUpdate {
timeline: Timeline {
limited: true,

3
crates/matrix-sdk/src/event_cache/mod.rs
View File

@@ -1068,7 +1068,7 @@ impl EventCacheInner {
continue;
};
if let Err(err) = room.inner.handle_joined_room_update(joined_room_update).await {
if let Err(err) = room.handle_joined_room_update(joined_room_update).await {
// Non-fatal error, try to continue to the next room.
error!(%room_id, "handling joined room update: {err}");
}
@@ -1332,7 +1332,6 @@ mod tests {
let account_data = vec![read_marker_event; 100];
room_event_cache
.inner
.handle_joined_room_update(JoinedRoomUpdate { account_data, ..Default::default() })
.await
.unwrap();