summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2015-01-28 18:06:04 +0000
committerDavid Baker <dave@matrix.org>2015-01-28 18:06:04 +0000
commitd5bdf3c0c7958e6a080f9ec4b38a51428717d02a (patch)
treeef037aa9f3481ca6b0a9030be3926fd5be88fc96 /synapse/storage
parentChange uses of get_user_by_req because it returns a tuple now. (diff)
downloadsynapse-d5bdf3c0c7958e6a080f9ec4b38a51428717d02a.tar.xz
Allow the push rule delete method to take more specifiers.
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/push_rule.py19
1 files changed, 11 insertions, 8 deletions
diff --git a/synapse/storage/push_rule.py b/synapse/storage/push_rule.py
index 0342996ed1..c7b553292e 100644
--- a/synapse/storage/push_rule.py
+++ b/synapse/storage/push_rule.py
@@ -175,14 +175,17 @@ class PushRuleStore(SQLBaseStore):
         txn.execute(sql, new_rule.values())
 
     @defer.inlineCallbacks
-    def delete_push_rule(self, user_name, rule_id):
-        yield self._simple_delete_one(
-            PushRuleTable.table_name,
-            {
-                'user_name': user_name,
-                'rule_id': rule_id
-            }
-        )
+    def delete_push_rule(self, user_name, rule_id, **kwargs):
+        """
+        Delete a push rule. Args specify the row to be deleted and can be
+        any of the columns in the push_rule table, but below are the
+        standard ones
+
+        Args:
+            user_name (str): The matrix ID of the push rule owner
+            rule_id (str): The rule_id of the rule to be deleted
+        """
+        yield self._simple_delete_one(PushRuleTable.table_name, kwargs)
 
 
 class RuleNotFoundException(Exception):