Fix push rule evaluation

commetchat · Dec 3, 2023 · b6af2bf · b6af2bf
1 parent eece5a5
commit b6af2bf
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/commet/lib/client/matrix/matrix_room.dart b/commet/lib/client/matrix/matrix_room.dart
@@ -236,6 +236,8 @@ class MatrixRoom extends Room {
         senderName: sender.displayName,
         senderId: sender.identifier,
         roomName: displayName,
+        senderImage: sender.avatar,
+        roomImage: avatar,
         content: event.body ?? "Received a message",
         eventId: event.eventId,
         roomId: identifier,
@@ -261,15 +263,10 @@ class MatrixRoom extends Room {
       return false;
     }
 
-    if (pushRule == PushRule.dontNotify) {
-      return false;
-    }
-
-    if (pushRule == PushRule.mentionsOnly && !event.highlight) {
-      return false;
-    }
+    var evaluator = _matrixRoom.client.pushruleEvaluator;
+    var match = evaluator.match((event as MatrixTimelineEvent).event);
 
-    return true;
+    return match.notify;
   }
 
   @override