Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-12-15 20:18:56 -05:00
Code Issues Projects Releases Packages Wiki Activity

Address minor PR issues

Browse source
This commit is contained in:
David Baker 2016-01-04 13:39:29 +00:00
parent d2a92c6bde
commit 3051c9d002
7 changed files with 12 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
synapse/storage/event_actions.py
View file

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright 2014 OpenMarket Ltd
# Copyright 2015 OpenMarket Ltd
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.

6
synapse/storage/push_rule.py
View file

@ -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

12
synapse/storage/registration.py
View file

@ -291,18 +291,6 @@ class RegistrationStore(SQLBaseStore):
defer.returnValue(ret['user_id'])
defer.returnValue(None)
@defer.inlineCallbacks
def get_all_user_ids(self):
"""Returns all user ids registered on this homeserver"""
return self.runInteraction(
"get_all_user_ids",
self._get_all_user_ids_txn
)
def _get_all_user_ids_txn(self, txn):
txn.execute("SELECT name from users")
return [r[0] for r in txn.fetchall()]
@defer.inlineCallbacks
def count_all_users(self):
"""Counts all users registered on the homeserver."""