Merge pull request #531 from matrix-org/markjh/relative_push_rules

Fix adding push rules relative to other rules

1 files changed, 2 insertions, 1 deletions

diff --git a/synapse/storage/push_rule.py b/synapse/storage/push_rule.py

index 1f51c90ee5..f9a48171ba 100644
--- a/synapse/storage/push_rule.py
+++ b/synapse/storage/push_rule.py
@@ -130,7 +130,8 @@ class PushRuleStore(SQLBaseStore):
 
     def _add_push_rule_relative_txn(self, txn, user_id, **kwargs):
         after = kwargs.pop("after", None)
-        relative_to_rule = kwargs.pop("before", after)
+        before = kwargs.pop("before", None)
+        relative_to_rule = before or after
 
         res = self._simple_select_one_txn(
             txn,