From 63ca064f932450e75ed415ea4473c834644151f5 Mon Sep 17 00:00:00 2001 From: Benjamin Bouvier Date: Thu, 29 Aug 2024 16:42:05 +0200 Subject: [PATCH] timeline: remove `Inner` in `TimelineInnerMetadata` --- .../src/timeline/day_dividers.rs | 22 +++++++++---------- .../src/timeline/event_handler.rs | 4 ++-- .../matrix-sdk-ui/src/timeline/inner/mod.rs | 4 ++-- .../matrix-sdk-ui/src/timeline/inner/state.rs | 16 +++++++------- .../src/timeline/read_receipts.rs | 6 ++--- crates/matrix-sdk-ui/src/timeline/util.rs | 4 ++-- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/crates/matrix-sdk-ui/src/timeline/day_dividers.rs b/crates/matrix-sdk-ui/src/timeline/day_dividers.rs index f8e1e7485..acd804dec 100644 --- a/crates/matrix-sdk-ui/src/timeline/day_dividers.rs +++ b/crates/matrix-sdk-ui/src/timeline/day_dividers.rs @@ -22,7 +22,7 @@ use ruma::MilliSecondsSinceUnixEpoch; use tracing::{error, event_enabled, instrument, trace, warn, Level}; use super::{ - inner::TimelineInnerMetadata, util::timestamp_to_date, TimelineItem, TimelineItemKind, + inner::TimelineMetadata, util::timestamp_to_date, TimelineItem, TimelineItemKind, VirtualTimelineItem, }; @@ -84,7 +84,7 @@ impl DayDividerAdjuster { pub fn run( &mut self, items: &mut ObservableVectorTransaction<'_, Arc>, - meta: &mut TimelineInnerMetadata, + meta: &mut TimelineMetadata, ) { // We're going to record vector operations like inserting, replacing and // removing day dividers. Since we may remove or insert new items, @@ -287,7 +287,7 @@ impl DayDividerAdjuster { fn process_ops( &self, items: &mut ObservableVectorTransaction<'_, Arc>, - meta: &mut TimelineInnerMetadata, + meta: &mut TimelineMetadata, ) { // Record the deletion offset. let mut offset = 0i64; @@ -614,7 +614,7 @@ mod tests { use super::DayDividerAdjuster; use crate::timeline::{ event_item::{EventTimelineItemKind, RemoteEventTimelineItem}, - inner::TimelineInnerMetadata, + inner::TimelineMetadata, util::timestamp_to_date, EventTimelineItem, TimelineItemContent, VirtualTimelineItem, }; @@ -647,7 +647,7 @@ mod tests { let mut items = ObservableVector::new(); let mut txn = items.transaction(); - let mut meta = TimelineInnerMetadata::new(ruma::RoomVersionId::V11, None, None, false); + let mut meta = TimelineMetadata::new(ruma::RoomVersionId::V11, None, None, false); let timestamp = MilliSecondsSinceUnixEpoch(uint!(42)); let timestamp_next_day = @@ -681,7 +681,7 @@ mod tests { let mut items = ObservableVector::new(); let mut txn = items.transaction(); - let mut meta = TimelineInnerMetadata::new(ruma::RoomVersionId::V11, None, None, false); + let mut meta = TimelineMetadata::new(ruma::RoomVersionId::V11, None, None, false); let timestamp = MilliSecondsSinceUnixEpoch(uint!(42)); let timestamp_next_day = @@ -713,7 +713,7 @@ mod tests { let mut items = ObservableVector::new(); let mut txn = items.transaction(); - let mut meta = TimelineInnerMetadata::new(ruma::RoomVersionId::V11, None, None, false); + let mut meta = TimelineMetadata::new(ruma::RoomVersionId::V11, None, None, false); let timestamp = MilliSecondsSinceUnixEpoch(uint!(42)); let timestamp_next_day = @@ -747,7 +747,7 @@ mod tests { let mut items = ObservableVector::new(); let mut txn = items.transaction(); - let mut meta = TimelineInnerMetadata::new(ruma::RoomVersionId::V11, None, None, false); + let mut meta = TimelineMetadata::new(ruma::RoomVersionId::V11, None, None, false); let timestamp = MilliSecondsSinceUnixEpoch(uint!(42)); let timestamp_next_day = @@ -777,7 +777,7 @@ mod tests { let mut items = ObservableVector::new(); let mut txn = items.transaction(); - let mut meta = TimelineInnerMetadata::new(ruma::RoomVersionId::V11, None, None, false); + let mut meta = TimelineMetadata::new(ruma::RoomVersionId::V11, None, None, false); let timestamp = MilliSecondsSinceUnixEpoch(uint!(42)); @@ -803,7 +803,7 @@ mod tests { let mut items = ObservableVector::new(); let mut txn = items.transaction(); - let mut meta = TimelineInnerMetadata::new(ruma::RoomVersionId::V11, None, None, false); + let mut meta = TimelineMetadata::new(ruma::RoomVersionId::V11, None, None, false); let timestamp = MilliSecondsSinceUnixEpoch(uint!(42)); @@ -827,7 +827,7 @@ mod tests { let mut items = ObservableVector::new(); let mut txn = items.transaction(); - let mut meta = TimelineInnerMetadata::new(ruma::RoomVersionId::V11, None, None, false); + let mut meta = TimelineMetadata::new(ruma::RoomVersionId::V11, None, None, false); let timestamp = MilliSecondsSinceUnixEpoch(uint!(42)); diff --git a/crates/matrix-sdk-ui/src/timeline/event_handler.rs b/crates/matrix-sdk-ui/src/timeline/event_handler.rs index 3d8a3509a..fa3970159 100644 --- a/crates/matrix-sdk-ui/src/timeline/event_handler.rs +++ b/crates/matrix-sdk-ui/src/timeline/event_handler.rs @@ -53,7 +53,7 @@ use super::{ LocalEventTimelineItem, Profile, ReactionsByKeyBySender, RemoteEventOrigin, RemoteEventTimelineItem, TimelineEventItemId, }, - inner::{TimelineInnerMetadata, TimelineInnerStateTransaction}, + inner::{TimelineInnerStateTransaction, TimelineMetadata}, polls::PollState, reactions::FullReactionKey, util::{rfind_event_by_id, rfind_event_item}, @@ -264,7 +264,7 @@ pub(super) struct HandleEventResult { /// updating the reactive Vec). pub(super) struct TimelineEventHandler<'a, 'o> { items: &'a mut ObservableVectorTransaction<'o, Arc>, - meta: &'a mut TimelineInnerMetadata, + meta: &'a mut TimelineMetadata, ctx: TimelineEventContext, result: HandleEventResult, } diff --git a/crates/matrix-sdk-ui/src/timeline/inner/mod.rs b/crates/matrix-sdk-ui/src/timeline/inner/mod.rs index d29345216..536399fea 100644 --- a/crates/matrix-sdk-ui/src/timeline/inner/mod.rs +++ b/crates/matrix-sdk-ui/src/timeline/inner/mod.rs @@ -56,8 +56,8 @@ use tracing::{debug, error, field::debug, info, instrument, trace, warn}; use tracing::{field, info_span, Instrument as _}; pub(super) use self::state::{ - EventMeta, FullEventMeta, TimelineEnd, TimelineInnerMetadata, TimelineInnerState, - TimelineInnerStateTransaction, + EventMeta, FullEventMeta, TimelineEnd, TimelineInnerState, TimelineInnerStateTransaction, + TimelineMetadata, }; #[cfg(feature = "e2e-encryption")] use super::traits::Decryptor; diff --git a/crates/matrix-sdk-ui/src/timeline/inner/state.rs b/crates/matrix-sdk-ui/src/timeline/inner/state.rs index 8380fe282..0ff0741e0 100644 --- a/crates/matrix-sdk-ui/src/timeline/inner/state.rs +++ b/crates/matrix-sdk-ui/src/timeline/inner/state.rs @@ -61,7 +61,7 @@ pub(crate) enum TimelineEnd { #[derive(Debug)] pub(in crate::timeline) struct TimelineInnerState { pub items: ObservableVector>, - pub meta: TimelineInnerMetadata, + pub meta: TimelineMetadata, /// The kind of focus of this timeline. timeline_focus: TimelineFocusKind, @@ -80,7 +80,7 @@ impl TimelineInnerState { // sliding-sync tests with 20 events lag. This should still be // small enough. items: ObservableVector::with_capacity(32), - meta: TimelineInnerMetadata::new( + meta: TimelineMetadata::new( room_version, internal_id_prefix, unable_to_decrypt_hook, @@ -284,10 +284,10 @@ pub(in crate::timeline) struct TimelineInnerStateTransaction<'a> { /// A clone of the previous meta, that we're operating on during the /// transaction, and that will be committed to the previous meta location in /// [`Self::commit`]. - pub meta: TimelineInnerMetadata, + pub meta: TimelineMetadata, /// Pointer to the previous meta, only used during [`Self::commit`]. - previous_meta: &'a mut TimelineInnerMetadata, + previous_meta: &'a mut TimelineMetadata, /// The kind of focus of this timeline. timeline_focus: TimelineFocusKind, @@ -589,7 +589,7 @@ impl TimelineInnerStateTransaction<'_> { items.commit(); } - /// Add or update an event in the [`TimelineInnerMeta::all_events`] + /// Add or update an event in the [`TimelineMetadata::all_events`] /// collection. /// /// This method also adjusts read receipt if needed. @@ -604,7 +604,7 @@ impl TimelineInnerStateTransaction<'_> { room_data_provider: &P, settings: &TimelineInnerSettings, ) -> bool { - // Detect if an event already exists in [`TimelineInnerMeta::all_events`]. + // Detect if an event already exists in [`TimelineMetadata::all_events`]. // // Returns its position, in this case. fn event_already_exists( @@ -671,7 +671,7 @@ impl TimelineInnerStateTransaction<'_> { } #[derive(Clone, Debug)] -pub(in crate::timeline) struct TimelineInnerMetadata { +pub(in crate::timeline) struct TimelineMetadata { // **** CONSTANT FIELDS **** /// An optional prefix for internal IDs, defined during construction of the /// timeline. @@ -715,7 +715,7 @@ pub(in crate::timeline) struct TimelineInnerMetadata { pub read_receipts: ReadReceipts, } -impl TimelineInnerMetadata { +impl TimelineMetadata { pub(crate) fn new( room_version: RoomVersionId, internal_id_prefix: Option, diff --git a/crates/matrix-sdk-ui/src/timeline/read_receipts.rs b/crates/matrix-sdk-ui/src/timeline/read_receipts.rs index f95013b05..6c9a2c01e 100644 --- a/crates/matrix-sdk-ui/src/timeline/read_receipts.rs +++ b/crates/matrix-sdk-ui/src/timeline/read_receipts.rs @@ -28,8 +28,8 @@ use tracing::{debug, error, warn}; use super::{ inner::{ - EventMeta, FullEventMeta, TimelineInnerMetadata, TimelineInnerState, - TimelineInnerStateTransaction, + EventMeta, FullEventMeta, TimelineInnerState, TimelineInnerStateTransaction, + TimelineMetadata, }, traits::RoomDataProvider, util::{rfind_event_by_id, RelativePosition}, @@ -577,7 +577,7 @@ impl TimelineInnerState { } } -impl TimelineInnerMetadata { +impl TimelineMetadata { /// Get the latest receipt of the given type for the given user in the /// timeline. /// diff --git a/crates/matrix-sdk-ui/src/timeline/util.rs b/crates/matrix-sdk-ui/src/timeline/util.rs index af9e316cb..37b3a50c4 100644 --- a/crates/matrix-sdk-ui/src/timeline/util.rs +++ b/crates/matrix-sdk-ui/src/timeline/util.rs @@ -19,14 +19,14 @@ use imbl::Vector; use ruma::{EventId, MilliSecondsSinceUnixEpoch}; #[cfg(doc)] -use super::inner::TimelineInnerMetadata; +use super::inner::TimelineMetadata; use super::{ event_item::EventTimelineItemKind, EventTimelineItem, ReactionsByKeyBySender, TimelineItem, }; pub(super) struct EventTimelineItemWithId<'a> { pub inner: &'a EventTimelineItem, - /// Internal identifier generated by [`TimelineInnerMetadata`]. + /// Internal identifier generated by [`TimelineMetadata`]. pub internal_id: &'a str, }