diff options
| author | Erik Johnston <erik@matrix.org> | 2016-05-31 15:44:08 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-05-31 15:44:08 +0100 |
| commit | cca0093fa96cfec0566ff790ef990fad8b6763bb (patch) | |
| tree | 43053dc8ea0d49eb8dfcb8a14135061dbf10c40d | |
| parent | Fix GET /push_rules (diff) | |
| download | synapse-cca0093fa96cfec0566ff790ef990fad8b6763bb.tar.xz | |
Change fix
| -rw-r--r-- | synapse/rest/client/v1/push_rule.py | 3 | ||||
| -rw-r--r-- | synapse/storage/push_rule.py | 10 |
2 files changed, 8 insertions, 5 deletions
diff --git a/synapse/rest/client/v1/push_rule.py b/synapse/rest/client/v1/push_rule.py index c135353aab..02d837ee6a 100644 --- a/synapse/rest/client/v1/push_rule.py +++ b/synapse/rest/client/v1/push_rule.py @@ -132,9 +132,6 @@ class PushRuleRestServlet(ClientV1RestServlet): enabled_map = yield self.store.get_push_rules_enabled_for_user(user_id) - rawrules = {k: v for k, v in rawrules.item() if k is not None} - enabled_map = {k: v for k, v in enabled_map.item() if k is not None} - rules = format_push_rules_for_user(requester.user, rawrules, enabled_map) path = request.postpath[1:] diff --git a/synapse/storage/push_rule.py b/synapse/storage/push_rule.py index f285f59afd..65c20e8900 100644 --- a/synapse/storage/push_rule.py +++ b/synapse/storage/push_rule.py @@ -66,7 +66,10 @@ class PushRuleStore(SQLBaseStore): if not user_ids: defer.returnValue({}) - results = {} + results = { + user_id: [] + for user_id in user_ids + } rows = yield self._simple_select_many_batch( table="push_rules", @@ -90,7 +93,10 @@ class PushRuleStore(SQLBaseStore): if not user_ids: defer.returnValue({}) - results = {} + results = { + user_id: [] + for user_id in user_ids + } rows = yield self._simple_select_many_batch( table="push_rules_enable", |