macltok

public

Star0

Fork 0

Watch0

44 commits 3 branches 0 tags 0 releases3.0 MiB

Commit `121a56ce119d`

tarball

atagen <boss@atagen.co>2026-10-24 06:43 UTC

1 file changed+46-19

transport: refetch each room's roster once per engine and add refresh_members

A store was seen with RoomInfo::members_synced persisted over a partial roster, and Room::members never requests /members again once the flag is set, so the member list stayed short until a fresh login. The first ClientHandle::members call per room now marks members missing, which costs one deduplicated /members per room per session. refresh_members forces the refetch on demand.

Modified file: src/transport.rs+46 additions−19 deletions@@ -1,8 +1,9 @@
 use std::{
+    collections::HashSet,
     fmt,
     future::Future,
     pin::Pin,
-    sync::Arc,
+    sync::{Arc, Mutex},
     task::{Context, Poll},
 };
 
@@ -49,6 +50,7 @@ pub struct ClientHandle {
     sync_service: Arc<SyncService>,
     media: Arc<MediaService>,
     spaces: Arc<OnceCell<SpaceService>>,
+    members_checked: Arc<Mutex<HashSet<OwnedRoomId>>>,
     _store_lock: Option<Arc<StoreLock>>,
 }
 
@@ -751,24 +753,25 @@ impl ClientHandle {
         room_id: &RoomId,
         filter: MemberFilter,
     ) -> Result<Vec<MemberSummary>, Error> {
-        let memberships = match filter {
-            MemberFilter::Active => RoomMemberships::ACTIVE,
-            MemberFilter::Joined => RoomMemberships::JOIN,
-            MemberFilter::Invited => RoomMemberships::INVITE,
-            MemberFilter::Banned => RoomMemberships::BAN,
-            MemberFilter::Left => RoomMemberships::LEAVE,
-            // An empty mask is the SDK's unfiltered wildcard: it matches every
-            // membership, including custom states that `all()` would exclude.
-            MemberFilter::All => RoomMemberships::empty(),
-        };
-        Ok(self
-            .room(room_id)?
-            .members(memberships)
-            .await
-            .map_err(|source| Error::from_sdk("listing members failed", source))?
-            .into_iter()
-            .map(member_summary)
-            .collect())
+        let room = self.room(room_id)?;
+        // stores have been seen with members_synced persisted over a partial
+        // roster, and the sdk never asks /members again once it's set
+        if self.members_checked.lock().unwrap().insert(room_id.to_owned()) {
+            room.mark_members_missing();
+        }
+        list_members(&room, filter).await
+    }
+
+    /// drop the cached roster for a room and fetch /members again
+    pub async fn refresh_members(
+        &self,
+        room_id: &RoomId,
+        filter: MemberFilter,
+    ) -> Result<Vec<MemberSummary>, Error> {
+        let room = self.room(room_id)?;
+        room.mark_members_missing();
+        self.members_checked.lock().unwrap().insert(room_id.to_owned());
+        list_members(&room, filter).await
     }
 
     pub async fn room_power_levels(&self, room_id: &RoomId) -> Result<RoomPowerLevels, Error> {
@@ -1060,6 +1063,7 @@ pub(crate) fn transport_pair(
             sync_service,
             media,
             spaces: Arc::new(OnceCell::new()),
+            members_checked: Arc::default(),
             _store_lock: store_lock,
         },
         DriverPort {
@@ -1071,6 +1075,29 @@ pub(crate) fn transport_pair(
     )
 }
 
+async fn list_members(
+    room: &matrix_sdk::Room,
+    filter: MemberFilter,
+) -> Result<Vec<MemberSummary>, Error> {
+    let memberships = match filter {
+        MemberFilter::Active => RoomMemberships::ACTIVE,
+        MemberFilter::Joined => RoomMemberships::JOIN,
+        MemberFilter::Invited => RoomMemberships::INVITE,
+        MemberFilter::Banned => RoomMemberships::BAN,
+        MemberFilter::Left => RoomMemberships::LEAVE,
+        // An empty mask is the SDK's unfiltered wildcard: it matches every
+        // membership, including custom states that `all()` would exclude.
+        MemberFilter::All => RoomMemberships::empty(),
+    };
+    Ok(room
+        .members(memberships)
+        .await
+        .map_err(|source| Error::from_sdk("listing members failed", source))?
+        .into_iter()
+        .map(member_summary)
+        .collect())
+}
+
 fn normalise_push_notification(
     room_id: &RoomId,
     event_id: &EventId,

macltok

Commit 121a56ce119d

Commit `121a56ce119d`