macltok

public

Star0

Fork 0

Watch0

139 commits 3 branches 0 tags 0 releases3.0 MiB

Commit `3e5a785a7273`

tarball

atagen <boss@atagen.co>2026-10-28 07:57 UTC

3 files changed+53-13

normalise: read push rules once per room list and power levels once per room

Room::notification_mode and user_defined_notification_mode each build NotificationSettings, which reads the push rules from the store and registers an event handler, so a 492 room list did that 984 times, and can_pin and can_edit_packs read the same power levels twice. The room list is on the path to the first room opening after a reload.

Modified file: src/normalise/image_pack.rs+9 additions−3 deletions@@ -6,6 +6,7 @@ use ruma::{
     events::{
         GlobalAccountDataEventType, StateEventType,
         image_pack::{PackImage as SourceImage, PackInfo, PackUsage as SourceUsage},
+        room::power_levels::RoomPowerLevels,
     },
     serde::{JsonObject, Raw},
 };
@@ -54,9 +55,14 @@ type EnabledRooms = BTreeMap<OwnedRoomId, BTreeMap<String, Raw<JsonObject>>>;
 
 pub(crate) async fn can_edit_packs(room: &Room) -> bool {
     room.state() == RoomState::Joined
-        && room.power_levels().await.is_ok_and(|levels| {
-            levels.user_can_send_state(room.own_user_id(), StateEventType::from(ROOM_PACKS))
-        })
+        && room
+            .power_levels()
+            .await
+            .is_ok_and(|levels| can_edit_packs_with(room, &levels))
+}
+
+pub(crate) fn can_edit_packs_with(room: &Room, levels: &RoomPowerLevels) -> bool {
+    levels.user_can_send_state(room.own_user_id(), StateEventType::from(ROOM_PACKS))
 }
 
 /// what an id from `ImagePack::id` points at. room ids hold colons, so it's matched

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

@@ -10,7 +10,7 @@ mod timeline;

1010

1111 pub(crate) use context::{apply_profiles, normalise_context, resolve_replies};

1212 pub(crate) use image_pack::{

13- ENABLED_ROOMS, ROOM_PACKS, USER_PACK, can_edit_packs, effective_usage, image_packs,

13+ ENABLED_ROOMS, ROOM_PACKS, USER_PACK, can_edit_packs_with, effective_usage, image_packs,

1414 resolve_pack_id, stored_pack,

1515 };

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

Modified file: src/normalise/room.rs+43 additions−9 deletions@@ -3,6 +3,7 @@ use matrix_sdk::{
     Client, Room, RoomState,
     deserialized_responses::SyncOrStrippedState,
     latest_events::LatestEventValue,
+    notification_settings::{IsEncrypted, IsOneToOne, NotificationSettings},
     ruma::events::{
         AnyMessageLikeEventContent, AnySyncMessageLikeEvent, AnySyncTimelineEvent, StateEventType,
         SyncStateEvent,
@@ -23,8 +24,10 @@ use crate::{
 };
 
 pub(crate) async fn room_summaries(client: &Client, spaces: &SpaceService) -> Vec<RoomSummary> {
+    let settings = client.notification_settings().await;
+    let settings = &settings;
     let mut summaries = stream::iter(client.rooms())
-        .map(|room| async move { room_summary(&room, spaces).await })
+        .map(|room| async move { room_summary(&room, spaces, settings).await })
         .buffer_unordered(16)
         .collect::<Vec<_>>()
         .await;
@@ -38,16 +41,46 @@ pub(crate) async fn room_summaries(client: &Client, spaces: &SpaceService) -> Ve
     summaries
 }
 
-async fn room_summary(room: &Room, spaces: &SpaceService) -> RoomSummary {
+async fn room_summary(
+    room: &Room,
+    spaces: &SpaceService,
+    settings: &NotificationSettings,
+) -> RoomSummary {
     let name = room
         .display_name()
         .await
         .map(|name| name.to_string())
         .unwrap_or_else(|_| room.room_id().to_string());
-    let custom_notification_mode = room.user_defined_notification_mode().await;
+    let joined = room.state() == RoomState::Joined;
+    let custom_notification_mode = if joined {
+        settings
+            .get_user_defined_room_notification_mode(room.room_id())
+            .await
+    } else {
+        None
+    };
+    if let Some(mode) = custom_notification_mode {
+        room.update_cached_user_defined_notification_mode(mode);
+    }
     let effective_notification_mode = match custom_notification_mode {
         Some(mode) => Some(mode),
-        None => room.notification_mode().await,
+        None if joined => match room.latest_encryption_state().await {
+            Ok(state) => Some(
+                settings
+                    .get_default_room_notification_mode(
+                        IsEncrypted::from(state.is_encrypted()),
+                        IsOneToOne::from(room.active_members_count() == 2),
+                    )
+                    .await,
+            ),
+            Err(_) => None,
+        },
+        None => None,
+    };
+    let power_levels = if joined {
+        room.power_levels().await.ok()
+    } else {
+        None
     };
     let inviter = match room.state() {
         RoomState::Invited => room
@@ -114,12 +147,13 @@ async fn room_summary(room: &Room, spaces: &SpaceService) -> RoomSummary {
         } else {
             None
         },
-        can_edit_packs: super::can_edit_packs(room).await,
+        can_edit_packs: power_levels
+            .as_ref()
+            .is_some_and(|levels| super::can_edit_packs_with(room, levels)),
         pinned_events: room.pinned_event_ids().unwrap_or_default(),
-        can_pin: room.state() == RoomState::Joined
-            && room.power_levels().await.is_ok_and(|levels| {
-                levels.user_can_send_state(room.own_user_id(), StateEventType::RoomPinnedEvents)
-            }),
+        can_pin: power_levels.as_ref().is_some_and(|levels| {
+            levels.user_can_send_state(room.own_user_id(), StateEventType::RoomPinnedEvents)
+        }),
     }
 }

macltok

Commit 3e5a785a7273

Commit `3e5a785a7273`