macltok

public

Star0

Fork 0

Watch0

122 commits 3 branches 0 tags 0 releases3.0 MiB

Commit `8127bd8b03da`

tarball

atagen <boss@atagen.co>2026-10-27 04:01 UTC

4 files changed+25-31

mentions: keep the profile pass off the network

A device build stopped updating every room after 3eee54c8. Its pass went through get_member, which fetches /members for any room whose members aren't synced, and walked room after room. profiles() also forced a refetch with mark_members_missing. Each fetched roster is saved in competition with sync processing. The pass now reads only the member store, and the mark_members_missing workaround is gone.

Modified file: src/engine/context.rs+9 additions−27 deletions@@ -552,40 +552,22 @@ async fn fetch_reply(
 
 /// under lazy-loaded members a sender may be unknown locally, and `get_member` fetches the
 /// member list once for the room when it is
-pub(crate) async fn profiles<'a>(
+async fn profiles<'a>(
     room: &Room,
     user_ids: impl Iterator<Item = &'a OwnedUserId>,
 ) -> HashMap<OwnedUserId, Sender> {
     let mut unique: Vec<&OwnedUserId> = user_ids.collect();
     unique.sort();
     unique.dedup();
-    let lookup = |users: Vec<&'a OwnedUserId>| {
-        join_all(users.into_iter().map(|user_id| async move {
+    join_all(
+        unique.into_iter().map(|user_id| async move {
             Some((user_id.clone(), member_sender(room, user_id).await?))
-        }))
-    };
-    let mut found: HashMap<_, _> = lookup(unique.clone()).await.into_iter().flatten().collect();
-    let missing: Vec<_> = unique
-        .into_iter()
-        .filter(|user| !found.contains_key(*user))
-        .collect();
-    // stores have been seen with members_synced persisted over a partial roster, after which
-    // the sdk never asks /members again, so a sender it can't find marks it stale once a run
-    if !missing.is_empty() && members_rechecked(room) {
-        room.mark_members_missing();
-        found.extend(lookup(missing).await.into_iter().flatten());
-    }
-    found
-}
-
-fn members_rechecked(room: &Room) -> bool {
-    static CHECKED: std::sync::LazyLock<
-        std::sync::Mutex<std::collections::HashSet<(Option<OwnedUserId>, ruma::OwnedRoomId)>>,
-    > = std::sync::LazyLock::new(Default::default);
-    CHECKED.lock().unwrap().insert((
-        room.client().user_id().map(ToOwned::to_owned),
-        room.room_id().to_owned(),
-    ))
+        }),
+    )
+    .await
+    .into_iter()
+    .flatten()
+    .collect()
 }
 
 fn validate_limit(limit: u16) -> Result<(), Error> {

Modified file: src/mentions/service.rs+14 additions−2 deletions@@ -1442,7 +1442,8 @@ impl Service {
     }
 
     /// rows observed after their window's capture never got a profile, so one room at a time
-    /// looks its bare senders up the way a capture does, outside the actor
+    /// looks its bare senders up in the member store. get_member would fetch /members for every room
+    /// whose members aren't synced, one after another, and that can starve sync
     fn schedule_profiles(&mut self, work: &mut FuturesUnordered<EngineBoxFuture<'static, Work>>) {
         if self.profiling {
             return;
@@ -1502,7 +1503,18 @@ impl Service {
         self.profiling = true;
         let users: Vec<_> = users.into_iter().collect();
         work.push(Box::pin(async move {
-            let found = context::profiles(&room, users.iter()).await;
+            let found = futures_util::future::join_all(users.iter().map(|user_id| {
+                let room = &room;
+                async move {
+                    crate::normalise::stored_member_sender(room, user_id)
+                        .await
+                        .map(|sender| (user_id.clone(), sender))
+                }
+            }))
+            .await
+            .into_iter()
+            .flatten()
+            .collect();
             Work::Profiles(room_id, users, found)
         }));
     }

Modified file: src/normalise/member.rs+1−1

@@ -33,7 +33,7 @@ pub(crate) async fn member_sender(room: &Room, user_id: &OwnedUserId) -> Option<

3333 }

3434

3535 /// what the state store already knows, without asking the server

36-async fn stored_member_sender(room: &Room, user_id: &OwnedUserId) -> Option<Sender> {

36+pub(crate) async fn stored_member_sender(room: &Room, user_id: &OwnedUserId) -> Option<Sender> {

3737 let member = room.get_member_no_sync(user_id).await.ok().flatten()?;

3838 Some(sender(user_id, &member))

3939 }

Modified file: src/normalise/mod.rs+1−1

@@ -15,7 +15,7 @@ pub(crate) use image_pack::{

1515 };

1616 pub(crate) use link_preview::{ROOM_PREVIEW_URLS, server_preview, url_previews_allowed};

1717 pub(crate) use media::{MediaRegistration, MediaScope, MediaSourceInfo};

18-pub(crate) use member::{member_sender, member_summary};

18+pub(crate) use member::{member_sender, member_summary, stored_member_sender};

1919 pub(crate) use observed::{normalise_observed, poll_question};

2020 pub(crate) use room::notification_mode;

2121 pub(crate) use room::{room_summaries, space_child, stored_space_order};

macltok

Commit 8127bd8b03da

Commit `8127bd8b03da`