summary refs log tree commit diff
path: root/synapse/push/clientformat.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2016-06-07 15:27:12 +0100
committerMark Haines <mjark@negativecurvature.net>2016-06-07 15:27:12 +0100
commitc54fcd9ee430d41a6af6ad63af1e663d093e625f (patch)
tree06d35c46e23aae8e66fce453a5506212b2b8991c /synapse/push/clientformat.py
parentMerge pull request #847 from matrix-org/erikj/gc_tick (diff)
parentRemove dead code. (diff)
downloadsynapse-c54fcd9ee430d41a6af6ad63af1e663d093e625f.tar.xz
Merge pull request #848 from matrix-org/markjh/unusedIV
Remove dead code.
Diffstat (limited to 'synapse/push/clientformat.py')
-rw-r--r--synapse/push/clientformat.py26
1 files changed, 0 insertions, 26 deletions
diff --git a/synapse/push/clientformat.py b/synapse/push/clientformat.py

index b3983f7940..e0331b2d2d 100644 --- a/synapse/push/clientformat.py +++ b/synapse/push/clientformat.py
@@ -13,37 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -from synapse.push.baserules import list_with_base_rules - from synapse.push.rulekinds import ( PRIORITY_CLASS_MAP, PRIORITY_CLASS_INVERSE_MAP ) import copy -import simplejson as json - - -def load_rules_for_user(user, rawrules, enabled_map): - ruleslist = [] - for rawrule in rawrules: - rule = dict(rawrule) - rule["conditions"] = json.loads(rawrule["conditions"]) - rule["actions"] = json.loads(rawrule["actions"]) - ruleslist.append(rule) - - # We're going to be mutating this a lot, so do a deep copy - rules = list(list_with_base_rules(ruleslist)) - - for i, rule in enumerate(rules): - rule_id = rule['rule_id'] - if rule_id in enabled_map: - if rule.get('enabled', True) != bool(enabled_map[rule_id]): - # Rules are cached across users. - rule = dict(rule) - rule['enabled'] = bool(enabled_map[rule_id]) - rules[i] = rule - - return rules def format_push_rules_for_user(user, ruleslist):