From 59edc22a35c4ef162ea0a8cafccdf25e37ab1070 Mon Sep 17 00:00:00 2001
From: Jonas Platte <jplatte@matrix.org>
Date: Mon, 13 Mar 2023 14:22:07 +0100
Subject: [PATCH] Use Action covenience methods

Now Action::Coalesce will also generate a notification.
---
 crates/matrix-sdk-base/src/client.rs         | 2 +-
 crates/matrix-sdk/src/room/timeline/inner.rs | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/crates/matrix-sdk-base/src/client.rs b/crates/matrix-sdk-base/src/client.rs
index 3d1be6b74..8be3af224 100644
--- a/crates/matrix-sdk-base/src/client.rs
+++ b/crates/matrix-sdk-base/src/client.rs
@@ -411,7 +411,7 @@ impl BaseClient {
                     if let Some(context) = &push_context {
                         let actions = push_rules.get_actions(&event.event, context);
 
-                        if actions.iter().any(|a| matches!(a, Action::Notify)) {
+                        if actions.iter().any(Action::should_notify) {
                             changes.add_notification(
                                 room_id,
                                 Notification::new(
diff --git a/crates/matrix-sdk/src/room/timeline/inner.rs b/crates/matrix-sdk/src/room/timeline/inner.rs
index 4daccfd21..2c961b333 100644
--- a/crates/matrix-sdk/src/room/timeline/inner.rs
+++ b/crates/matrix-sdk/src/room/timeline/inner.rs
@@ -35,7 +35,7 @@ use ruma::{
         relation::Annotation,
         AnyMessageLikeEventContent, AnySyncTimelineEvent,
     },
-    push::{Action, Tweak},
+    push::Action,
     serde::Raw,
     EventId, MilliSecondsSinceUnixEpoch, OwnedEventId, OwnedTransactionId, OwnedUserId,
     TransactionId, UserId,
@@ -691,8 +691,7 @@ async fn handle_remote_event<P: RoomDataProvider>(
     } else {
         Default::default()
     };
-    let is_highlighted =
-        push_actions.iter().any(|a| matches!(a, Action::SetTweak(Tweak::Highlight(true))));
+    let is_highlighted = push_actions.iter().any(Action::is_highlight);
     let event_meta = TimelineEventMetadata {
         sender,
         sender_profile,