Refactor inverse matching to use separate kind

Now uses `inverse_related_event_match` condition instead of a key within
the `related_event_match` type condition.

Author: Fizzadar

synapse/push/baserules.py

@@ -328,10 +328,9 @@ def make_base_prepend_rules(
             },
             # Don't notify if this reaction is to someone elses event
             {
-                "kind": "related_event_match",
+                "kind": "inverse_related_event_match",
                 "key": "sender",
                 "pattern_type": "user_id",
-                "inverse_match": True,
             },
         ],
         "actions": ["dont_notify"],

synapse/push/push_rule_evaluator.py

@@ -190,13 +190,13 @@ def matches(
         """
         if condition["kind"] == "event_match":
             return self._event_match(condition, user_id, self._event, self._value_cache)
-        elif condition["kind"] == "related_event_match":
+        elif condition["kind"] in ("related_event_match", "inverse_related_event_match"):
             if not self._related_event:
                 return False
             is_match = self._event_match(
                 condition, user_id, self._related_event, self._related_event_value_cache
             )
-            if condition.get("inverse_match"):
+            if condition["kind"] == "inverse_related_event_match":
                 return not is_match
             return is_match
         elif condition["kind"] == "contains_display_name":

tests/push/test_push_rule_evaluator.py

@@ -345,10 +345,9 @@ def test_related_event_match(self):
         self.assertFalse(
             evaluator.matches(
                 {
-                    "kind": "related_event_match",
+                    "kind": "inverse_related_event_match",
                     "key": "sender",
                     "pattern_type": "user_id",
-                    "inverse_match": True,
                 },
                 "@other_user:test",
                 "display_name",