kaslo/synapse
1
0
Fork 0
Code Wiki Activity

black

Browse Source
This commit is contained in:
Hubert Chathi
2019-12-05 22:51:23 -05:00
parent a5604db287
commit 2d8ef9ef64
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
synapse/storage/data_stores/main/end_to_end_keys.py
View File

@@ -333,7 +333,7 @@ class EndToEndKeyWorkerStore(SQLBaseStore):
)
def _get_e2e_cross_signing_keys_bulk_txn(
self, txn, users, key_type, from_user_id=None
self, txn, users, key_type, from_user_id=None
):
"""Returns the cross-signing keys for a set of users.
@@ -359,9 +359,7 @@ class EndToEndKeyWorkerStore(SQLBaseStore):
" GROUP BY user_id)"
" USING (user_id, stream_id)"
" WHERE k.user_id IN (%s) AND k.keytype = ?"
) % (
",".join("?" for u in users)
)
) % (",".join("?" for u in users))
query_params = [key_type]
query_params.extend(users)
query_params.append(key_type)
@@ -386,9 +384,7 @@ class EndToEndKeyWorkerStore(SQLBaseStore):
" FROM e2e_cross_signing_signatures "
" WHERE user_id = ?"
" AND (target_user_id, target_device_id) IN (VALUES %s)"
) % (
",".join("(?,?)" for d in devices)
)
) % (",".join("(?,?)" for d in devices))
query_params = [from_user_id]
for item in devices.items():
query_params.extend(item)