feat(base) LatestEventValue::timestamp uses the new TimelineEvent::timestamp method.

This patch updates `LatestEventValue::timestamp` to use
the new `TimelineEvent::timestamp` method in case of a
`LatestEventValue::Remote`.

Author: Hywan

crates/matrix-sdk-base/src/latest_event.rs

@@ -45,26 +45,21 @@ impl LatestEventValue {
     /// Get the timestamp of the [`LatestEventValue`].
     ///
     /// If it's [`None`], it returns `None`. If it's [`Remote`], it returns the
-    /// `origin_server_ts`. If it's [`LocalIsSending`] or [`LocalCannotBeSent`],
-    /// it returns the [`timestamp`] value.
+    /// [`TimelineEvent::timestamp`]. If it's [`LocalIsSending`] or
+    /// [`LocalCannotBeSent`], it returns the
+    /// [`LocalLatestEventValue::timestamp`] value.
     ///
     /// [`None`]: LatestEventValue::None
     /// [`Remote`]: LatestEventValue::Remote
     /// [`LocalIsSending`]: LatestEventValue::LocalIsSending
     /// [`LocalCannotBeSent`]: LatestEventValue::LocalCannotBeSent
-    /// [`timestamp`]: LocalLatestEventValue::timestamp
-    pub fn timestamp(&self) -> Option<u64> {
+    pub fn timestamp(&self) -> Option<MilliSecondsSinceUnixEpoch> {
         match self {
             Self::None => None,
-            Self::Remote(remote_latest_event_value) => remote_latest_event_value
-                .kind
-                .raw()
-                .get_field::<u64>("origin_server_ts")
-                .ok()
-                .flatten(),
+            Self::Remote(remote_latest_event_value) => remote_latest_event_value.timestamp(),
             Self::LocalIsSending(LocalLatestEventValue { timestamp, .. })
             | Self::LocalCannotBeSent(LocalLatestEventValue { timestamp, .. }) => {
-                Some(timestamp.get().into())
+                Some(timestamp.clone())
             }
         }
     }
@@ -121,7 +116,7 @@ mod tests_latest_event_value {
             .unwrap(),
         ));
 
-        assert_eq!(value.timestamp(), Some(42));
+        assert_eq!(value.timestamp(), Some(MilliSecondsSinceUnixEpoch(uint!(42))));
     }
 
     #[test]
@@ -137,7 +132,7 @@ mod tests_latest_event_value {
             ),
         });
 
-        assert_eq!(value.timestamp(), Some(42));
+        assert_eq!(value.timestamp(), Some(MilliSecondsSinceUnixEpoch(uint!(42))));
     }
 
     #[test]
@@ -153,7 +148,7 @@ mod tests_latest_event_value {
             ),
         });
 
-        assert_eq!(value.timestamp(), Some(42));
+        assert_eq!(value.timestamp(), Some(MilliSecondsSinceUnixEpoch(uint!(42))));
     }
 }
 

crates/matrix-sdk-ui/src/room_list_service/sorters/recency.rs

@@ -99,7 +99,10 @@ fn extract_rank(left: &Room, right: &Room) -> (Option<Rank>, Option<Rank>) {
             right @ LatestEventValue::Remote(_)
             | right @ LatestEventValue::LocalIsSending(_)
             | right @ LatestEventValue::LocalCannotBeSent(_),
-        ) => (left.timestamp(), right.timestamp()),
+        ) => (
+            left.timestamp().map(|ms| ms.get().into()),
+            right.timestamp().map(|ms| ms.get().into()),
+        ),
     }
 }