Skip to content

default push notification to be noisy #6281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Reaster0 wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −7
Open

default push notification to be noisy #6281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions crates/matrix-sdk-ui/src/notification_client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -941,8 +941,10 @@ pub struct NotificationItem {
/// Is the room a space?
pub is_space: bool,

/// Is it a noisy notification? (i.e. does any push action contain a sound
/// action)
/// Is it a noisy notification?
///
/// Notifications are considered noisy when their push actions notify. If a
/// sound tweak is present, it is treated as noisy as well.
///
/// It is set if and only if the push actions could be determined.
pub is_noisy: Option<bool>,
Expand Down Expand Up @@ -1019,7 +1021,12 @@ impl NotificationItem {
}
}

let is_noisy = push_actions.map(|actions| actions.iter().any(|a| a.sound().is_some()));
// Treat notify actions as noisy by default, even when servers don't
// include an explicit sound tweak in the matching rule.
let is_noisy = push_actions.map(|actions| {
actions.iter().any(Action::should_notify)
|| actions.iter().any(|action| action.sound().is_some())
});
let has_mention = push_actions.map(|actions| actions.iter().any(|a| a.is_highlight()));
let thread_id = event.thread_id().clone();

Expand Down
8 changes: 4 additions & 4 deletions crates/matrix-sdk-ui/tests/integration/notification_client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ async fn test_notification_client_sliding_sync() {
assert_eq!(item.sender_display_name.as_deref(), Some(sender_display_name));
assert_eq!(item.sender_avatar_url, Some(sender_avatar_url.to_string()));
assert_eq!(item.room_computed_display_name, sender_display_name);
assert_eq!(item.is_noisy, Some(false));
assert_eq!(item.is_noisy, Some(true));
}

#[async_test]
Expand Down Expand Up @@ -669,7 +669,7 @@ async fn test_notification_client_sliding_sync_invites() {
assert_eq!(item.sender_display_name.as_deref(), Some(sender_display_name));
assert_eq!(item.sender_avatar_url, Some(sender_avatar_url.to_string()));
assert_eq!(item.room_computed_display_name, sender_display_name);
assert_eq!(item.is_noisy, Some(false));
assert_eq!(item.is_noisy, Some(true));
}

#[async_test]
Expand Down Expand Up @@ -813,7 +813,7 @@ async fn test_notification_client_sliding_sync_invites_with_event_id() {
assert_eq!(item.sender_display_name.as_deref(), Some(sender_display_name));
assert_eq!(item.sender_avatar_url, Some(sender_avatar_url.to_string()));
assert_eq!(item.room_computed_display_name, sender_display_name);
assert_eq!(item.is_noisy, Some(false));
assert_eq!(item.is_noisy, Some(true));
}

#[async_test]
Expand Down Expand Up @@ -1008,7 +1008,7 @@ async fn test_notification_client_mixed() {
assert_eq!(item.sender_display_name.as_deref(), Some(sender_display_name));
assert_eq!(item.sender_avatar_url, Some(sender_avatar_url.to_string()));
assert_eq!(item.room_computed_display_name, sender_display_name);
assert_eq!(item.is_noisy, Some(false));
assert_eq!(item.is_noisy, Some(true));
}

#[async_test]
Expand Down
Loading