diff options
| author | David Baker <dave@matrix.org> | 2016-08-11 14:09:13 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-08-11 14:09:13 +0100 |
| commit | b4ecf0b886c67437901e0af457c5f801ebde9a72 (patch) | |
| tree | ef66b0684edcfeb4ad68d20375641f4654393f44 /synapse/rest/client/v1/push_rule.py | |
| parent | Include the ts the notif was received at (diff) | |
| parent | Merge pull request #1003 from matrix-org/erikj/redaction_prev_content (diff) | |
| download | synapse-b4ecf0b886c67437901e0af457c5f801ebde9a72.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/notifications_api
Diffstat (limited to 'synapse/rest/client/v1/push_rule.py')
| -rw-r--r-- | synapse/rest/client/v1/push_rule.py | 6 |
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:] |