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

MSC3786: Add a default push rule to ignore m.room.server_acl events #2333

Merged
merged 6 commits into from
May 4, 2022
Merged

MSC3786: Add a default push rule to ignore m.room.server_acl events #2333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
54cd2d4
Add `DEFAULT_OVERRIDE_RULES` for `RoomServerAcl`
SimonBrandner Apr 29, 2022
952bf4d
Add `should not bing on room server ACL changes`
SimonBrandner Apr 29, 2022
3d380ba
Use MSC prefix
SimonBrandner Apr 30, 2022
ba60f4d
Update comment
SimonBrandner Apr 30, 2022
62c72c8
Add prefix `.`
SimonBrandner Apr 30, 2022
65c8b54
Update src/pushprocessor.ts
SimonBrandner May 4, 2022
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
17 changes: 17 additions & 0 deletions spec/unit/pushprocessor.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import * as utils from "../test-utils/test-utils";
import { PushProcessor } from "../../src/pushprocessor";
import { EventType } from "../../src";

describe('NotificationService', function() {
const testUserId = "@ali:matrix.org";
Expand Down Expand Up @@ -208,6 +209,7 @@ describe('NotificationService', function() {
msgtype: "m.text",
},
});
matrixClient.pushRules = PushProcessor.rewriteDefaultRules(matrixClient.pushRules);
pushProcessor = new PushProcessor(matrixClient);
});

Expand Down Expand Up @@ -295,6 +297,21 @@ describe('NotificationService', function() {
expect(actions.tweaks.highlight).toEqual(false);
});

it('should not bing on room server ACL changes', function() {
testEvent = utils.mkEvent({
type: EventType.RoomServerAcl,
room: testRoomId,
user: "@alfred:localhost",
event: true,
content: {},
});

const actions = pushProcessor.actionsForEvent(testEvent);
expect(actions.tweaks.highlight).toBeFalsy();
expect(actions.tweaks.sound).toBeFalsy();
expect(actions.notify).toBeFalsy();
});

// invalid

it('should gracefully handle bad input.', function() {
Expand Down
17 changes: 17 additions & 0 deletions src/pushprocessor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import {
PushRuleSet,
TweakName,
} from "./@types/PushRules";
import { EventType } from "./@types/event";

/**
* @module pushprocessor
Expand Down Expand Up @@ -96,6 +97,22 @@ const DEFAULT_OVERRIDE_RULES: IPushRule[] = [
PushRuleActionName.DontNotify,
],
},
{
// For homeservers which don't support MSC3786 yet
t3chguy marked this conversation as resolved.
Show resolved Hide resolved
rule_id: ".org.matrix.msc3786.rule.room.server_acl",
default: true,
enabled: true,
conditions: [
{
kind: ConditionKind.EventMatch,
key: "type",
pattern: EventType.RoomServerAcl,
},
],
actions: [
PushRuleActionName.DontNotify,
],
},
];

export interface IActionsObject {
Expand Down