summary refs log tree commit diff
path: root/synapse/storage/push_rule.py
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2016-01-04 13:39:29 +0000
committerDavid Baker <dave@matrix.org>2016-01-04 13:39:29 +0000
commit3051c9d002a467643d1ab32bc36974d2e3f84c12 (patch)
tree0d660fd86194ded09dcb416f40c0dea40f0dcd2e /synapse/storage/push_rule.py
parentFix merge fail with anon access stuff (diff)
downloadsynapse-3051c9d002a467643d1ab32bc36974d2e3f84c12.tar.xz
Address minor PR issues
Diffstat (limited to 'synapse/storage/push_rule.py')
-rw-r--r--synapse/storage/push_rule.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/storage/push_rule.py b/synapse/storage/push_rule.py
index 9dec4aa685..7c5123d644 100644
--- a/synapse/storage/push_rule.py
+++ b/synapse/storage/push_rule.py
@@ -62,12 +62,12 @@ class PushRuleStore(SQLBaseStore):
         def f(txn, user_ids_to_fetch):
             sql = (
                 "SELECT " +
-                ",".join(map(lambda x: "pr."+x, PushRuleTable.fields)) +
+                ",".join("pr."+x for x in PushRuleTable.fields) +
                 " FROM " + PushRuleTable.table_name + " pr " +
                 " LEFT JOIN " + PushRuleEnableTable.table_name + " pre " +
                 " ON pr.user_name = pre.user_name and pr.rule_id = pre.rule_id " +
                 " WHERE pr.user_name " +
-                " IN (" + ",".join(["?" for _ in user_ids_to_fetch]) + ")"
+                " IN (" + ",".join("?" for _ in user_ids_to_fetch) + ")"
                 " AND (pre.enabled is null or pre.enabled = 1)"
                 " ORDER BY pr.user_name, pr.priority_class DESC, pr.priority DESC"
             )
@@ -78,7 +78,7 @@ class PushRuleStore(SQLBaseStore):
 
         batch_start = 0
         while batch_start < len(user_ids):
-            batch_end = max(len(user_ids), batch_size)
+            batch_end = min(len(user_ids), batch_size)
             batch_user_ids = user_ids[batch_start:batch_end]
             batch_start = batch_end