mirror of
https://mau.dev/maunium/synapse.git
synced 2024-08-25 11:45:30 +00:00
Only remove one time keys when new one time keys are added
This commit is contained in:
parent
28ef344077
commit
8fb79eeea4
@ -58,6 +58,11 @@ class EndToEndKeyStore(SQLBaseStore):
|
||||
def add_e2e_one_time_keys(self, user_id, device_id, time_now, valid_until,
|
||||
key_list):
|
||||
def _add_e2e_one_time_keys(txn):
|
||||
sql = (
|
||||
"DELETE FROM e2e_one_time_keys_json"
|
||||
" WHERE user_id = ? AND device_id = ? AND valid_until_ms < ?"
|
||||
)
|
||||
txn.execute(sql, (user_id, device_id, time_now))
|
||||
for (algorithm, key_id, json_bytes) in key_list:
|
||||
self._simple_upsert_txn(
|
||||
txn, table="e2e_one_time_keys_json",
|
||||
@ -83,17 +88,12 @@ class EndToEndKeyStore(SQLBaseStore):
|
||||
Dict mapping from algorithm to number of keys for that algorithm.
|
||||
"""
|
||||
def _count_e2e_one_time_keys(txn):
|
||||
sql = (
|
||||
"DELETE FROM e2e_one_time_keys_json"
|
||||
" WHERE user_id = ? AND device_id = ? AND valid_until_ms < ?"
|
||||
)
|
||||
txn.execute(sql, (user_id, device_id, time_now))
|
||||
sql = (
|
||||
"SELECT algorithm, COUNT(key_id) FROM e2e_one_time_keys_json"
|
||||
" WHERE user_id = ? AND device_id = ?"
|
||||
" WHERE user_id = ? AND device_id = ? AND valid_until_ms >= ?"
|
||||
" GROUP BY algorithm"
|
||||
)
|
||||
txn.execute(sql, (user_id, device_id))
|
||||
txn.execute(sql, (user_id, device_id, time_now))
|
||||
result = {}
|
||||
for algorithm, key_count in txn.fetchall():
|
||||
result[algorithm] = key_count
|
||||
|
Loading…
Reference in New Issue
Block a user