Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-08 23:04:55 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'cross-signing_hidden' into cross-signing_keys

Browse source
This commit is contained in:
Hubert Chathi 2019-07-30 23:21:26 -04:00
commit bc95890822
4 changed files with 18 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

3
synapse/storage/end_to_end_keys.py
View file

@ -89,12 +89,11 @@ class EndToEndKeyWorkerStore(SQLBaseStore):
" k.key_json"
" FROM devices d"
" %s JOIN e2e_device_keys_json k USING (user_id, device_id)"
" WHERE (%s) AND NOT COALESCE(d.hidden, ?)"
" WHERE %s AND NOT d.hidden"
) % (
"LEFT" if include_all_devices else "INNER",
" OR ".join("(" + q + ")" for q in query_clauses),
)
query_params.append(False)
txn.execute(sql, query_params)
rows = self.cursor_to_dict(txn)