Skip to content
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

Jump to bottom

Apply (polls) push rules client side for encrypted rooms #7356

Merged
merged 6 commits into from
Feb 13, 2023
Merged

Apply (polls) push rules client side for encrypted rooms #7356

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5c9ce84
managing dont notify push rule
Feb 8, 2023
2c89e9d
add changelog
Feb 9, 2023
66374e4
private extension for push rule
Feb 10, 2023
d4b555d
remove mentions and keyword notice footer
Feb 10, 2023
5ca5bd3
Merge commit 'c39c50f0b9e2df376b5b804be99992241de4948b' into flescio/…
Feb 10, 2023
ad716eb
better changelog
Feb 10, 2023
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
9 changes: 8 additions & 1 deletion RiotNSE/NotificationService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,14 @@ class NotificationService: UNNotificationServiceExtension {
let currentUserId = account.mxCredentials.userId
let roomDisplayName = roomSummary?.displayname
let pushRule = NotificationService.backgroundSyncService.pushRule(matching: event, roomState: roomState)


// if the actions contains the dont_notify one, we complete with nil and return
if let actions = pushRule?.actions as? [MXPushRuleAction],
actions.contains(where: { $0.actionType == MXPushRuleActionTypeDontNotify }) {
onComplete(nil, false)
return
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd create a private extension of MXPushRule to increase readability:

private extension MXPushRule {
    var cannotNotify: Bool {
        let actions = (actions as? [MXPushRuleAction]) ?? []
        
        return enabled && actions.contains { $0.actionType == MXPushRuleActionTypeDontNotify }
    }
}

wdyt?


switch event.eventType {
case .callInvite:
let offer = event.content["offer"] as? [AnyHashable: Any]
Expand Down
1 change: 1 addition & 0 deletions changelog.d/pr-7356.change
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Polls: Apply push rules client side for encrypted rooms