chore(ui): move RelativePosition in timeline/controller

matrix-org · Jan 9, 2025 · 17c6bb2 · 17c6bb2
1 parent f853e75
commit 17c6bb2
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/crates/matrix-sdk-ui/src/timeline/controller/mod.rs b/crates/matrix-sdk-ui/src/timeline/controller/mod.rs
@@ -68,7 +68,7 @@ use super::{
     event_item::{ReactionStatus, RemoteEventOrigin},
     item::TimelineUniqueId,
     traits::{Decryptor, RoomDataProvider},
-    util::{rfind_event_by_id, rfind_event_item, RelativePosition},
+    util::{rfind_event_by_id, rfind_event_item},
     DateDividerMode, Error, EventSendState, EventTimelineItem, InReplyToDetails, Message,
     PaginationError, Profile, ReactionInfo, RepliedToEvent, TimelineDetails, TimelineEventItemId,
     TimelineFocus, TimelineItem, TimelineItemContent, TimelineItemKind,
@@ -1649,3 +1649,14 @@ async fn fetch_replied_to_event(
     };
     Ok(res)
 }
+
+/// Result of comparing events position in the timeline.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub(in crate::timeline) enum RelativePosition {
+    /// Event B is after (more recent than) event A.
+    After,
+    /// They are the same event.
+    Same,
+    /// Event B is before (older than) event A.
+    Before,
+}
diff --git a/crates/matrix-sdk-ui/src/timeline/controller/read_receipts.rs b/crates/matrix-sdk-ui/src/timeline/controller/read_receipts.rs
@@ -26,9 +26,9 @@ use tracing::{debug, error, warn};
 
 use super::{
     rfind_event_by_id, AllRemoteEvents, FullEventMeta, ObservableItemsTransaction,
-    RoomDataProvider, TimelineMetadata, TimelineState,
+    RelativePosition, RoomDataProvider, TimelineMetadata, TimelineState,
 };
-use crate::timeline::{controller::TimelineStateTransaction, util::RelativePosition, TimelineItem};
+use crate::timeline::{controller::TimelineStateTransaction, 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
@@ -50,7 +50,7 @@ use super::{
         ObservableItemsTransactionEntry,
     },
     read_receipts::ReadReceipts,
-    DateDividerMode, HandleManyEventsResult, TimelineFocusKind, TimelineSettings,
+    DateDividerMode, HandleManyEventsResult, RelativePosition, TimelineFocusKind, TimelineSettings,
 };
 use crate::{
     events::SyncTimelineEventWithoutContent,
@@ -64,7 +64,7 @@ use crate::{
         item::TimelineUniqueId,
         reactions::Reactions,
         traits::RoomDataProvider,
-        util::{rfind_event_by_id, RelativePosition},
+        util::rfind_event_by_id,
         Profile, TimelineItem, TimelineItemKind,
     },
     unable_to_decrypt_hook::UtdHookManager,
@@ -1110,7 +1110,7 @@ impl TimelineMetadata {
     /// known.
     ///
     /// Returns `None` if none of the two events could be found in the timeline.
-    pub fn compare_events_positions(
+    pub(in crate::timeline) fn compare_events_positions(
         &self,
         event_a: &EventId,
         event_b: &EventId,

diff --git a/crates/matrix-sdk-ui/src/timeline/util.rs b/crates/matrix-sdk-ui/src/timeline/util.rs
@@ -112,14 +112,3 @@ pub(super) fn rfind_event_by_item_id<'a>(
         TimelineEventItemId::EventId(event_id) => rfind_event_by_id(items, event_id),
     }
 }
-
-/// Result of comparing events position in the timeline.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub(super) enum RelativePosition {
-    /// Event B is after (more recent than) event A.
-    After,
-    /// They are the same event.
-    Same,
-    /// Event B is before (older than) event A.
-    Before,
-}