refactor(base): Don't take room ID in Notification::push_notification_from_event_if

It is already in the `PushConditionRoomCtx`, so we don't need an extra
argument for it.

Signed-off-by: Kévin Commaille <[email protected]>

Author: zecakeh

crates/matrix-sdk-base/src/response_processors/notification.rs

@@ -15,7 +15,7 @@
 use std::collections::BTreeMap;
 
 use ruma::{
-    OwnedRoomId, RoomId,
+    OwnedRoomId,
     push::{Action, PushConditionRoomCtx, Ruleset},
     serde::Raw,
 };
@@ -43,14 +43,11 @@ impl<'a> Notification<'a> {
 
     fn push_notification(
         &mut self,
-        room_id: &RoomId,
+        room_id: OwnedRoomId,
         actions: Vec<Action>,
         event: RawAnySyncOrStrippedTimelineEvent,
     ) {
-        self.notifications
-            .entry(room_id.to_owned())
-            .or_default()
-            .push(sync::Notification { actions, event });
+        self.notifications.entry(room_id).or_default().push(sync::Notification { actions, event });
     }
 
     /// Push a new [`sync::Notification`] in [`Self::notifications`] from
@@ -61,7 +58,6 @@ impl<'a> Notification<'a> {
     /// This method returns the fetched [`Action`]s.
     pub async fn push_notification_from_event_if<E, P>(
         &mut self,
-        room_id: &RoomId,
         push_condition_room_ctx: &PushConditionRoomCtx,
         event: &Raw<E>,
         predicate: P,
@@ -73,7 +69,11 @@ impl<'a> Notification<'a> {
         let actions = self.push_rules.get_actions(event, push_condition_room_ctx).await;
 
         if actions.iter().any(predicate) {
-            self.push_notification(room_id, actions.to_owned(), event.clone().into());
+            self.push_notification(
+                push_condition_room_ctx.room_id.clone(),
+                actions.to_owned(),
+                event.clone().into(),
+            );
         }
 
         actions

crates/matrix-sdk-base/src/response_processors/state_events.rs

@@ -277,13 +277,10 @@ pub mod stripped {
         if let Some(push_condition_room_ctx) =
             timeline::get_push_room_context(context, room, room_info).await?
         {
-            let room_id = room.room_id();
-
             // Check every event again for notification.
             for event in state_events.values().flat_map(|map| map.values()) {
                 notification
                     .push_notification_from_event_if(
-                        room_id,
                         &push_condition_room_ctx,
                         event,
                         Action::should_notify,

crates/matrix-sdk-base/src/response_processors/timeline.rs

@@ -131,7 +131,6 @@ pub async fn build<'notification, 'e2ee>(
                 if let Some(push_condition_room_ctx) = &push_condition_room_ctx {
                     let actions = notification
                         .push_notification_from_event_if(
-                            room_id,
                             push_condition_room_ctx,
                             timeline_event.raw(),
                             Action::should_notify,