summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorDavid Baker <dbkr@users.noreply.github.com>2016-01-21 12:00:26 +0000
committerDavid Baker <dbkr@users.noreply.github.com>2016-01-21 12:00:26 +0000
commit0503bdb316e0cc83902f60066d5f093b719ae496 (patch)
tree322e502f6cd3a6026010b31f53352eed6203d40b /synapse
parentMerge branch 'develop' of github.com:matrix-org/synapse into develop (diff)
parentRemove member event rule as per SYN-607 (diff)
downloadsynapse-0503bdb316e0cc83902f60066d5f093b719ae496.tar.xz
Merge pull request #514 from matrix-org/remove_member_event_rule
Remove member event rule as per SYN-607
Diffstat (limited to 'synapse')
-rw-r--r--synapse/push/baserules.py36
1 files changed, 19 insertions, 17 deletions
diff --git a/synapse/push/baserules.py b/synapse/push/baserules.py
index 3b526c4e33..186281dfa3 100644
--- a/synapse/push/baserules.py
+++ b/synapse/push/baserules.py
@@ -218,23 +218,25 @@ BASE_APPEND_UNDERRIDE_RULES = [
             }
         ]
     },
-    {
-        'rule_id': 'global/underride/.m.rule.member_event',
-        'conditions': [
-            {
-                'kind': 'event_match',
-                'key': 'type',
-                'pattern': 'm.room.member',
-                '_id': '_member',
-            }
-        ],
-        'actions': [
-            'notify', {
-                'set_tweak': 'highlight',
-                'value': False
-            }
-        ]
-    },
+    # This is too simple: https://matrix.org/jira/browse/SYN-607
+    # Removing for now
+    # {
+    #     'rule_id': 'global/underride/.m.rule.member_event',
+    #     'conditions': [
+    #         {
+    #             'kind': 'event_match',
+    #             'key': 'type',
+    #             'pattern': 'm.room.member',
+    #             '_id': '_member',
+    #         }
+    #     ],
+    #     'actions': [
+    #         'notify', {
+    #             'set_tweak': 'highlight',
+    #             'value': False
+    #         }
+    #     ]
+    # },
     {
         'rule_id': 'global/underride/.m.rule.message',
         'conditions': [