Update to stable identifiers.

matrix-org · Mar 6, 2023 · a52c302 · a52c302
1 parent 55cdb39
commit a52c302
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/spec/unit/pushprocessor.spec.ts b/spec/unit/pushprocessor.spec.ts
@@ -621,7 +621,7 @@ describe("NotificationService", function () {
                             actions: [PushRuleActionName.Notify],
                             conditions: [
                                 {
-                                    kind: ConditionKind.EventPropertyContainsPrefix,
+                                    kind: ConditionKind.EventPropertyContains,
                                     key: "content.foo",
                                     value: value,
                                 },

diff --git a/src/@types/PushRules.ts b/src/@types/PushRules.ts
@@ -63,7 +63,7 @@ export function isDmMemberCountCondition(condition: AnyMemberCountCondition): bo
 export enum ConditionKind {
     EventMatch = "event_match",
     EventPropertyIs = "event_property_is",
-    EventPropertyContainsPrefix = "org.matrix.msc3966.exact_event_property_contains",
+    EventPropertyContains = "event_property_contains",
     ContainsDisplayName = "contains_display_name",
     RoomMemberCount = "room_member_count",
     SenderNotificationPermission = "sender_notification_permission",
@@ -89,8 +89,7 @@ export interface IEventPropertyIsCondition extends IPushRuleCondition<ConditionK
     value: string | boolean | null | number;
 }
 
-export interface IEventPropertyContainsPrefixCondition
-    extends IPushRuleCondition<ConditionKind.EventPropertyContainsPrefix> {
+export interface IEventPropertyContainsCondition extends IPushRuleCondition<ConditionKind.EventPropertyContains> {
     key: string;
     value: string | boolean | null | number;
 }
@@ -121,7 +120,7 @@ export interface ICallStartedPrefixCondition extends IPushRuleCondition<Conditio
 export type PushRuleCondition =
     | IEventMatchCondition
     | IEventPropertyIsCondition
-    | IEventPropertyContainsPrefixCondition
+    | IEventPropertyContainsCondition
     | IContainsDisplayNameCondition
     | IRoomMemberCountCondition
     | ISenderNotificationPermissionCondition

diff --git a/src/pushprocessor.ts b/src/pushprocessor.ts
@@ -26,7 +26,7 @@ import {
     IContainsDisplayNameCondition,
     IEventMatchCondition,
     IEventPropertyIsCondition,
-    IEventPropertyContainsPrefixCondition,
+    IEventPropertyContainsCondition,
     IPushRule,
     IPushRules,
     IRoomMemberCountCondition,
@@ -341,7 +341,7 @@ export class PushProcessor {
                 return this.eventFulfillsEventMatchCondition(cond, ev);
             case ConditionKind.EventPropertyIs:
                 return this.eventFulfillsEventPropertyIsCondition(cond, ev);
-            case ConditionKind.EventPropertyContainsPrefix:
+            case ConditionKind.EventPropertyContains:
                 return this.eventFulfillsEventPropertyContains(cond, ev);
             case ConditionKind.ContainsDisplayName:
                 return this.eventFulfillsDisplayNameCondition(cond, ev);
@@ -498,7 +498,7 @@ export class PushProcessor {
      * @param cond - The push rule condition to check for a match.
      * @param ev - The event to check for a match.
      */
-    private eventFulfillsEventPropertyContains(cond: IEventPropertyContainsPrefixCondition, ev: MatrixEvent): boolean {
+    private eventFulfillsEventPropertyContains(cond: IEventPropertyContainsCondition, ev: MatrixEvent): boolean {
         if (!cond.key || cond.value === undefined) {
             return false;
         }