summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-06-01 14:27:07 +0100
committerErik Johnston <erik@matrix.org>2016-06-03 11:10:00 +0100
commit6a0afa582aa5bf816e082af31ac44e2a8fee28c0 (patch)
tree00192465798c40d59ddae7862580b78e6918b81d /synapse/rest
parentRemove unnecessary sets (diff)
downloadsynapse-6a0afa582aa5bf816e082af31ac44e2a8fee28c0.tar.xz
Load push rules in storage layer, so that they get cached
Diffstat (limited to 'synapse/rest')
-rw-r--r--synapse/rest/client/v1/push_rule.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/synapse/rest/client/v1/push_rule.py b/synapse/rest/client/v1/push_rule.py

index 02d837ee6a..6bb4821ec6 100644 --- a/synapse/rest/client/v1/push_rule.py +++ b/synapse/rest/client/v1/push_rule.py
@@ -128,11 +128,9 @@ class PushRuleRestServlet(ClientV1RestServlet): # we build up the full structure and then decide which bits of it # to send which means doing unnecessary work sometimes but is # is probably not going to make a whole lot of difference - rawrules = yield self.store.get_push_rules_for_user(user_id) + rules = yield self.store.get_push_rules_for_user(user_id) - enabled_map = yield self.store.get_push_rules_enabled_for_user(user_id) - - rules = format_push_rules_for_user(requester.user, rawrules, enabled_map) + rules = format_push_rules_for_user(requester.user, rules) path = request.postpath[1:]