fixup! feat(event cache): automatically subscribe to threads according to msc4306 semantics

Author: bnjbvr

crates/matrix-sdk/src/event_cache/room/mod.rs

@@ -1536,7 +1536,7 @@ mod private {
                 if let Some(subscribe_to_event_id) =
                     should_subscribe_thread(&push_context, new_events.iter()).await
                 {
-                    thread_subscriptions.0.insert(thread_root.clone(), subscribe_to_event_id);
+                    thread_subscriptions.insert(thread_root.clone(), subscribe_to_event_id);
                 }
 
                 // If we're not in sync mode, we're receiving events from a room pagination: as

crates/matrix-sdk/src/event_cache/room/threads.rs

@@ -275,8 +275,7 @@ impl ThreadEventCache {
             subscribe_to_event_id = Some((self.thread_root.clone(), subscribed_to_event_id));
         }
 
-        let thread_subscriptions =
-            AutomaticThreadSubscriptions(BTreeMap::from_iter(subscribe_to_event_id));
+        let thread_subscriptions = AutomaticThreadSubscriptions::from_iter(subscribe_to_event_id);
 
         Some((BackPaginationOutcome { reached_start, events }, thread_subscriptions))
     }
@@ -292,8 +291,7 @@ impl ThreadEventCache {
 ///
 /// Note: it's not necessarily the latest event in the thread, but the latest in
 /// the thread that matches a push condition rule.
-#[derive(Debug, Default)]
-pub struct AutomaticThreadSubscriptions(pub BTreeMap<OwnedEventId, OwnedEventId>);
+pub type AutomaticThreadSubscriptions = BTreeMap<OwnedEventId, OwnedEventId>;
 
 /// A thin wrapper over a specialized [`PushContext`] that is used for computing
 /// the threads subscriptions automatically.
@@ -362,11 +360,11 @@ pub async fn should_subscribe_thread(
 pub async fn subscribe_to_new_threads(room: &Room, new_thread_subs: AutomaticThreadSubscriptions) {
     // If there's no subscriptions, or the client hasn't enabled thread
     // subscriptions, we don't have anything to do.
-    if new_thread_subs.0.is_empty() || !room.client.enabled_thread_subscriptions() {
+    if new_thread_subs.is_empty() || !room.client.enabled_thread_subscriptions() {
         return;
     }
 
-    for (thread_root, subscribe_up_to_event_id) in new_thread_subs.0 {
+    for (thread_root, subscribe_up_to_event_id) in new_thread_subs {
         let previous_status = match room.load_or_fetch_thread_subscription(&thread_root).await {
             Ok(status) => status,
             Err(err) => {

crates/matrix-sdk/src/room/mod.rs

@@ -3071,6 +3071,7 @@ impl Room {
     /// Retrieves a [`PushContext`] that can be used to compute the push actions
     /// for events, with a choice to include thread subscriptions or not,
     /// based on the extra `with_threads_subscriptions` parameter.
+    #[instrument(skip(self))]
     pub(crate) async fn push_context_internal(
         &self,
         with_threads_subscriptions: bool,