chore(ui): move timeline/read_receipts to timeline/controller/read_re…

…ceipts Read receipts only make sense in the context of the timeline controller.
matrix-org · Jan 9, 2025 · f853e75 · f853e75
1 parent 7dcdc92
commit f853e75
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/crates/matrix-sdk-ui/src/timeline/controller/mod.rs b/crates/matrix-sdk-ui/src/timeline/controller/mod.rs
@@ -86,6 +86,7 @@ use crate::{
 };
 
 mod observable_items;
+mod read_receipts;
 mod state;
 
 /// Data associated to the current timeline focus.

diff --git a/...trix-sdk-ui/src/timeline/read_receipts.rs → .../src/timeline/controller/read_receipts.rs b/...trix-sdk-ui/src/timeline/read_receipts.rs → .../src/timeline/controller/read_receipts.rs
@@ -25,14 +25,10 @@ use tokio_stream::wrappers::WatchStream;
 use tracing::{debug, error, warn};
 
 use super::{
-    controller::{
-        AllRemoteEvents, FullEventMeta, ObservableItemsTransaction, TimelineMetadata,
-        TimelineState, TimelineStateTransaction,
-    },
-    traits::RoomDataProvider,
-    util::{rfind_event_by_id, RelativePosition},
-    TimelineItem,
+    rfind_event_by_id, AllRemoteEvents, FullEventMeta, ObservableItemsTransaction,
+    RoomDataProvider, TimelineMetadata, TimelineState,
 };
+use crate::timeline::{controller::TimelineStateTransaction, util::RelativePosition, TimelineItem};
 
 /// In-memory caches for read receipts.
 #[derive(Clone, Debug, Default)]

diff --git a/crates/matrix-sdk-ui/src/timeline/controller/state.rs b/crates/matrix-sdk-ui/src/timeline/controller/state.rs
@@ -49,6 +49,7 @@ use super::{
         AllRemoteEvents, ObservableItems, ObservableItemsTransaction,
         ObservableItemsTransactionEntry,
     },
+    read_receipts::ReadReceipts,
     DateDividerMode, HandleManyEventsResult, TimelineFocusKind, TimelineSettings,
 };
 use crate::{
@@ -62,7 +63,6 @@ use crate::{
         event_item::{PollState, RemoteEventOrigin, ResponseData},
         item::TimelineUniqueId,
         reactions::Reactions,
-        read_receipts::ReadReceipts,
         traits::RoomDataProvider,
         util::{rfind_event_by_id, RelativePosition},
         Profile, TimelineItem, TimelineItemKind,
@@ -1058,7 +1058,7 @@ pub(in crate::timeline) struct TimelineMetadata {
     /// Read receipts related state.
     ///
     /// TODO: move this over to the event cache (see also #3058).
-    pub read_receipts: ReadReceipts,
+    pub(in crate::timeline::controller) read_receipts: ReadReceipts,
 }
 
 /// Maximum number of stash pending edits.

diff --git a/crates/matrix-sdk-ui/src/timeline/mod.rs b/crates/matrix-sdk-ui/src/timeline/mod.rs
@@ -69,7 +69,6 @@ mod item;
 mod pagination;
 mod pinned_events_loader;
 mod reactions;
-mod read_receipts;
 #[cfg(test)]
 mod tests;
 mod to_device;